diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingFangDetailsFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingFangDetailsFormDTO.java new file mode 100644 index 0000000000..ccff047834 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingFangDetailsFormDTO.java @@ -0,0 +1,14 @@ +package com.epmet.opendata.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CaPingFangDetailsFormDTO implements Serializable { + + private static final long serialVersionUID = -357459764293119751L; + + + private String buildingId; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java index d0b71aaf67..f6388581f1 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java @@ -9,8 +9,16 @@ public class CaPingfangFormDTO implements Serializable { private static final long serialVersionUID = 7714897295294884648L; + /** + * 楼栋名称 + */ private String buildingName; + /** + * 小区名称 + */ + private String communityName; + private Integer page; private Integer limit; diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingFangDetailsResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingFangDetailsResultDTO.java new file mode 100644 index 0000000000..dcf821a3c0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingFangDetailsResultDTO.java @@ -0,0 +1,149 @@ +package com.epmet.opendata.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class CaPingFangDetailsResultDTO implements Serializable { + + private static final long serialVersionUID = -6967441851106789821L; + + /** + * 楼栋ID + */ + private Long buildingId; + + /** + * 楼宇类型 + */ + private String buildingType; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 楼宇名称 + */ + private String buildingName; + + /** + * 用途分类 + */ + private String buildingUse; + + /** + * 楼宇状态 + */ + private String buildingStatus; + + /** + * 楼宇结构 + */ + private String buildingStructure; + + /** + * 使用现状 + */ + private String buildingUseage; + + /** + * 建筑时间 + */ + private Date constructionTime; + + /** + * 所处位置 + */ + private String buildingAddr; + + /** + * 小区(单位)名称 + */ + private String communityName; + + /** + * 楼栋长 + */ + private String buildingLeader; + + /** + * 楼层数 + */ + private Integer layerCount; + + /** + * 地下楼层数 + */ + private Integer basementLayerCount; + + /** + * 住宅开始层数 + */ + private Integer houseBeginLayer; + + /** + * 单元数 + */ + private Integer unitCount; + + /** + * 每层每单元户数 + */ + private Integer layerRoomCount; + + /** + * 总房屋数 + */ + private Integer roomCount; + + /** + * 电梯数量 + */ + private String elevatorCount; + + /** + * 建筑面积 + */ + private String buildingArea; + + /** + * 物业公司 + */ + private String buildingPmc; + + /** + * 介绍 + */ + private String buildingDesc; + + /** + * 标绘状态 + */ + private String pointStatus; + + /** + * 经度 + */ + private BigDecimal longitude; + + /** + * 纬度 + */ + private BigDecimal latitude; + + /** + * 数据来源 + */ + private String platCode; + + /** + * 小区主键 + */ + private String communityId; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java index 8ef1103201..b23424bdf3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java @@ -108,7 +108,7 @@ public class CaLoudongController { * @author LZN * @date 2022/6/1 9:37 */ - @PostMapping("getDetails") + @PostMapping("getLouDongDetails") public Result getLouDongDetails(@RequestBody CaLoudongDetailsFormDTO dto, @LoginUser TokenDto tokenDto) { CaLoudongDetailsResultDTO result = caLoudongService.getLouDongDetails(dto); return new Result().ok(result); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java index 99adb55e93..6e07b6b855 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java @@ -12,8 +12,10 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.opendata.dto.CaPingfangDTO; +import com.epmet.opendata.dto.form.CaPingFangDetailsFormDTO; import com.epmet.opendata.dto.form.CaPingfangFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.result.CaPingFangDetailsResultDTO; import com.epmet.opendata.excel.CaPingfangExcel; import com.epmet.opendata.service.CaPingfangService; import org.springframework.beans.factory.annotation.Autowired; @@ -94,6 +96,21 @@ public class CaPingfangController { return new Result().ok(data); } + /** + * 平房详情 + * + * @param dto + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/2 14:04 + */ + @PostMapping("getPingFangDetails") + public Result getPingFangDetails(@RequestBody CaPingFangDetailsFormDTO dto, @LoginUser TokenDto tokenDto) { + CaPingFangDetailsResultDTO result = caPingfangService.getPingFangDetails(dto); + return new Result().ok(result); + } + /** * 平房调用ruoyi接口存储数据 * diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java index 14ec80b58a..4aa4f98439 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java @@ -1,6 +1,7 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.dto.result.CaPingFangDetailsResultDTO; import com.epmet.opendata.dto.result.CaPingfangResultDTO; import com.epmet.opendata.entity.CaPingfangEntity; import org.apache.ibatis.annotations.Mapper; @@ -21,7 +22,16 @@ public interface CaPingfangDao extends BaseDao { * @param buildingName * @return */ - List getPage(@Param("buildingName") String buildingName); + List getPage(@Param("buildingName") String buildingName, + @Param("communityName") String communityName); void deleteAll(); + + /** + * 平房详情 + * + * @param buildingId + * @return + */ + CaPingFangDetailsResultDTO getPingFangDetails(@Param("buildingId") String buildingId); } \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaPingfangService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaPingfangService.java index 2fbc007254..360ae6cab2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaPingfangService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaPingfangService.java @@ -4,8 +4,10 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.opendata.dto.CaPingfangDTO; +import com.epmet.opendata.dto.form.CaPingFangDetailsFormDTO; import com.epmet.opendata.dto.form.CaPingfangFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.result.CaPingFangDetailsResultDTO; import com.epmet.opendata.entity.CaPingfangEntity; @@ -92,4 +94,12 @@ public interface CaPingfangService extends BaseService { * @param dto */ void preserPingFangVation(PreserVationFormDTO dto); + + /** + * 平房详情 + * + * @param dto + * @return + */ + CaPingFangDetailsResultDTO getPingFangDetails(CaPingFangDetailsFormDTO dto); } \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java index f3ec5e1ff0..3fc5e7e429 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java @@ -13,9 +13,11 @@ import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.CaPingfangDao; import com.epmet.opendata.dto.CaPingfangDTO; +import com.epmet.opendata.dto.form.CaPingFangDetailsFormDTO; import com.epmet.opendata.dto.form.CaPingfangFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.CaPingFangDetailsResultDTO; import com.epmet.opendata.dto.result.CaPingfangResultDTO; import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.CaPingfangEntity; @@ -97,7 +99,7 @@ public class CaPingfangServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getBuildingName()); + List result = baseDao.getPage(dto.getBuildingName(),dto.getCommunityName()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } @@ -133,6 +135,13 @@ public class CaPingfangServiceImpl extends BaseServiceImpl (pageNo * NumConstant.FIFTY)); } + + @Override + public CaPingFangDetailsResultDTO getPingFangDetails(CaPingFangDetailsFormDTO dto) { + CaPingFangDetailsResultDTO result = baseDao.getPingFangDetails(dto.getBuildingId()); + return result; + } + enum pingFangEnum { PF("unicom", "ca_pingfang"), diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml index 27711e5ff6..25e605a38c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml @@ -87,6 +87,21 @@ AND building_name = #{buildingName} + + AND community_name = #{communityName} + + + +