房屋缓存添加字段

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java

@@ -89,4 +89,21 @@ public class HouseInfoCache implements Serializable {
      * 组织的area_code
      */
     private String areaCode;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+    /**
+     * 房屋编码
+     */
+    private String houseCode;
+    /**
+     * 二维码地址
+     */
+    private String houseQrcodeUrl;
 }

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

@@ -91,4 +91,20 @@ public class HouseInfoDTO implements Serializable {
      * 组织的area_code
      */
     private String areaCode;
+    /**
+     * 网格id
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+    /**
+     * 房屋编码
+     */
+    private String houseCode;
+    /**
+     * 二维码地址
+     */
+    private String houseQrcodeUrl;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -52,7 +52,6 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.OssFeignClient;
 import com.epmet.service.HouseService;
 import com.epmet.util.ExcelPoiUtils;
 import com.google.common.cache.Cache;

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

@@ -256,11 +256,16 @@
         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.DOOR_NAME,'')) AS allName,
-        n.AGENCY_ID as agencyId
+        n.AGENCY_ID as agencyId,
+        n.GRID_ID,
+        gr.GRID_NAME,
+        ih.HOUSE_CODE,
+        ih.HOUSE_QRCODE_URL
         FROM ic_house ih
         left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id AND n.DEL_FLAG = '0')
         left JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id AND ib.DEL_FLAG = '0')
         left JOIN ic_building_unit u ON ( ih.BUILDING_UNIT_ID = u.ID AND u.DEL_FLAG = '0')
+        left join customer_grid gr ON (gr.id=n.GRID_ID and gr.ABANDON_FLAG=0 and gr.DEL_FLAG=0)
         WHERE
         ih.DEL_FLAG = '0'
         AND ih.ID = #{houseId}