From 7f92713084fa8cf0a5bb1a1b08a0255431bc72be Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 5 Jul 2022 14:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8D=A3=E8=AA=89=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BuildingUnitController.java    |  2 +-
 .../service/EpidemicBuildingUnitService.java  | 25 +------
 .../impl/EpidemicBuildingUnitServiceImpl.java | 70 +------------------
 3 files changed, 5 insertions(+), 92 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java
index 58efb38..09dcc32 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java
@@ -107,7 +107,7 @@ public class BuildingUnitController {
     }
 
     /**
-     * 更新房屋自增序号
+     * 更新房屋展示码
      *
      * @return
      */
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
index 1b61a85..de31cbd 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
@@ -23,7 +23,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
 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.GetSkipDirectionFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO;
@@ -113,26 +112,6 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
      */
     Result importEpidemicHouse(MultipartFile file, String gridId);
 
-    /**
-     * 获取最大编码
-     *
-     * @param
-     * @return int
-     * @author zhy
-     * @date 2022/6/9 17:24
-     */
-    int getRoomMaxCode(Long buildingId, String unit);
-//
-//    /**
-//     * 获取最大编码
-//     *
-//     * @param
-//     * @return int
-//     * @author zhy
-//     * @date 2022/6/9 17:24
-//     */
-//    int getUnitNewCode(Long buildingId, String unit);
-
     /**
      * 更新编码
      *
@@ -193,6 +172,7 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
 
     /**
      * 修改房屋信息
+     *
      * @param formDTO
      * @return
      */
@@ -229,7 +209,4 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
 
     EpidemicBuildingUnitDetailResultDTO getUnitInfo(EpidemicBuildingUnitDTO formDTO);
 
-
-
-
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
index f29e929..57541a8 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
@@ -346,29 +346,6 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         return new Result();
     }
 
-    @Override
-    public int getRoomMaxCode(Long buildingId, String unit) {
-        Integer maxCode = baseDao.getRoomMaxCode(buildingId, null);
-        if (maxCode == null) {
-            maxCode = 0;
-        }
-        return maxCode;
-    }
-
-//    @Override
-//    public int getUnitNewCode(Long buildingId, String unit) {
-//        Integer code = baseDao.getUnitCode(buildingId, unit);
-//        if (code != null && code != NumConstant.ZERO) {
-//            return code;
-//        }
-//        Integer maxCode = baseDao.getUnitMaxCode(buildingId);
-//        if (maxCode == null || maxCode == NumConstant.ZERO) {
-//            maxCode = 0;
-//        }
-//        maxCode = maxCode + 1;
-//        return maxCode;
-//    }
-
     @Override
     public void updateErrorRoom() {
         List<EpidemicBuildingUnitEntity> list = baseDao.getErrorRoom();
@@ -428,47 +405,6 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         }
     }
 
-//    private void updateUnitMaCode(EpidemicBuildingUnitEntity entity) {
-//        String key = RedisKeys.getMaUnitCodeKey(entity.getBuildingId().toString(), entity.getUnit());
-//        String nextKey = RedisKeys.getMaUnitNextCodeKey(entity.getBuildingId().toString());
-//        Object obj = redisUtils.get(key);
-//        Object nextObj = redisUtils.get(nextKey);
-//        if (null != obj) {
-//            int maCodeCache = (int) obj;
-//            entity.setUnitMaCode(maCodeCache);
-//            redisUtils.set(key, maCodeCache, RedisUtils.HOUR_ONE_EXPIRE);
-//            return;
-//        }
-//        if (null != nextObj) {
-//            int maCodeCache = (int) nextObj;
-//            entity.setUnitMaCode(maCodeCache);
-//            redisUtils.set(key, maCodeCache, RedisUtils.HOUR_ONE_EXPIRE);
-//            redisUtils.set(nextKey, maCodeCache + 1, RedisUtils.HOUR_ONE_EXPIRE);
-//            return;
-//        }
-//
-//        int maCode = getUnitNewCode(entity.getBuildingId(), entity.getUnit());
-//        entity.setUnitMaCode(maCode);
-//        redisUtils.set(key, maCode, RedisUtils.HOUR_ONE_EXPIRE);
-//        redisUtils.set(nextKey, maCode + 1, RedisUtils.HOUR_ONE_EXPIRE);
-//    }
-//
-//    private void updateRoomMaCode(EpidemicBuildingUnitEntity entity) {
-//        String key = RedisKeys.getMaRoomCodeKey(entity.getBuildingId().toString(), entity.getUnit());
-//        Object obj = redisUtils.get(key);
-//        if (null != obj) {
-//            int maCodeCache = (int) obj;
-//            maCodeCache = maCodeCache + 1;
-//            entity.setRoomMaCode(maCodeCache);
-//            redisUtils.set(key, maCodeCache, RedisUtils.HOUR_ONE_EXPIRE);
-//            return;
-//        }
-//        int maCode = getRoomMaxCode(entity.getBuildingId(), entity.getUnit());
-//        maCode = maCode + 1;
-//        entity.setRoomMaCode(maCode);
-//        redisUtils.set(key, maCode, RedisUtils.HOUR_ONE_EXPIRE);
-//    }
-
     @Override
     public Result createBatchHouseCodeAndUrl() {
         epidemicPlotBuildingService.updateMaCode();
@@ -888,10 +824,10 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         } else {
             unitCode = unitNum.substring(unitNum.length() - 3);
         }
-        if (roomNum.length() < 3) {
-            roomCode = String.format("%03d", Integer.parseInt(roomNum));
+        if (roomNum.length() < 4) {
+            roomCode = String.format("%04d", Integer.parseInt(roomNum));
         } else {
-            roomCode = roomNum.substring(roomNum.length() - 3);
+            roomCode = roomNum.substring(roomNum.length() - 4);
         }
         return unitCode.concat(roomCode);
     }