【五大图层】数据展示。新增了house的fullname，用于检索。并且修改了房屋add、update、import，增加了生成fullname的逻辑

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java

@@ -72,6 +72,11 @@ public class IcHouseEntity extends BaseEpmetEntity {
      */
 	private String houseName;
 
+	/**
+	 * 全名:小区，楼栋，单元，房屋
+	 */
+	private String fullName;
+
     /**
      * 门牌号
      */

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java

@@ -317,7 +317,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         query.eq(IcHouseEntity::getCustomerId, customerId);
         query.likeRight(IcHouseEntity::getOrgIdPath, staffOrgIds);
         if (StringUtils.isNotBlank(search)) {
-            query.like(IcHouseEntity::getHouseName, search); // todo 这个字段要么丰富一下，要么建立新字段用于查询
+            query.like(IcHouseEntity::getFullName, search);
         }
         query.ge(IcHouseEntity::getResiNumber, resiNumberBiggerThan);
         return query;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -360,7 +360,8 @@ public class CoverageServiceImpl implements CoverageService {
                     latitude = buildingInfo.getLatitude();
                     longitude = buildingInfo.getLongitude();
                 }
-                return new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey, categoryDict.getCategoryName(), placeType, h.getHouseName(), latitude, longitude);
+                String houseName = StringUtils.isNotBlank(h.getFullName()) ? h.getFullName() : h.getHouseName();
+                return new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey, categoryDict.getCategoryName(), placeType, houseName, latitude, longitude);
             }).collect(Collectors.toList());
 
         } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) {

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

@@ -71,6 +71,11 @@ public class IcHouseDTO implements Serializable {
      */
 	private String houseName;
 
+    /**
+     * 全名:小区，楼栋，单元，房屋
+     */
+	private String fullName;
+
     /**
      * 门牌号
      */

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

@@ -147,6 +147,8 @@ public class ImportGeneralDTO implements Serializable {
 
     private String houseName;
 
+    private String fullName;
+
     private String customerId;
 
     private Boolean existStatus = false;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java

@@ -72,6 +72,11 @@ public class IcHouseEntity extends BaseEpmetEntity {
      */
 	private String houseName;
 
+	/**
+	 * 全名:小区，楼栋，单元，房屋
+	 */
+	private String fullName;
+
     /**
      * 门牌号
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -241,6 +241,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         needInsertList.forEach(n -> {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(n.getGridId());
             n.setOrgIdPath(gridInfo.getPids().concat(":").concat(gridInfo.getId()));
+            n.setFullName(icHouseService.getFullName(n.getNeighborHoodId(), n.getBuildingId(), n.getBuildingUnitId(), n.getDoorName()));
         });
         // 根据单元ID_doorName查询已存在的
         List<String> ids = needInsertList.stream().filter(n -> StringUtils.isNotBlank(n.getBuildingUnitId())).map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList());

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

@@ -136,4 +136,10 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @date 2022/6/1/0001 16:21
      */
     IcHouseDTO getByHouseCode(String houseCode);
+
+    /**
+     * 房屋全名：小区、楼栋、单元、房间号
+     * @return
+     */
+    String getFullName(String neighborHoodId, String buildingId, String unitId, String doorName);
 }

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

@@ -142,6 +142,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         IcHouseEntity icHouseDTO = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
         icHouseDTO.setCustomerId(customerId);
         icHouseDTO.setHouseName(getHouseName(formDTO));
+        icHouseDTO.setFullName(icHouseService.getFullName(formDTO.getNeighborHoodId(), formDTO.getBuildingId(), formDTO.getBuildingUnitId(), formDTO.getDoorName()));
         //获取所属组织地区码
         String areaCode = icNeighborHoodDao.getAreaCode(formDTO.getNeighborHoodId());
         if (StringUtils.isNotBlank(areaCode)) {
@@ -202,6 +203,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         icHouseDTO.setRentName(HouseRentFlagEnums.getTypeValue(formDTO.getRentFlag()));
         //设置
         icHouseDTO.setHouseName(getHouseName(formDTO));
+        icHouseDTO.setFullName(icHouseService.getFullName(formDTO.getNeighborHoodId(), formDTO.getBuildingId(), formDTO.getBuildingUnitId(), formDTO.getDoorName()));
         houseChangeRecord(formDTO.getHouseId(), customerId, icHouseDTO);
         icHouseService.update(icHouseDTO);
         //删除房屋缓存

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

@@ -16,16 +16,19 @@ import com.epmet.commons.tools.page.PageData;
 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.dao.IcBuildingDao;
+import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dao.IcHouseDao;
-import com.epmet.dto.IcHouseDTO;
-import com.epmet.dto.IcResiCategoryStatsConfigDTO;
-import com.epmet.dto.IcResiUserDTO;
-import com.epmet.dto.ImportGeneralDTO;
+import com.epmet.dao.IcNeighborHoodDao;
+import com.epmet.dto.*;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.dto.result.HousesNameResultDTO;
+import com.epmet.entity.IcBuildingEntity;
+import com.epmet.entity.IcBuildingUnitEntity;
 import com.epmet.entity.IcHouseEntity;
+import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.enums.HousePurposeEnums;
 import com.epmet.enums.HouseRentFlagEnums;
 import com.epmet.enums.HouseTypeEnums;
@@ -61,6 +64,12 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
     @Resource
     private IcHouseRedis icHouseRedis;
+    @Resource
+    private IcNeighborHoodDao icNeighborHoodDao;
+    @Resource
+    private IcBuildingDao icBuildingDao;
+    @Resource
+    private IcBuildingUnitDao buildingUnitDao;
 
 
     @Override
@@ -290,4 +299,21 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         lqw.eq(IcHouseEntity::getHouseCode, houseCode);
         return ConvertUtils.sourceToTarget(baseDao.selectOne(lqw), IcHouseDTO.class);
     }
+
+    /**
+     * 房屋全名：小区、楼栋、单元、房间号
+     * @return
+     */
+    @Override
+    public String getFullName(String neighborHoodId, String buildingId, String unitId, String doorName) {
+        //设置房间名 楼栋-单元号-门牌号
+        IcNeighborHoodEntity neighborhood = icNeighborHoodDao.selectById(neighborHoodId);
+        IcBuildingEntity building = icBuildingDao.selectById(buildingId);
+        IcBuildingUnitEntity unit = buildingUnitDao.selectById(unitId);
+
+        String neighborhoodName = Optional.ofNullable(neighborhood).map(u -> u.getNeighborHoodName()).orElse("");
+        String buildingName = Optional.ofNullable(building).map(u -> u.getBuildingName()).orElse("");
+        String unitName = Optional.ofNullable(unit).map(u -> u.getUnitNum().concat("单元")).orElse("");
+        return new StringBuilder().append(neighborhoodName).append(buildingName).append(unitName).append(doorName).toString();
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.24__houseAddResiNumber.sql

@@ -2,4 +2,7 @@ alter table ic_house
     add column RESI_NUMBER int(2) comment '居住人数' after OWNER_ID_CARD;
 
 alter table ic_house
-    add column ORG_ID_PATH varchar(256) comment '房屋所属父级列表。目前包括机关+网格' after CUSTOMER_ID;
+    add column ORG_ID_PATH varchar(256) comment '房屋所属父级列表。目前包括机关+网格' after CUSTOMER_ID;
+
+alter table ic_house
+    add column FULL_NAME varchar(64) comment '全名。小区、楼栋、单元、房屋' after DOOR_NAME;