Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop

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

@@ -79,9 +79,16 @@ public class HouseInfoDTO implements Serializable {
 
     private String customerId;
 
+    /**
+     * 小区所在的组织id
+     */
     private String agencyId;
     /**
      * eg：市北区-阜新路街道-南宁社区
      */
     private String agencyPathName;
+    /**
+     * 组织的area_code
+     */
+    private String areaCode;
 }

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

@@ -465,9 +465,11 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         HouseInfoDTO houseInfo = icHouseRedis.getHouseInfo(houseId, customerId);
         if (null != houseInfo && StringUtils.isNotBlank(houseInfo.getAgencyId())) {
             AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(houseInfo.getAgencyId());
-            houseInfo.setAgencyPathName(agencyInfoCache.getAllParentName().concat(StrConstant.HYPHEN).concat(agencyInfoCache.getOrganizationName()));
+            houseInfo.setAgencyPathName(StringUtils.isNotBlank(agencyInfoCache.getAllParentName())?agencyInfoCache.getAllParentName().concat(StrConstant.HYPHEN).concat(agencyInfoCache.getOrganizationName()):agencyInfoCache.getOrganizationName());
+            houseInfo.setAreaCode(StringUtils.isNotBlank(agencyInfoCache.getAreaCode())?agencyInfoCache.getAreaCode():StrConstant.EPMETY_STR);
         } else {
             houseInfo.setAgencyPathName(StrConstant.EPMETY_STR);
+            houseInfo.setAreaCode(StrConstant.EPMETY_STR);
         }
         return houseInfo;
     }

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

@@ -368,7 +368,7 @@
         IFNULL(ib.LONGITUDE,'') as buildingLongitude,
         IFNULL(ib.LATITUDE,'') as buildingLatitude,
         ih.CUSTOMER_ID AS customerId,
-        concat(IFNULL(n.NEIGHBOR_HOOD_NAME,''),IFNULL(ib.BUILDING_NAME,''),IFNULL(u.UNIT_NAME,''),IFNULL(ih.HOUSE_NAME,'')) AS allName,
+        concat(IFNULL(n.NEIGHBOR_HOOD_NAME,''),IFNULL(ib.BUILDING_NAME,''),IFNULL(u.UNIT_NAME,''),IFNULL(ih.DOOR_NAME,'')) AS allName,
         n.AGENCY_ID as agencyId
         FROM ic_house ih
         left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id AND n.DEL_FLAG = '0')