Merge branch 'feature/someupdate_zhy'

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java

@@ -69,6 +69,11 @@ public class IcNeighborHoodDTO implements Serializable {
      */
 	private String gridId;
 
+    /**
+     * 网格
+     */
+    private String gridName;
+
     /**
      * 详细地址
      */
@@ -144,4 +149,9 @@ public class IcNeighborHoodDTO implements Serializable {
      */
     private Integer realBuilding;
 
+    /**
+     * 楼栋名
+     */
+    private String buildingName;
+
 }

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;
 
 }

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;
@@ -150,6 +151,20 @@ public class IcNeighborHoodController {
         return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId()));
     }
 
+    /**
+     * 获取用户组织下小区列表
+     *
+     * @param tokenDto
+     * @param dto
+     * @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<BuildingResultDTO>> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) {
+        return new Result<List<BuildingResultDTO>>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto));
+    }
+
     /**
      * @Description  小区信息导入
      * @param tokenDTO

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);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java

@@ -211,4 +211,5 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
      * @Date 2022/6/29 16:48
      */
     List<HomeListResultDTO> getHouseList(HouseInformationFormDTO formDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java

@@ -20,16 +20,19 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcNeighborHoodDTO;
 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;
 import com.epmet.entity.IcPropertyManagementEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -115,6 +118,17 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      */
     List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId,String staffId,String customerId);
 
+    /**
+     * 获取用户组织下小区列表
+     *
+     * @param tokenDto
+     * @param dto
+     * @return java.util.List<com.epmet.dto.BuildingResultDTO>
+     * @author zhy
+     * @date 2022/8/19 15:57
+     */
+    List<BuildingResultDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto);
+
     /**
      * @Description 通过ID查询小区信息
      * @Param ids

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -40,6 +40,7 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
@@ -49,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;
@@ -210,6 +212,20 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         }).collect(Collectors.toList());
     }
 
+    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都为空时，默认查询当前工作人员所属组织下的小区");
+            CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == result || StringUtils.isBlank(result.getAgencyId())) {
+                log.error(String.format("staffId:%s,工作人员缓存信息查询异常"));
+                return Collections.emptyList();
+            }
+            dto.setAgencyId(result.getAgencyId());
+        }
+        return icBuildingDao.listBuildingInfo(dto);
+    }
+
     /**
      * @param ids
      * @Description 通过ID查询小区信息

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -450,4 +450,33 @@
             </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.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>
+        <if test="buildingName != null and buildingName != ''">
+            AND (n.NEIGHBOR_HOOD_NAME LIKE CONCAT('%', #{buildingName}, '%') OR b.BUILDING_NAME LIKE CONCAT('%', #{buildingName}, '%'))
+        </if>
+        AND (
+        n.AGENCY_ID = #{agencyId}
+        OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))
+    </select>
+
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -663,5 +663,4 @@
             SORT, DOOR_NAME+0
     </select>
 
-
 </mapper>