灵山大屏中央区域:楼栋坐标分布/点击网格展示房屋分布点位/获取楼栋详情，未测试

2 years ago · 6c46f1c14d
12 changed files with 288 additions and 8 deletions
--- 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
@ -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;
+}
+
--- 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
@ -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;
+}
+
--- 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
@ -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;
+}
+
--- 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
@ -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<List<IcBuildingDTO>> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
+        return new Result<List<IcBuildingDTO>>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId()));
+    }
+
+
+    /**
+     * 灵山大屏：查询房屋坐标点位
+     * 支持根据网格\小区\楼栋id查询
+     */
+    @PostMapping("house-distribution")
+    public Result<List<IcHouseDTO>> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
+        return new Result<List<IcHouseDTO>>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId()));
+    }
+
+    /**
+     * 灵山大屏：点击房屋，显示房屋详情
+     * @param houseId
+     * @return
+     */
+    @PostMapping("houseDetail/{houseId}")
+    public Result<HouseDetailResultDTO> queryHouseDetail(@PathVariable("houseId")String houseId){
+        return new Result<HouseDetailResultDTO>().ok(icHouseService.queryHouseDetail(houseId));
+    }
+
+
+
+}
+
--- 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<IcBuildingEntity> {
     * @return
     */
    List<HouseTreeDTO> selectHouseTree(@Param("unitId") String unitId);
+
+    /**
+     * 查询楼栋列表：后续可以追加条件
+     * @param customerId 必填！
+     * @param gridId
+     * @param neighborHoodId
+     * @return
+     */
+    List<IcBuildingEntity> selectListByMap(@Param("customerId") String customerId,
+                                           @Param("gridId") String gridId,
+                                           @Param("neighborHoodId") String neighborHoodId);
 }

--- 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<IcHouseEntity> {
                                                               @Param("buildingName") String buildingName,
                                                               @Param("buildingId") String buildingId,
                                                               @Param("partyCenterHouseFlag") String partyCenterHouseFlag);
+
+    /**
+     * 查询房屋列表：后续可以追加条件
+     * @param customerId 必填！
+     * @param gridId
+     * @param neighborHoodId
+     * @param buildingId
+     * @return
+     */
+    List<IcHouseEntity> selectListByMap(@Param("customerId") String customerId,
+                                        @Param("gridId") String gridId,
+                                        @Param("neighborHoodId") String neighborHoodId,
+                                        @Param("buildingId") String buildingId);
 }
--- 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<IcBuildingEntity> {
     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcBuildingDTO>
     */
    Result<IcBulidingDetailDTO> getBuildingDetail(String buildingId);
+
+    /**
+     * 灵山大屏：查询楼栋坐标
+     *
+     * @param customerId
+     * @param gridId
+     * @param neighborHoodId
+     * @return
+     */
+    List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId);
 }
--- 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<IcHouseEntity> {
     * @param partyCenterHouseFlag
     */
    void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag);
+
+    /**
+     * 灵山大屏：查询房屋坐标点位
+     *
+     * @param gridId
+     * @param neighborHoodId
+     * @param buildingId
+     * @return
+     */
+    List<IcHouseDTO> houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId);
+
+
+    /**
+     * 灵山大屏：点击房屋，显示房屋详情
+     * @param houseId
+     * @return
+     */
+    HouseDetailResultDTO queryHouseDetail(String houseId);
 }
--- 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<IcBuildingDao, IcBuil
        return new Result<IcBulidingDetailDTO>().ok(baseDao.getBuildingDetail(buildingId));
    }

+    /**
+     * 灵山大屏：查询楼栋坐标
+     *
+     * @param customerId
+     * @param gridId
+     * @param neighborHoodId
+     * @return
+     */
+    @Override
+    public List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId) {
+        List<IcBuildingEntity> list=baseDao.selectListByMap(customerId,gridId,neighborHoodId);
+        return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class);
+    }
 }
--- 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<IcHouseDao, IcHouseEntit
        baseDao.update(null, update);
    }

+    /**
+     * 灵山大屏：查询房屋坐标点位
+     *
+     * @param gridId
+     * @param neighborHoodId
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public List<IcHouseDTO> houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) {
+        List<IcHouseEntity> 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<LingshanPartyCenterHouseLianhuEntity> countQuery = new LambdaQueryWrapper<>();
+            countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId);
+            resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery));
+        }
+        return resultDTO;
+    }
+

 }
--- 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
    </select>
+
+    <!--  楼栋列表  -->
+    <select id="selectListByMap" parameterType="map" resultType="com.epmet.entity.IcBuildingEntity">
+        SELECT
+            ib.*
+        FROM
+            ic_building ib
+        LEFT JOIN ic_neighbor_hood h ON ( ib.NEIGHBOR_HOOD_ID = h.ID )
+        WHERE
+            ib.DEL_FLAG = '0'
+          AND ib.CUSTOMER_ID = #{customerId}
+        <if test="gridId != null and gridId != ''">
+            AND h.GRID_ID = #{gridId}
+        </if>
+        <if test="neighborHoodId != null and neighborHoodId != ''">
+            AND ib.NEIGHBOR_HOOD_ID = #{neighborHoodId}
+        </if>
+    </select>
 </mapper>
--- 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 @@
        </if>
        order by ca.CREATED_TIME asc,cg.CREATED_TIME asc,h.CREATED_TIME asc
    </select>
+
+    <!--    房屋列表 -->
+    <select id="selectListByMap" parameterType="map" resultType="com.epmet.entity.IcHouseEntity">
+        SELECT
+            ih.*
+        FROM
+            ic_house ih
+        LEFT JOIN ic_neighbor_hood h
+            ON ( ih.NEIGHBOR_HOOD_ID = h.ID )
+        WHERE
+            ih.DEL_FLAG = '0'
+          AND ih.CUSTOMER_ID = #{customerId}
+        <if test="gridId != null and gridId != ''">
+            AND h.GRID_ID = #{gridId}
+        </if>
+        <if test="neighborHoodId != null and neighborHoodId != ''">
+            AND ih.NEIGHBOR_HOOD_ID = {neighborHoodId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            AND ih.BUILDING_ID = #{buildingId}
+        </if>
+    </select>
 </mapper>