From 709b5f639502241e31e914522e75af0df9bdbfc7 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 16 Jun 2022 18:12:44 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=8D=95=E5=85=83?= =?UTF-8?q?=E8=87=AA=E5=A2=9EID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HousingInformationController.java | 1 - .../controller/PlotBuildingController.java | 14 +-- .../dao/EpidemicBuildingUnitDao.java | 6 +- .../entity/EpidemicBuildingUnitEntity.java | 5 ++ .../service/EpidemicBuildingUnitService.java | 13 ++- .../impl/EpidemicBuildingUnitServiceImpl.java | 88 +++++++++++++++++-- .../personroom/EpidemicBuildingUnitDao.xml | 32 ++++++- .../personroom/EpidemicPlotBuildingDao.xml | 1 + .../personroom/EpidemicPlotCoordinateDao.xml | 2 + 9 files changed, 145 insertions(+), 17 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/controller/HousingInformationController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/controller/HousingInformationController.java index 3ecd08e..6f628c7 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/controller/HousingInformationController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/controller/HousingInformationController.java @@ -225,7 +225,6 @@ public class HousingInformationController { // 将属性的首字母大写 String methodName = field.getName().replaceFirst(field.getName().substring(0, 1), field.getName().substring(0, 1).toUpperCase()); - System.out.println(methodName); try { Method methodGet = clazz.getMethod("get" + methodName); // 调用getter方法获取属性值 diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java index 40468b0..579e487 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java @@ -121,18 +121,18 @@ public class PlotBuildingController { */ @GetMapping("getBuildingOptionApp") public Result> getBuildingOptionApp(@RequestBody EpidemicPlotBuildingDTO formDTO) { - log.info("################楼栋############plotId:"+formDTO.getPlotId()); + log.info("################楼栋############plotId:" + formDTO.getPlotId()); List list = epidemicPlotBuildingService.getBuildingOption(formDTO); return new Result>().ok(list); } /** - * @describe: 导入房屋信息 - * @author wangtong - * @date 2022/4/25 17:01 - * @params [file] - * @return io.pingyin.common.utils.Result - */ + * @return io.pingyin.common.utils.Result + * @describe: 导入房屋信息 + * @author wangtong + * @date 2022/4/25 17:01 + * @params [file] + */ @PostMapping("importBuilding") public Result importBuilding(@RequestParam("file") MultipartFile file) { return epidemicPlotBuildingService.importBuilding(file); 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 3b2661f..2cce1be 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 @@ -111,7 +111,11 @@ public interface EpidemicBuildingUnitDao extends BaseDao listAllUnitInfo(@Param("gridId") String gridId); - Integer getMaxCode(); + Integer getRoomMaxCode(@Param("buildingId") Long buildingId, @Param("unit") String unit); + + Integer getUnitMaxCode(@Param("buildingId") Long buildingId); + + Integer getUnitCode(@Param("buildingId") Long buildingId, @Param("unit") String unit); List getErrorRoom(); 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 85b0219..3796b9c 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 @@ -181,6 +181,11 @@ public class EpidemicBuildingUnitEntity extends BasePingyinEntity { */ private Integer roomMaCode; + /** + * 房屋码(5位数字自增) + */ + private Integer unitMaCode; + /** * 二维码 */ 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 80e9073..760ea57 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 @@ -28,7 +28,6 @@ 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.EpidemicUnitInfoResultDTO; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -121,7 +120,17 @@ public interface EpidemicBuildingUnitService extends CrudService page(Map params) { IPage page = getPage(params); @@ -179,6 +184,13 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl list = baseDao.getErrorRoom(); @@ -363,13 +389,59 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl list = baseDao.selectList(getWrapper(params)); if (!list.isEmpty()) { - for (int i = 0; i < list.size(); i++) { - list.get(i).setRoomMaCode(i + 1); + for (EpidemicBuildingUnitEntity epidemicBuildingUnitEntity : list) { + if (epidemicBuildingUnitEntity.getBuildingId() != null && StringUtils.isNotBlank(epidemicBuildingUnitEntity.getUnit())) { + updateUnitMaCode(epidemicBuildingUnitEntity); + if (StringUtils.isNotBlank(epidemicBuildingUnitEntity.getRoomNo())) { + updateRoomMaCode(epidemicBuildingUnitEntity); + } + } } updateBatchById(list); } } + 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(); @@ -609,7 +681,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl unitList = listAllUnitInfo(parentAndAllDeptDTO.getGrid()); List addOwner = new ArrayList<>(); for (EpidemicUserInfoEntity item : addList) { @@ -633,6 +705,9 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl - SELECT MAX( ROOM_MA_CODE ) FROM epidemic_building_unit + WHERE + DEL_FLAG = '0' + + AND BUILDING_ID = #{buildingId} + + + AND UNIT = #{unit} + + + + + + diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml index d1bb786..8fd927e 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml @@ -169,6 +169,8 @@ MAX( ROOM_MA_CODE ) FROM epidemic_plot_coordinate + WHERE + DEL_FLAG = '0' From cf07d10344b00772720102844437d501a946c542 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 16 Jun 2022 18:27:45 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/EpidemicBuildingUnitService.java | 20 ++-- .../impl/EpidemicBuildingUnitServiceImpl.java | 98 +++++++++---------- .../personroom/EpidemicPlotBuildingDao.xml | 1 + 3 files changed, 60 insertions(+), 59 deletions(-) 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 760ea57..2657178 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 @@ -121,16 +121,16 @@ public interface EpidemicBuildingUnitService extends CrudService Date: Fri, 17 Jun 2022 09:03:28 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vaccine/personroom/controller/BuildingUnitController.java | 4 ---- 1 file changed, 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 e119d05..68101b3 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 @@ -26,7 +26,6 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.config.QrCodeProperties; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO; @@ -56,9 +55,6 @@ public class BuildingUnitController { @Autowired private EpidemicBuildingUnitService epidemicBuildingUnitService; - @Autowired - private QrCodeProperties qrCodeProperties; - @GetMapping("page") public Result> page(@RequestParam Map params) { PageData page = epidemicBuildingUnitService.page(params); From 83da581f1dad24d24af1e62bd42ed74b94a27b4b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 17 Jun 2022 10:09:35 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/EpidemicReportUserInfoDTO.java | 2 +- .../impl/EpidemicUserInfoServiceImpl.java | 44 ++++++++++++++----- .../controller/BuildingUnitController.java | 12 +++++ 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java index 22674c1..40f37cc 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java @@ -297,7 +297,7 @@ public class EpidemicReportUserInfoDTO implements Serializable { // @Excel(name = "房屋地址") private String houseAddress; - + private String unitId; } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index 1f4af92..9a9d690 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -27,14 +27,15 @@ import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; -import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotBuildingResultDTO; -import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO; import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import com.elink.esua.epdc.vaccine.constant.ImageConstant; import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao; import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInoutRecordDao; import com.elink.esua.epdc.vaccine.epidemic.dto.*; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.*; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserErrorEntity; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInoutRecordEntity; @@ -46,8 +47,6 @@ import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient; import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExcel; import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; -import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; -import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotBuildingService; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService; import com.elink.esua.epdc.vaccine.vim.dao.VaccinationInfoDao; import com.elink.esua.epdc.vaccine.vim.dao.VimImgDao; @@ -100,10 +99,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl getPageList(Map params) { IPage page = getPage(params); + String grids = (String) params.get("deptIdList"); + String agencyList = (String) params.get("agencyList"); + params.put("deptIdList", null); + if (StringUtils.isNotBlank(grids)) { + List gridList = Arrays.asList(grids.split(",")); + params.put("gridList", gridList); + } + if (StringUtils.isNotBlank(agencyList)) { + List agencyIdList = Arrays.asList(agencyList.split(",")); + params.put("agencyList", agencyIdList); + } UserDetail user = SecurityUser.getUser(); if (user == null) { throw new RenException("用户未登录"); @@ -217,6 +224,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl result = adminVimFeignClient.getParentAndAllDept(formDTO.getDeptId()); ParentAndAllDeptDTO parentAndAllDeptDTO = result.getData(); @@ -1708,4 +1722,12 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl>().ok(list); } + @GetMapping("getUnitOptions") + public Result> getUnitOptions(EpidemicBuildingUnitDTO formDTO) { + List list = epidemicBuildingUnitService.getUnitOption(formDTO); + return new Result>().ok(list); + } + /** * 房间号下拉框 * @@ -155,6 +161,12 @@ public class BuildingUnitController { return new Result>().ok(list); } + @GetMapping("getHouseOptions") + public Result> getHouseOptions(EpidemicBuildingUnitDTO formDTO) { + List list = epidemicBuildingUnitService.getHouseOption(formDTO); + return new Result>().ok(list); + } + /** * @return void * @describe: 下载房屋编码 From d1db921fa3e914578f1eb39616d3515c88573875 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 17 Jun 2022 10:14:31 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java | 2 +- .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java index 40f37cc..8c34507 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java @@ -297,7 +297,7 @@ public class EpidemicReportUserInfoDTO implements Serializable { // @Excel(name = "房屋地址") private String houseAddress; - private String unitId; + private Long unitId; } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index 9a9d690..111017f 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -224,7 +224,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl Date: Fri, 17 Jun 2022 10:40:11 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/EpidemicUserInoutRecordDao.java | 9 ++++++ .../impl/EpidemicUserInfoServiceImpl.java | 31 +++++-------------- .../epidemic/EpidemicUserInoutRecordDao.xml | 6 ++++ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInoutRecordDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInoutRecordDao.java index a0fc56a..63f455f 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInoutRecordDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInoutRecordDao.java @@ -148,4 +148,13 @@ public interface EpidemicUserInoutRecordDao extends BaseDao + + delete from epidemic_user_inout_record where id in + + #{id} + + From 6653f77d866b9845ae98aef631cecc9888805037 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 17 Jun 2022 10:50:36 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpidemicUserInfoController.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java index 65ae9d4..23f9c05 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java @@ -84,8 +84,7 @@ public class EpidemicUserInfoController { public Result delete(@RequestBody Long[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); -// epidemicUserInfoService.delete(ids); -// return new Result(); + return epidemicUserInfoService.deleteUserById(ids); } @@ -96,15 +95,6 @@ public class EpidemicUserInfoController { exportParams.setHeight((short) (2 * 256)); ExcelUtils.exportBigExcel(StringUtils.EMPTY, params, exportServer, response, exportParams, EpidecmicUserNewExcel.class); } -/* - @GetMapping("export") - @LogOperation("导出") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = epidemicUserInfoService.getList(params); - - ExcelUtils.exportExcelToTarget(response, null, list, EpidecmicUserNewExcel.class); - } -*/ /** * @return io.pingyin.common.utils.Result> From 2e17236e069be25be6ef52dcf3a530c774f0151d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 17 Jun 2022 13:37:04 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8D=95=E5=85=83?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epidemic/dto/EpidemicRecordDetailDTO.java | 4 +++ .../impl/EpidemicUserInfoServiceImpl.java | 34 ++++++++----------- .../controller/BuildingUnitController.java | 6 ++++ .../dao/EpidemicBuildingUnitDao.java | 2 ++ .../service/EpidemicBuildingUnitService.java | 2 +- .../impl/EpidemicBuildingUnitServiceImpl.java | 5 +++ .../personroom/EpidemicBuildingUnitDao.xml | 17 ++++++++++ 7 files changed, 50 insertions(+), 20 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java index 3bac10b..4f81f00 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java @@ -305,4 +305,8 @@ public class EpidemicRecordDetailDTO implements Serializable { // @Excel(name = "房屋地址") private String houseAddress; + private Long unitId; + private Long plotId; + private Long buildingId; + } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index 9ee7ca1..9b4930a 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -23,10 +23,12 @@ import com.elink.esua.epdc.dto.SysSimpleDictDTO; import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO; import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO; import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO; +import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; +import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import com.elink.esua.epdc.vaccine.constant.ImageConstant; import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao; @@ -47,6 +49,7 @@ import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient; import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExcel; import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService; import com.elink.esua.epdc.vaccine.vim.dao.VaccinationInfoDao; import com.elink.esua.epdc.vaccine.vim.dao.VimImgDao; @@ -103,6 +106,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl>().ok(list); } + @GetMapping("getUnitInfo") + public Result getUnitInfo(EpidemicBuildingUnitDTO formDTO) { + EpidemicBuildingUnitDetailResultDTO dto = epidemicBuildingUnitService.getUnitInfo(formDTO); + return new Result().ok(dto); + } + /** * 房间号下拉框 * 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 2cce1be..6163e81 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 @@ -148,4 +148,6 @@ public interface EpidemicBuildingUnitDao extends BaseDao + + From 7dfccf38e890c746f8cd52e533cd46728125c0d1 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 17 Jun 2022 14:05:18 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpidemicReportUserInfoServiceImpl.java | 35 +------------------ .../impl/EpidemicUserInfoServiceImpl.java | 5 ++- .../personroom/EpidemicBuildingUnitDao.xml | 5 +-- 3 files changed, 6 insertions(+), 39 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java index 7452c0b..511be49 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java @@ -73,7 +73,6 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl page(Map params) { -// params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); IPage page = getPage(params); List list = baseDao.getEpidemicUserInfoList(params); for (EpidemicReportUserInfoDTO eru : list) { @@ -88,34 +87,6 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl list = baseDao.selectUserInfoByNumber(id,mobile,idCard); -// if (list.size() >0) { -// if (StringUtils.isNotBlank(mobile)) { -// for (EpidemicReportUserInfoEntity entity : list) { -// if (!id.equals(entity.getId())) { -// if (StringUtils.isNotBlank(entity.getMobile()) && mobile.equals(entity.getMobile())) { -// throw new RenException("手机号码已被注册"); -// } -// } -// } -// } -// throw new RenException("身份证号码已被注册"); -// } - EpidemicReportUserInfoDTO infoDTO = new EpidemicReportUserInfoDTO(); BeanUtils.copyProperties(dto, infoDTO); this.update(infoDTO); @@ -187,7 +158,6 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl list(Map params) { -// params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); List list = baseDao.getEpidemicUserInfoList(params); for (EpidemicReportUserInfoDTO eru : list) { eru.setIdCard(idEncrypt(eru.getIdCard())); @@ -673,10 +643,7 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl Date: Fri, 17 Jun 2022 14:15:43 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8E=BBID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index ff318bd..dae2544 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -1695,6 +1695,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl Date: Fri, 17 Jun 2022 15:11:10 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java | 1 + .../personroom/controller/BuildingUnitController.java | 6 ------ .../resources/mapper/personroom/EpidemicBuildingUnitDao.xml | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index dae2544..c81cca8 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -202,6 +202,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl>().ok(list); } - @GetMapping("getUnitInfo") - public Result getUnitInfo(EpidemicBuildingUnitDTO formDTO) { - EpidemicBuildingUnitDetailResultDTO dto = epidemicBuildingUnitService.getUnitInfo(formDTO); - return new Result().ok(dto); - } - /** * 房间号下拉框 * diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml index 5ebf1f5..d586d14 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml @@ -292,6 +292,7 @@ LEFT JOIN epidemic_plot_coordinate pc ON pb.PLOT_ID = pc.ID WHERE o.ID_CARD = #{idCard} + AND pc.GRID_ID = #{gridId} ORDER BY CREATED_TIME DESC LIMIT 1