Merge remote-tracking branch 'origin/master'

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java

@@ -117,6 +117,12 @@ public class BuildingUnitController {
         return new Result();
     }
 
+    @PostMapping("updateRoomCode")
+    public Result updateRoomCode() {
+        epidemicBuildingUnitService.updateRoomCode();
+        return new Result();
+    }
+
     @PostMapping("updateErrorRoom")
     public Result updateErrorRoom() {
         epidemicBuildingUnitService.updateErrorRoom();

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO;
+import com.elink.esua.epdc.dto.personroom.result.EpidemicRoomCodeDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO;
 import com.elink.esua.epdc.dto.personroom.result.HouseInfoResultDTO;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity;
@@ -119,6 +120,8 @@ public interface EpidemicBuildingUnitDao extends BaseDao<EpidemicBuildingUnitEnt
 
     List<EpidemicBuildingUnitEntity> getErrorRoom();
 
+    List<EpidemicRoomCodeDTO> listNoRoomCode();
+
     /**
      * 单元列表下拉框
      *

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicBuildingUnitEntity.java

@@ -17,8 +17,6 @@
 
 package com.elink.esua.epdc.vaccine.personroom.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.elink.esua.epdc.vaccine.common.base.BasePingyinEntity;
 import lombok.Data;
@@ -42,7 +40,6 @@ public class EpidemicBuildingUnitEntity extends BasePingyinEntity {
     /**
      * 小区.村ID
      */
-	@TableField(strategy = FieldStrategy.IGNORED)
 	private Long buildingId;
 
 	/**
@@ -138,7 +135,6 @@ public class EpidemicBuildingUnitEntity extends BasePingyinEntity {
 	/**
 	 * 承租日期
 	 */
-	@TableField(strategy = FieldStrategy.IGNORED)
 	private Date lesseeDate;
 
 	/**

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java

@@ -143,6 +143,16 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
      */
     void updateMaCode();
 
+    /**
+     * 更新编码
+     *
+     * @param
+     * @return void
+     * @author zhy
+     * @date 2022/6/9 17:24
+     */
+    void updateRoomCode();
+
     /**
      * 更新错误数据
      *

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java

@@ -402,6 +402,25 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         }
     }
 
+    @Override
+    public void updateRoomCode() {
+        List<EpidemicRoomCodeDTO> list = baseDao.listNoRoomCode();
+        List<EpidemicBuildingUnitEntity> updateList = new ArrayList<>();
+
+        if (!list.isEmpty()) {
+            log.info("处理" + list.size() + "条无编码房屋");
+            list.forEach(item -> {
+                EpidemicBuildingUnitEntity entity = new EpidemicBuildingUnitEntity();
+                String roomCode = getRoomCode(item.getPlotMaCode(), item.getBuildingMaCode(), item.getRoomMaCode());
+                entity.setId(item.getId());
+                entity.setBuildingId(item.getBuildingId());
+                entity.setRoomCode(roomCode);
+                updateList.add(entity);
+            });
+            updateBatchById(updateList);
+        }
+    }
+
 //    private void updateUnitMaCode(EpidemicBuildingUnitEntity entity) {
 //        String key = RedisKeys.getMaUnitCodeKey(entity.getBuildingId().toString(), entity.getUnit());
 //        String nextKey = RedisKeys.getMaUnitNextCodeKey(entity.getBuildingId().toString());
@@ -824,7 +843,9 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
 
     @Override
     public Result updateHouseInfo(HouseInfoFormDTO formDTO) {
+        EpidemicBuildingUnitDTO dto = get(formDTO.getId());
         EpidemicBuildingUnitEntity entity = ConvertUtils.sourceToTarget(formDTO, EpidemicBuildingUnitEntity.class);
+        entity.setBuildingId(dto.getBuildingId());
         baseDao.updateById(entity);
         return new Result();
     }

epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml

@@ -233,6 +233,33 @@
             COUNT( 0 )>1
     </select>
 
+    <select id="listNoRoomCode" resultType="com.elink.esua.epdc.dto.personroom.result.EpidemicRoomCodeDTO">
+        SELECT
+            u.id,
+            u.UNIT,
+            u.ROOM_NO,
+            u.ROOM_CODE,
+            u.ROOM_MA_CODE,
+            u.UNIT_MA_CODE,
+            b.BUILDING_MA_CODE,
+            p.PLOT_MA_CODE,
+            u.MA_URL,
+            b.id AS buildingId,
+            b.BUILDING_NAME,
+            p.id AS plotId,
+            p.PLOT_NAME
+        FROM
+            epidemic_building_unit u
+            LEFT JOIN epidemic_plot_building b ON b.id = u.BUILDING_ID
+            LEFT JOIN epidemic_plot_coordinate p ON p.id = b.PLOT_ID
+        WHERE
+            u.DEL_FLAG = '0'
+            AND ( u.ROOM_CODE IS NULL OR u.ROOM_CODE = '' )
+            AND u.ROOM_MA_CODE > 0
+            AND b.BUILDING_MA_CODE > 0
+            AND p.PLOT_MA_CODE > 0
+    </select>
+
     <select id="getUnitOption" resultType="com.elink.esua.epdc.dto.epidemic.DictOptionDTO">
         SELECT
         u.UNIT AS dictValue,