From 6c46f1c14d929921b5e2de57d46f3c769840f7ed Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 15:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E5=A4=A7=E5=B1=8F=E4=B8=AD?= =?UTF-8?q?=E5=A4=AE=E5=8C=BA=E5=9F=9F:=E6=A5=BC=E6=A0=8B=E5=9D=90?= =?UTF-8?q?=E6=A0=87=E5=88=86=E5=B8=83/=E7=82=B9=E5=87=BB=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=B1=95=E7=A4=BA=E6=88=BF=E5=B1=8B=E5=88=86=E5=B8=83?= =?UTF-8?q?=E7=82=B9=E4=BD=8D/=E8=8E=B7=E5=8F=96=E6=A5=BC=E6=A0=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E6=9C=AA=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...enPartyCenterHouseDistributionFormDTO.java | 23 +++++++ .../result/lingshan/HouseDetailResultDTO.java | 18 +++++ ...eenPartyCenterHouseDistributionResDTO.java | 43 ++++++++++++ .../LingShanScreenGovOrgController.java | 66 +++++++++++++++++++ .../java/com/epmet/dao/IcBuildingDao.java | 11 ++++ .../main/java/com/epmet/dao/IcHouseDao.java | 13 ++++ .../com/epmet/service/IcBuildingService.java | 10 +++ .../com/epmet/service/IcHouseService.java | 23 +++++-- .../service/impl/IcBuildingServiceImpl.java | 13 ++++ .../service/impl/IcHouseServiceImpl.java | 36 ++++++++-- .../main/resources/mapper/IcBuildingDao.xml | 18 +++++ .../src/main/resources/mapper/IcHouseDao.xml | 22 +++++++ 12 files changed, 288 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java new file mode 100644 index 0000000000..0417a5540e --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form.lingshan; + +import com.epmet.commons.tools.validator.group.QueryGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description 灵山大屏，根据网格id，查询党员中心户房屋坐标 + * @Author yzm + * @Date 2023/5/18 10:14 + */ +@Data +public class ScreenPartyCenterHouseDistributionFormDTO { + /** + * 网格必填 + */ + @NotBlank(message = "gridId不能为空",groups = QueryGroup.class) + private String gridId; + private String neighborHoodId; + private String buildingId; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java new file mode 100644 index 0000000000..cb48b95e46 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result.lingshan; + +import com.epmet.dto.IcHouseDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/18 14:05 + */ +@Data +public class HouseDetailResultDTO extends IcHouseDTO { + /** + * 如果是党员中心户，关联的联户数 + */ + private Integer totalLianHu; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java new file mode 100644 index 0000000000..7e179fe4a0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto.result.lingshan; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/18 10:56 + */ +@Data +public class ScreenPartyCenterHouseDistributionResDTO { + /** + * 小区id + */ + private String neighborHoodId; + private String neighborHoodName; + /** + * 所属楼栋id + */ + private String buildingId; + private String buildingName; + /** + * 所属单元id + */ + private String buildingUnitId; + private String unitName; + + /** + * 房屋名字后台插入时生成 + */ + private String houseName; + /** + * 房屋坐标 + */ + private String longitude; + private String latitude; + + /** + * 灵山项目：是否党员中心户：1是；0不是 + */ + private String partyCenterHouseFlag; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java new file mode 100644 index 0000000000..fe3123a482 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java @@ -0,0 +1,66 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcBuildingDTO; +import com.epmet.dto.IcHouseDTO; +import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.service.IcBuildingService; +import com.epmet.service.IcHouseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description 灵山大屏-查询gov-org库的接口， 可以放在这.... + * @Author yzm + * @Date 2023/5/18 10:05 + */ +@RestController +@RequestMapping("houseScreen") +public class LingShanScreenGovOrgController { + @Autowired + private IcHouseService icHouseService; + @Autowired + private IcBuildingService icBuildingService; + + + /** + * 灵山大屏：查询楼栋坐标 + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("building-distribution") + public Result> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId())); + } + + + /** + * 灵山大屏：查询房屋坐标点位 + * 支持根据网格\小区\楼栋id查询 + */ + @PostMapping("house-distribution") + public Result> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId())); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @PostMapping("houseDetail/{houseId}") + public Result queryHouseDetail(@PathVariable("houseId")String houseId){ + return new Result().ok(icHouseService.queryHouseDetail(houseId)); + } + + + +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index 2275021a67..ca6b57a3c5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -276,5 +276,16 @@ public interface IcBuildingDao extends BaseDao { * @return */ List selectHouseTree(@Param("unitId") String unitId); + + /** + * 查询楼栋列表：后续可以追加条件 + * @param customerId 必填！ + * @param gridId + * @param neighborHoodId + * @return + */ + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index f4212b5487..c2eedacf63 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -231,4 +231,17 @@ public interface IcHouseDao extends BaseDao { @Param("buildingName") String buildingName, @Param("buildingId") String buildingId, @Param("partyCenterHouseFlag") String partyCenterHouseFlag); + + /** + * 查询房屋列表：后续可以追加条件 + * @param customerId 必填！ + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId, + @Param("buildingId") String buildingId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java index cde64d4da0..9d60ebcb56 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java @@ -133,4 +133,14 @@ public interface IcBuildingService extends BaseService { * @return com.epmet.commons.tools.utils.Result */ Result getBuildingDetail(String buildingId); + + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + List buildingDistribution(String customerId, String gridId, String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index cec8ca1349..47a8e7904a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -14,10 +14,7 @@ import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; -import com.epmet.dto.result.lingshan.HouseTreeDTO; -import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; +import com.epmet.dto.result.lingshan.*; import com.epmet.entity.IcHouseEntity; import java.util.List; @@ -183,4 +180,22 @@ public interface IcHouseService extends BaseService { * @param partyCenterHouseFlag */ void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag); + + /** + * 灵山大屏：查询房屋坐标点位 + * + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + List houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId); + + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + HouseDetailResultDTO queryHouseDetail(String houseId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 577e77c787..db18a933f8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -173,4 +173,17 @@ public class IcBuildingServiceImpl extends BaseServiceImpl().ok(baseDao.getBuildingDetail(buildingId)); } + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + @Override + public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { + List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId); + return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 8a782c376a..f76d723af1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -26,10 +26,7 @@ import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO; import com.epmet.dto.result.*; -import com.epmet.dto.result.lingshan.HouseTreeDTO; -import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; +import com.epmet.dto.result.lingshan.*; import com.epmet.entity.*; import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseRentFlagEnums; @@ -563,5 +560,36 @@ public class IcHouseServiceImpl extends BaseServiceImpl houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { + List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); + return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @Override + public HouseDetailResultDTO queryHouseDetail(String houseId) { + IcHouseDTO data = get(houseId); + HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class); + if (null != resultDTO) { + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId); + resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery)); + } + return resultDTO; + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 2224b68099..2d632d7b2d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -602,4 +602,22 @@ and ih.BUILDING_UNIT_ID=#{unitId} order by ih.DOOR_NAME asc + + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 7ffaff80a2..aa4b825507 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -770,4 +770,26 @@ order by ca.CREATED_TIME asc,cg.CREATED_TIME asc,h.CREATED_TIME asc + + +