Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

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

@@ -118,4 +118,20 @@ public class GridInfoCache implements Serializable {
      * 弃用标记
      */
     private Integer abandonFlag;
+
+    /**
+     * 网格编码
+     */
+    private String code;
+
+    /**
+     * 负责人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
 }

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

@@ -96,7 +96,6 @@ public class BuildingController {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, IcBulidingAddFormDTO.UpdateShowGroup.class);
         String customerId = tokenDTO.getCustomerId();
-//        String customerId = "123123";
         buildingService.updateBuilding(customerId,formDTO);
         return new Result().ok("修改成功");
     }

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

@@ -83,4 +83,12 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      */
     List<HousesNameResultDTO> getHousesNameByIdCards(@Param("idCards") List<String> idCards);
 
+    /**
+     * Desc: 根据楼栋ID修改房屋名
+     * @param buildingId
+     * @author zxc
+     * @date 2022/4/26 13:49
+     */
+    void houseUpdateHouseName(@Param("buildingId")String buildingId);
+
 }

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

@@ -445,6 +445,9 @@ public class BuildingServiceImpl implements BuildingService {
         icBuildingDTO.setId(formDTO.getBuildingId());
         icBuildingDTO.setCustomerId(customerId);
         icBuildingService.update(icBuildingDTO);
+
+        // 更新房屋名称
+        icHouseDao.houseUpdateHouseName(formDTO.getBuildingId());
         //更新楼宇单元
         //如果楼宇单元大于之前的楼宇单元，新增单元
         Integer nowUnit = formDTO.getTotalUnitNum();

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

@@ -70,6 +70,17 @@
             )
     </update>
 
+    <!-- 根据楼栋ID修改房屋名 -->
+    <update id="houseUpdateHouseName">
+        UPDATE ic_house h,ic_building b,ic_building_unit u
+        SET h.HOUSE_NAME = CONCAT(b.BUILDING_NAME,'-',u.UNIT_NAME,'-',h.DOOR_NAME),
+            h.UPDATED_TIME = NOW()
+        WHERE h.DEL_FLAG = '0'
+          AND h.BUILDING_ID = b.ID AND b.DEL_FLAG = '0'
+          AND h.BUILDING_UNIT_ID = u.ID AND u.DEL_FLAG = '0'
+          AND h.BUILDING_ID = #{buildingId}
+    </update>
+
     <select id="searchHouseByPage" resultType="com.epmet.dto.result.IcHouseListResultDTO">
       select
         concat(b.BUILDING_NAME,'-',d.UNIT_NUM,'-',a.DOOR_NAME) as houseName,