From 9043c65be1effda4562574a8961e8cf730e38c91 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 19 Aug 2022 17:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/BuildingResultDTO.java   | 10 ++++++-
 .../controller/IcNeighborHoodController.java  |  7 ++---
 .../java/com/epmet/dao/IcBuildingDao.java     | 11 ++++++++
 .../java/com/epmet/dao/IcNeighborHoodDao.java | 10 -------
 .../epmet/service/IcNeighborHoodService.java  |  5 ++--
 .../impl/IcNeighborHoodServiceImpl.java       |  5 ++--
 .../main/resources/mapper/IcBuildingDao.xml   | 27 +++++++++++++++++++
 .../resources/mapper/IcNeighborHoodDao.xml    | 21 ---------------
 8 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java
index 212c85a700..dc2624e160 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java
@@ -11,13 +11,21 @@ import java.io.Serializable;
  */
 @Data
 public class BuildingResultDTO implements Serializable {
+
     private static final long serialVersionUID = -2129418426919785999L;
+
     private String buildingId;
 
+    private String buildingName;
+
+    private String gridId;
+    
     private String gridName;
 
+    private String neighborhoodId;
+
     private String neighborhoodName;
 
-    private String buildingName;
+    private String label;
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
index 183a8e3165..f44e52c44f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
@@ -39,6 +39,7 @@ import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcNeighborHoodService;
@@ -155,13 +156,13 @@ public class IcNeighborHoodController {
      *
      * @param tokenDto
      * @param dto
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.IcNeighborHoodDTO>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.BuildingResultDTO>>
      * @author zhy
      * @date 2022/8/19 15:56
      */
     @PostMapping("neighborhoodlist")
-    public Result<List<IcNeighborHoodDTO>> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) {
-        return new Result<List<IcNeighborHoodDTO>>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto));
+    public Result<List<BuildingResultDTO>> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) {
+        return new Result<List<BuildingResultDTO>>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto));
     }
 
     /**
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 8b0cd3f470..d48d12b987 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
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.IcBuildingListFormDTO;
 import com.epmet.dto.result.*;
@@ -224,4 +225,14 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
     IcBuildingEntity selectByCoding(@Param("coding") String coding,
                                     @Param("id") String id);
 
+    /**
+     * 展示所有楼栋和小区信息
+     *
+     * @param dto
+     * @return java.util.List<com.epmet.dto.result.BuildingResultDTO>
+     * @author zhy
+     * @date 2022/8/19 17:32
+     */
+    List<BuildingResultDTO> listBuildingInfo(IcNeighborHoodDTO dto);
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
index cbb29806f4..ee7361724d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -212,14 +212,4 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
      */
     List<HomeListResultDTO> getHouseList(HouseInformationFormDTO formDTO);
 
-    /**
-     * 小区
-     *
-     * @param formDTO
-     * @return java.util.List<com.epmet.dto.IcNeighborHoodDTO>
-     * @author zhy
-     * @date 2022/8/19 15:57
-     */
-    List<IcNeighborHoodDTO> getNeighborhoodList(IcNeighborHoodDTO formDTO);
-
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
index 7a8105458c..913b4496c4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
@@ -27,6 +27,7 @@ import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.NeighborHoodAndManagementDTO;
 import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
+import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.entity.IcNeighborHoodPropertyEntity;
@@ -122,11 +123,11 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      *
      * @param tokenDto
      * @param dto
-     * @return java.util.List<com.epmet.dto.IcNeighborHoodDTO>
+     * @return java.util.List<com.epmet.dto.BuildingResultDTO>
      * @author zhy
      * @date 2022/8/19 15:57
      */
-    List<IcNeighborHoodDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto);
+    List<BuildingResultDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto);
 
     /**
      * @Description 通过ID查询小区信息
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 327c472cc3..3ca505d172 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -50,6 +50,7 @@ import com.epmet.dto.*;
 import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.dto.result.InfoByNamesResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
@@ -211,7 +212,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         }).collect(Collectors.toList());
     }
 
-    public List<IcNeighborHoodDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) {
+    public List<BuildingResultDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) {
         dto.setCustomerId(tokenDto.getCustomerId());
         if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) {
             log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区");
@@ -222,7 +223,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             }
             dto.setAgencyId(result.getAgencyId());
         }
-        return baseDao.getNeighborhoodList(dto);
+        return icBuildingDao.listBuildingInfo(dto);
     }
 
     /**
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 5f825edc25..514e9a5472 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
@@ -450,4 +450,31 @@
             </if>
     </select>
 
+    <select id="listBuildingInfo" resultType="com.epmet.dto.result.BuildingResultDTO">
+        SELECT
+        CONCAT( n.NEIGHBOR_HOOD_NAME, '-', b.BUILDING_NAME ) AS label,
+        b.id AS buildingId,
+        b.BUILDING_NAME AS buildingName,
+        n.id AS neighborhoodId,
+        n.NEIGHBOR_HOOD_NAME AS neighborhoodName,
+        n.CUSTOMER_ID AS neighborhoodName,
+        n.GRID_ID,
+        g.GRID_NAME
+        FROM
+        ic_building b
+        LEFT JOIN ic_neighbor_hood n ON b.NEIGHBOR_HOOD_ID = n.id
+        LEFT JOIN customer_grid g ON n.GRID_ID = g.id
+        WHERE
+        n.DEL_FLAG = '0'
+        AND b.DEL_FLAG = '0'
+        AND g.DEL_FLAG = '0'
+        AND n.CUSTOMER_ID = #{customerId}
+        <if test="gridId != null and gridId != ''">
+            AND n.GRID_ID = #{gridId}
+        </if>
+        AND (
+        n.AGENCY_ID = #{agencyId}
+        OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))
+    </select>
+
 </mapper>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index d799b0873c..d972dd5e06 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -663,25 +663,4 @@
             SORT, DOOR_NAME+0
     </select>
 
-    <select id="getNeighborhoodList" resultType="com.epmet.dto.IcNeighborHoodDTO">
-        SELECT
-        n.id,
-        n.NEIGHBOR_HOOD_NAME,
-        n.CUSTOMER_ID,
-        n.GRID_ID,
-        g.GRID_NAME
-        FROM
-        ic_neighbor_hood n
-        LEFT JOIN customer_grid g ON n.GRID_ID = g.id
-        WHERE
-        n.DEL_FLAG = '0'
-          AND n.CUSTOMER_ID = #{customerId}
-        <if test="gridId != null and gridId != ''">
-            AND n.GRID_ID = #{gridId}
-        </if>
-          AND (
-        n.AGENCY_ID = #{agencyId}
-                OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))
-    </select>
-
 </mapper>