From f0760b3456d15b2297ee04b0717f9ea3e6f3f307 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 20 Jun 2022 13:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=BF=E5=B1=8B=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BuildingUnitController.java | 6 +++++ .../dao/EpidemicBuildingUnitDao.java | 3 +++ .../entity/EpidemicBuildingUnitEntity.java | 4 --- .../service/EpidemicBuildingUnitService.java | 10 +++++++ .../impl/EpidemicBuildingUnitServiceImpl.java | 21 +++++++++++++++ .../personroom/EpidemicBuildingUnitDao.xml | 27 +++++++++++++++++++ 6 files changed, 67 insertions(+), 4 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 532d567..1fbff70 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 @@ -121,6 +121,12 @@ public class BuildingUnitController { return new Result(); } + @PostMapping("updateRoomCode") + public Result updateRoomCode() { + epidemicBuildingUnitService.updateRoomCode(); + return new Result(); + } + @PostMapping("updateErrorRoom") public Result updateErrorRoom() { epidemicBuildingUnitService.updateErrorRoom(); diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java index 6163e81..85e65f5 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java +++ b/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 getErrorRoom(); + List listNoRoomCode(); + /** * 单元列表下拉框 * diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicBuildingUnitEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicBuildingUnitEntity.java index 3796b9c..bbebb4c 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicBuildingUnitEntity.java +++ b/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; /** 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 7e2f808..6824416 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 @@ -142,6 +142,16 @@ public interface EpidemicBuildingUnitService extends CrudService list = baseDao.listNoRoomCode(); + List 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()); @@ -823,7 +842,9 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl1 + +