From 78430011d467422b5ccd6e141604d7c62ba3b6ac Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 2 Jun 2022 15:02:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=AE=A1=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=BF=81=E7=A7=BB------>=20vim?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/feign/AdminFeignClient.java | 26 ---------------- .../fallback/AdminFeignClientFallback.java | 13 -------- .../vaccine/feign/VimAdminFeignClient.java | 30 +++++++++++++++++++ .../fallback/VimAdminFeignClientFallback.java | 17 +++++++++++ .../controller/BuildingUnitController.java | 6 ++-- .../EpidemicPlotBuildingErrorController.java | 6 ++-- .../controller/PlotBuildingController.java | 6 ++-- .../controller/PlotCoordinateController.java | 6 ++-- .../dao/EpidemicBuildingUnitDao.java | 4 +-- .../dao/EpidemicPlotBuildingDao.java | 4 +-- .../dao/EpidemicPlotBuildingErrorDao.java | 4 +-- .../dao/EpidemicPlotCoordinateDao.java | 4 +-- .../dao/EpidemicPlotCoordinateErrorDao.java | 4 +-- .../personroom/dao/EpidemicPlotGridDao.java | 4 +-- .../personroom/dao/EpidemicUnitOwnerDao.java | 4 +-- .../entity/EpidemicBuildingUnitEntity.java | 2 +- .../entity/EpidemicPlotBuildingEntity.java | 2 +- .../EpidemicPlotBuildingErrorEntity.java | 2 +- .../entity/EpidemicPlotCoordinateEntity.java | 2 +- .../EpidemicPlotCoordinateErrorEntity.java | 2 +- .../entity/EpidemicPlotGridEntity.java | 2 +- .../entity/EpidemicUnitOwnerEntity.java | 2 +- .../excel/EpidemicBuildingUnitExcel.java | 2 +- .../excel/EpidemicPlotBuildingErrorExcel.java | 2 +- .../excel/EpidemicPlotBuildingExcel.java | 2 +- .../EpidemicPlotBuildingImportExcel.java | 2 +- .../EpidemicPlotCoordinateErrorExcel.java | 2 +- .../excel/EpidemicPlotCoordinateExcel.java | 2 +- .../EpidemicPlotCoordinateImportExcel.java | 2 +- .../excel/EpidemicPlotGridExcel.java | 2 +- .../excel/EpidemicUnitOwnerExcel.java | 2 +- .../redis/EpidemicBuildingUnitRedis.java | 2 +- .../redis/EpidemicPlotBuildingErrorRedis.java | 2 +- .../redis/EpidemicPlotBuildingRedis.java | 2 +- .../EpidemicPlotCoordinateErrorRedis.java | 2 +- .../redis/EpidemicPlotCoordinateRedis.java | 2 +- .../redis/EpidemicPlotGridRedis.java | 2 +- .../redis/EpidemicUnitOwnerRedis.java | 2 +- .../service/EpidemicBuildingUnitService.java | 4 +-- .../EpidemicPlotBuildingErrorService.java | 4 +-- .../service/EpidemicPlotBuildingService.java | 4 +-- .../EpidemicPlotCoordinateErrorService.java | 4 +-- .../EpidemicPlotCoordinateService.java | 4 +-- .../service/EpidemicPlotGridService.java | 4 +-- .../service/EpidemicUnitOwnerService.java | 4 +-- .../impl/EpidemicBuildingUnitServiceImpl.java | 14 ++++----- .../EpidemicPlotBuildingErrorServiceImpl.java | 10 +++---- .../impl/EpidemicPlotBuildingServiceImpl.java | 25 ++++++++-------- ...pidemicPlotCoordinateErrorServiceImpl.java | 10 +++---- .../EpidemicPlotCoordinateServiceImpl.java | 29 ++++++++---------- .../impl/EpidemicPlotGridServiceImpl.java | 10 +++---- .../impl/EpidemicUnitOwnerServiceImpl.java | 10 +++---- .../personroom/EpidemicBuildingUnitDao.xml | 8 ++--- .../personroom/EpidemicPlotBuildingDao.xml | 14 ++++----- .../EpidemicPlotBuildingErrorDao.xml | 4 +-- .../personroom/EpidemicPlotCoordinateDao.xml | 8 ++--- .../EpidemicPlotCoordinateErrorDao.xml | 4 +-- .../mapper/personroom/EpidemicPlotGridDao.xml | 4 +-- .../personroom/EpidemicUnitOwnerDao.xml | 4 +-- 59 files changed, 185 insertions(+), 181 deletions(-) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/controller/BuildingUnitController.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/controller/EpidemicPlotBuildingErrorController.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/controller/PlotBuildingController.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/controller/PlotCoordinateController.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/dao/EpidemicBuildingUnitDao.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/dao/EpidemicPlotBuildingDao.java (97%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/dao/EpidemicPlotBuildingErrorDao.java (92%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/dao/EpidemicPlotCoordinateDao.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/dao/EpidemicPlotCoordinateErrorDao.java (93%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/dao/EpidemicPlotGridDao.java (91%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/dao/EpidemicUnitOwnerDao.java (91%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/entity/EpidemicBuildingUnitEntity.java (98%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/entity/EpidemicPlotBuildingEntity.java (98%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/entity/EpidemicPlotBuildingErrorEntity.java (98%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/entity/EpidemicPlotCoordinateEntity.java (97%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/entity/EpidemicPlotCoordinateErrorEntity.java (97%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/entity/EpidemicPlotGridEntity.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/entity/EpidemicUnitOwnerEntity.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/excel/EpidemicBuildingUnitExcel.java (98%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/excel/EpidemicPlotBuildingErrorExcel.java (98%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/excel/EpidemicPlotBuildingExcel.java (98%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/excel/EpidemicPlotBuildingImportExcel.java (97%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/excel/EpidemicPlotCoordinateErrorExcel.java (97%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/excel/EpidemicPlotCoordinateExcel.java (97%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/excel/EpidemicPlotCoordinateImportExcel.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/excel/EpidemicPlotGridExcel.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/excel/EpidemicUnitOwnerExcel.java (97%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/redis/EpidemicBuildingUnitRedis.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/redis/EpidemicPlotBuildingErrorRedis.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/redis/EpidemicPlotBuildingRedis.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/redis/EpidemicPlotCoordinateErrorRedis.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/redis/EpidemicPlotCoordinateRedis.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/redis/EpidemicPlotGridRedis.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/redis/EpidemicUnitOwnerRedis.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/EpidemicBuildingUnitService.java (94%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/EpidemicPlotBuildingErrorService.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/EpidemicPlotBuildingService.java (94%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/EpidemicPlotCoordinateErrorService.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/EpidemicPlotCoordinateService.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/EpidemicPlotGridService.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/EpidemicUnitOwnerService.java (95%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java (94%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/impl/EpidemicPlotBuildingErrorServiceImpl.java (92%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java (96%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/impl/EpidemicPlotCoordinateErrorServiceImpl.java (93%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java (94%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/impl/EpidemicPlotGridServiceImpl.java (93%) rename {epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules => epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine}/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java (92%) rename {epdc-cloud-custom => epdc-cloud-vim-yushan}/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml (93%) rename {epdc-cloud-custom => epdc-cloud-vim-yushan}/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml (94%) rename {epdc-cloud-custom => epdc-cloud-vim-yushan}/src/main/resources/mapper/personroom/EpidemicPlotBuildingErrorDao.xml (96%) rename {epdc-cloud-custom => epdc-cloud-vim-yushan}/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml (95%) rename {epdc-cloud-custom => epdc-cloud-vim-yushan}/src/main/resources/mapper/personroom/EpidemicPlotCoordinateErrorDao.xml (93%) rename {epdc-cloud-custom => epdc-cloud-vim-yushan}/src/main/resources/mapper/personroom/EpidemicPlotGridDao.xml (87%) rename {epdc-cloud-custom => epdc-cloud-vim-yushan}/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml (89%) diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java index 3046517..cce252e 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java @@ -56,31 +56,5 @@ public interface AdminFeignClient { @PostMapping("sys/dict/listPopulationSimple") Result> listPopulationSimple(@RequestBody SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO); - /** - * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 - * @param dictType - * @return - */ - @GetMapping("/sys/dict/listSimple/{dictType}") - Result> listSimpleDictInfo(@PathVariable("dictType") String dictType); - /** - * @return io.pingyin.modules.sys.dto.AllDeptDTO - * @describe: 根据网格名称获取部门信息 - * @author wgf - * @date 2022/4/25 21:54 - * @params [gridName] - */ - @GetMapping("/sys/dept/getAllDeptInfoByGridName/{gridName}") - Result getAllDeptInfoByGridName(@PathVariable("gridName") String gridName); - - /** - * @return io.pingyin.modules.sys.dto.AllDeptDTO - * @describe: 根据网格gridName获取所有相关部门 - * @author wgf - * @date 2022/4/25 21:54 - * @params [gridName] - */ - @GetMapping("/sys/dept/getAllDeptInfoByName/{gridName}") - Result getAllDeptInfoByName(@PathVariable("gridName") String gridName); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java index d5eb6f5..0570c85 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java @@ -36,18 +36,5 @@ public class AdminFeignClientFallback implements AdminFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listPopulationSimple", sysPopulationSimpleDictFormDTO); } - @Override - public Result> listSimpleDictInfo(String dictType) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listSimple", dictType); - } - @Override - public Result getAllDeptInfoByGridName(String gridName) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAllDeptInfoByGridName", gridName); - } - - @Override - public Result getAllDeptInfoByName(String gridName) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAllDeptInfoByName", gridName); - } } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java index c31176c..9846338 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java @@ -2,7 +2,9 @@ package com.elink.esua.epdc.vaccine.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.AllDeptDTO; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; +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.vaccine.feign.fallback.VimAdminFeignClientFallback; @@ -55,4 +57,32 @@ public interface VimAdminFeignClient { **/ @PostMapping(value = "sys/dict/listPopulationSimple", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO); + + /** + * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 + * @param dictType + * @return + */ + @GetMapping("/sys/dict/listSimple/{dictType}") + Result> listSimpleDictInfo(@PathVariable("dictType") String dictType); + + /** + * @return io.pingyin.modules.sys.dto.AllDeptDTO + * @describe: 根据网格名称获取部门信息 + * @author wgf + * @date 2022/4/25 21:54 + * @params [gridName] + */ + @GetMapping("/sys/dept/getAllDeptInfoByGridName/{gridName}") + Result getAllDeptInfoByGridName(@PathVariable("gridName") String gridName); + + /** + * @return io.pingyin.modules.sys.dto.AllDeptDTO + * @describe: 根据网格gridName获取所有相关部门 + * @author wgf + * @date 2022/4/25 21:54 + * @params [gridName] + */ + @GetMapping("/sys/dept/getAllDeptInfoByName/{gridName}") + Result getAllDeptInfoByName(@PathVariable("gridName") String gridName); } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/VimAdminFeignClientFallback.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/VimAdminFeignClientFallback.java index 1625ad8..9e5f519 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/VimAdminFeignClientFallback.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/VimAdminFeignClientFallback.java @@ -3,7 +3,9 @@ package com.elink.esua.epdc.vaccine.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.AllDeptDTO; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; +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.vaccine.feign.VimAdminFeignClient; @@ -33,4 +35,19 @@ public class VimAdminFeignClientFallback implements VimAdminFeignClient { public Result> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO){ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listPopulationSimple", sysPopulationSimpleDictFormDTO); } + + @Override + public Result> listSimpleDictInfo(String dictType) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listSimple", dictType); + } + + @Override + public Result getAllDeptInfoByGridName(String gridName) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAllDeptInfoByGridName", gridName); + } + + @Override + public Result getAllDeptInfoByName(String gridName) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAllDeptInfoByName", gridName); + } } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/BuildingUnitController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/BuildingUnitController.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java index 74aceac..101e906 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/BuildingUnitController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.controller; +package com.elink.esua.epdc.vaccine.personroom.controller; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -28,8 +28,8 @@ 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.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; -import com.elink.esua.epdc.modules.personroom.excel.EpidemicBuildingUnitExcel; -import com.elink.esua.epdc.modules.personroom.service.EpidemicBuildingUnitService; +import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicBuildingUnitExcel; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/EpidemicPlotBuildingErrorController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/EpidemicPlotBuildingErrorController.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/EpidemicPlotBuildingErrorController.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/EpidemicPlotBuildingErrorController.java index 05ff4fa..f7c451d 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/EpidemicPlotBuildingErrorController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/EpidemicPlotBuildingErrorController.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.controller; +package com.elink.esua.epdc.vaccine.personroom.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; @@ -26,8 +26,8 @@ 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.dto.personroom.EpidemicPlotBuildingErrorDTO; -import com.elink.esua.epdc.modules.personroom.excel.EpidemicPlotBuildingErrorExcel; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotBuildingErrorService; +import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotBuildingErrorExcel; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotBuildingErrorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/PlotBuildingController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/PlotBuildingController.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java index dd77262..e94d281 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/PlotBuildingController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.controller; +package com.elink.esua.epdc.vaccine.personroom.controller; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -29,8 +29,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotBuildingResultDTO; -import com.elink.esua.epdc.modules.personroom.excel.EpidemicPlotBuildingExcel; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotBuildingService; +import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotBuildingExcel; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotBuildingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/PlotCoordinateController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/PlotCoordinateController.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java index c66c441..d9b419c 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/PlotCoordinateController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.controller; +package com.elink.esua.epdc.vaccine.personroom.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; @@ -29,8 +29,8 @@ import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; import com.elink.esua.epdc.dto.personroom.form.EpidemicPlotCoordinateFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotCoordinateResultDTO; -import com.elink.esua.epdc.modules.personroom.excel.EpidemicPlotCoordinateExcel; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotCoordinateService; +import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotCoordinateExcel; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotCoordinateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicBuildingUnitDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicBuildingUnitDao.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java index 72909c5..43864c2 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicBuildingUnitDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.dao; +package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicBuildingUnitEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotBuildingDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotBuildingDao.java similarity index 97% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotBuildingDao.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotBuildingDao.java index 782f65b..593d19d 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotBuildingDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotBuildingDao.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.dao; +package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotBuildingResultDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotBuildingErrorDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotBuildingErrorDao.java similarity index 92% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotBuildingErrorDao.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotBuildingErrorDao.java index ba02ed7..68ecc5b 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotBuildingErrorDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotBuildingErrorDao.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.dao; +package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingErrorDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingErrorEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingErrorEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotCoordinateDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotCoordinateDao.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotCoordinateDao.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotCoordinateDao.java index 3099be9..3ce4a4b 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotCoordinateDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotCoordinateDao.java @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.dao; +package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; import com.elink.esua.epdc.dto.personroom.form.EpidemicPlotCoordinateFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotCoordinateResultDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotCoordinateErrorDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotCoordinateErrorDao.java similarity index 93% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotCoordinateErrorDao.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotCoordinateErrorDao.java index 4649d04..da502dd 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotCoordinateErrorDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotCoordinateErrorDao.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.dao; +package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateErrorDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateErrorEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateErrorEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotGridDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotGridDao.java similarity index 91% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotGridDao.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotGridDao.java index 8aa7533..a0b7ff3 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotGridDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotGridDao.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.dao; +package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotGridEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotGridEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicUnitOwnerDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java similarity index 91% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicUnitOwnerDao.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java index 46b0d81..f1e1419 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicUnitOwnerDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.dao; +package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicUnitOwnerEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicBuildingUnitEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicBuildingUnitEntity.java similarity index 98% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicBuildingUnitEntity.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicBuildingUnitEntity.java index e0be48e..06b7752 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicBuildingUnitEntity.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicBuildingUnitEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.entity; +package com.elink.esua.epdc.vaccine.personroom.entity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotBuildingEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotBuildingEntity.java similarity index 98% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotBuildingEntity.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotBuildingEntity.java index 05005b9..d500ae5 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotBuildingEntity.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotBuildingEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.entity; +package com.elink.esua.epdc.vaccine.personroom.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.elink.esua.epdc.vaccine.common.base.BasePingyinEntity; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotBuildingErrorEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotBuildingErrorEntity.java similarity index 98% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotBuildingErrorEntity.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotBuildingErrorEntity.java index 951dd0b..e76778f 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotBuildingErrorEntity.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotBuildingErrorEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.entity; +package com.elink.esua.epdc.vaccine.personroom.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.elink.esua.epdc.vaccine.common.base.BasePingyinEntity; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotCoordinateEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateEntity.java similarity index 97% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotCoordinateEntity.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateEntity.java index f9237e3..e5698f6 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotCoordinateEntity.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.entity; +package com.elink.esua.epdc.vaccine.personroom.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.elink.esua.epdc.vaccine.common.base.BasePingyinEntity; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotCoordinateErrorEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateErrorEntity.java similarity index 97% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotCoordinateErrorEntity.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateErrorEntity.java index 4dda829..a2af6fb 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotCoordinateErrorEntity.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateErrorEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.entity; +package com.elink.esua.epdc.vaccine.personroom.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.elink.esua.epdc.vaccine.common.base.BasePingyinEntity; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotGridEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotGridEntity.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotGridEntity.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotGridEntity.java index aea4989..680e962 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotGridEntity.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotGridEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.entity; +package com.elink.esua.epdc.vaccine.personroom.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.elink.esua.epdc.vaccine.common.base.BasePingyinEntity; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicUnitOwnerEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicUnitOwnerEntity.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicUnitOwnerEntity.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicUnitOwnerEntity.java index a2f727c..00d804f 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicUnitOwnerEntity.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicUnitOwnerEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.entity; +package com.elink.esua.epdc.vaccine.personroom.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.elink.esua.epdc.vaccine.common.base.BasePingyinEntity; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicBuildingUnitExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicBuildingUnitExcel.java similarity index 98% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicBuildingUnitExcel.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicBuildingUnitExcel.java index db89341..6643d99 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicBuildingUnitExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicBuildingUnitExcel.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.excel; +package com.elink.esua.epdc.vaccine.personroom.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingErrorExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotBuildingErrorExcel.java similarity index 98% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingErrorExcel.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotBuildingErrorExcel.java index 2bb7549..cfebd1a 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingErrorExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotBuildingErrorExcel.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.excel; +package com.elink.esua.epdc.vaccine.personroom.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotBuildingExcel.java similarity index 98% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingExcel.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotBuildingExcel.java index 24dc04e..e26bc2b 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotBuildingExcel.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.excel; +package com.elink.esua.epdc.vaccine.personroom.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingImportExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotBuildingImportExcel.java similarity index 97% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingImportExcel.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotBuildingImportExcel.java index 772e97a..8b31b6e 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingImportExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotBuildingImportExcel.java @@ -1,4 +1,4 @@ -package com.elink.esua.epdc.modules.personroom.excel; +package com.elink.esua.epdc.vaccine.personroom.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateErrorExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotCoordinateErrorExcel.java similarity index 97% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateErrorExcel.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotCoordinateErrorExcel.java index c8b77aa..e5f1dd7 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateErrorExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotCoordinateErrorExcel.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.excel; +package com.elink.esua.epdc.vaccine.personroom.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotCoordinateExcel.java similarity index 97% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateExcel.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotCoordinateExcel.java index 1bc00cf..b4d14aa 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotCoordinateExcel.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.excel; +package com.elink.esua.epdc.vaccine.personroom.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateImportExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotCoordinateImportExcel.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateImportExcel.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotCoordinateImportExcel.java index aef8092..d86ccce 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateImportExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotCoordinateImportExcel.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.excel; +package com.elink.esua.epdc.vaccine.personroom.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotGridExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotGridExcel.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotGridExcel.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotGridExcel.java index 3885cb9..20d4b36 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotGridExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicPlotGridExcel.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.excel; +package com.elink.esua.epdc.vaccine.personroom.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicUnitOwnerExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicUnitOwnerExcel.java similarity index 97% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicUnitOwnerExcel.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicUnitOwnerExcel.java index 53bd586..23fcd7b 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicUnitOwnerExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/excel/EpidemicUnitOwnerExcel.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.excel; +package com.elink.esua.epdc.vaccine.personroom.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicBuildingUnitRedis.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicBuildingUnitRedis.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicBuildingUnitRedis.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicBuildingUnitRedis.java index 3ddcd36..aa6211d 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicBuildingUnitRedis.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicBuildingUnitRedis.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.redis; +package com.elink.esua.epdc.vaccine.personroom.redis; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotBuildingErrorRedis.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotBuildingErrorRedis.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotBuildingErrorRedis.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotBuildingErrorRedis.java index b531d75..37bf00b 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotBuildingErrorRedis.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotBuildingErrorRedis.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.redis; +package com.elink.esua.epdc.vaccine.personroom.redis; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotBuildingRedis.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotBuildingRedis.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotBuildingRedis.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotBuildingRedis.java index 8cdd902..4c61d93 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotBuildingRedis.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotBuildingRedis.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.redis; +package com.elink.esua.epdc.vaccine.personroom.redis; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotCoordinateErrorRedis.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotCoordinateErrorRedis.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotCoordinateErrorRedis.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotCoordinateErrorRedis.java index 8dd5955..25de6d9 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotCoordinateErrorRedis.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotCoordinateErrorRedis.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.redis; +package com.elink.esua.epdc.vaccine.personroom.redis; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotCoordinateRedis.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotCoordinateRedis.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotCoordinateRedis.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotCoordinateRedis.java index 9e91521..7809abb 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotCoordinateRedis.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotCoordinateRedis.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.redis; +package com.elink.esua.epdc.vaccine.personroom.redis; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotGridRedis.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotGridRedis.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotGridRedis.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotGridRedis.java index 3dbb523..8dfe772 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotGridRedis.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicPlotGridRedis.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.redis; +package com.elink.esua.epdc.vaccine.personroom.redis; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicUnitOwnerRedis.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicUnitOwnerRedis.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicUnitOwnerRedis.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicUnitOwnerRedis.java index 45a7ec2..a9657d2 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicUnitOwnerRedis.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/redis/EpidemicUnitOwnerRedis.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.redis; +package com.elink.esua.epdc.vaccine.personroom.redis; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicBuildingUnitService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java similarity index 94% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicBuildingUnitService.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java index f7be0d0..9f5c3ac 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicBuildingUnitService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service; +package com.elink.esua.epdc.vaccine.personroom.service; import com.elink.esua.epdc.commons.mybatis.service.CrudService; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicBuildingUnitEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; /** * 楼栋，房屋信息 diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotBuildingErrorService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingErrorService.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotBuildingErrorService.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingErrorService.java index 9c44f2e..d37a183 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotBuildingErrorService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingErrorService.java @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service; +package com.elink.esua.epdc.vaccine.personroom.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingErrorDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingErrorEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingErrorEntity; import java.util.List; import java.util.Map; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotBuildingService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java similarity index 94% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotBuildingService.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java index a606153..e7d3bc6 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotBuildingService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service; +package com.elink.esua.epdc.vaccine.personroom.service; import com.elink.esua.epdc.commons.mybatis.service.CrudService; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotBuildingResultDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotCoordinateErrorService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotCoordinateErrorService.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotCoordinateErrorService.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotCoordinateErrorService.java index 8d2a469..1b63912 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotCoordinateErrorService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotCoordinateErrorService.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service; +package com.elink.esua.epdc.vaccine.personroom.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateErrorDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateErrorEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateErrorEntity; import java.util.List; import java.util.Map; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotCoordinateService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotCoordinateService.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotCoordinateService.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotCoordinateService.java index 9f2ed35..7bdf760 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotCoordinateService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotCoordinateService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service; +package com.elink.esua.epdc.vaccine.personroom.service; import com.elink.esua.epdc.commons.mybatis.service.CrudService; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -23,7 +23,7 @@ import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; import com.elink.esua.epdc.dto.personroom.form.EpidemicPlotCoordinateFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotCoordinateResultDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateEntity; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotGridService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotGridService.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotGridService.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotGridService.java index e195122..4e4f6c7 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotGridService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotGridService.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service; +package com.elink.esua.epdc.vaccine.personroom.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.personroom.EpidemicPlotGridDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotGridEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotGridEntity; import java.util.List; import java.util.Map; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicUnitOwnerService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java similarity index 95% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicUnitOwnerService.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java index 8129f08..6ad4e0d 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicUnitOwnerService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service; +package com.elink.esua.epdc.vaccine.personroom.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicUnitOwnerEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; import java.util.List; import java.util.Map; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java similarity index 94% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java index 9c30267..0b32d6a 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service.impl; +package com.elink.esua.epdc.vaccine.personroom.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -29,12 +29,12 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; -import com.elink.esua.epdc.modules.personroom.dao.EpidemicBuildingUnitDao; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicBuildingUnitEntity; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicUnitOwnerEntity; -import com.elink.esua.epdc.modules.personroom.redis.EpidemicBuildingUnitRedis; -import com.elink.esua.epdc.modules.personroom.service.EpidemicBuildingUnitService; -import com.elink.esua.epdc.modules.personroom.service.EpidemicUnitOwnerService; +import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicBuildingUnitDao; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; +import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicBuildingUnitRedis; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingErrorServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingErrorServiceImpl.java similarity index 92% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingErrorServiceImpl.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingErrorServiceImpl.java index 196a1b2..8bb4bc7 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingErrorServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingErrorServiceImpl.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service.impl; +package com.elink.esua.epdc.vaccine.personroom.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,10 +24,10 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingErrorDTO; -import com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotBuildingErrorDao; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingErrorEntity; -import com.elink.esua.epdc.modules.personroom.redis.EpidemicPlotBuildingErrorRedis; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotBuildingErrorService; +import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotBuildingErrorDao; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingErrorEntity; +import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicPlotBuildingErrorRedis; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotBuildingErrorService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java similarity index 96% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java index 17f7e6d..9255a84 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service.impl; +package com.elink.esua.epdc.vaccine.personroom.service.impl; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; @@ -34,17 +34,16 @@ import com.elink.esua.epdc.dto.SysSimpleDictDTO; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotBuildingResultDTO; -import com.elink.esua.epdc.modules.feign.AdminFeignClient; -import com.elink.esua.epdc.modules.personroom.dao.*; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingEntity; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingErrorEntity; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateEntity; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotGridEntity; -import com.elink.esua.epdc.modules.personroom.excel.EpidemicPlotBuildingImportExcel; -import com.elink.esua.epdc.modules.personroom.redis.EpidemicPlotBuildingRedis; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotBuildingErrorService; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotBuildingService; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotCoordinateService; +import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient; +import com.elink.esua.epdc.vaccine.personroom.dao.*; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingErrorEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotGridEntity; +import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotBuildingImportExcel; +import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicPlotBuildingRedis; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotBuildingErrorService; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotBuildingService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -75,7 +74,7 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl. */ -package com.elink.esua.epdc.modules.personroom.service.impl; +package com.elink.esua.epdc.vaccine.personroom.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,10 +24,10 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateErrorDTO; -import com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotCoordinateErrorDao; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateErrorEntity; -import com.elink.esua.epdc.modules.personroom.redis.EpidemicPlotCoordinateErrorRedis; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotCoordinateErrorService; +import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotCoordinateErrorDao; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateErrorEntity; +import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicPlotCoordinateErrorRedis; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotCoordinateErrorService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java similarity index 94% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java index d232b15..a4f3c08 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service.impl; +package com.elink.esua.epdc.vaccine.personroom.service.impl; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; @@ -37,25 +37,22 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; 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.dto.AllDeptDTO; -import com.elink.esua.epdc.dto.SysSimpleDictDTO; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotGridDTO; import com.elink.esua.epdc.dto.personroom.form.EpidemicPlotCoordinateFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotCoordinateResultDTO; -import com.elink.esua.epdc.modules.feign.AdminFeignClient; -import com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotBuildingDao; -import com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotCoordinateDao; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateEntity; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateErrorEntity; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotGridEntity; -import com.elink.esua.epdc.modules.personroom.excel.EpidemicPlotCoordinateImportExcel; -import com.elink.esua.epdc.modules.personroom.redis.EpidemicPlotCoordinateRedis; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotCoordinateErrorService; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotCoordinateService; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotGridService; -import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInoutRecordDao; -import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInoutRecordService; +import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient; +import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotBuildingDao; +import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotCoordinateDao; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateErrorEntity; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotGridEntity; +import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotCoordinateImportExcel; +import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicPlotCoordinateRedis; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotCoordinateErrorService; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotCoordinateService; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotGridService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -91,7 +88,7 @@ public class EpidemicPlotCoordinateServiceImpl extends CrudServiceImpl. */ -package com.elink.esua.epdc.modules.personroom.service.impl; +package com.elink.esua.epdc.vaccine.personroom.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -25,10 +25,10 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.personroom.EpidemicPlotGridDTO; -import com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotGridDao; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotGridEntity; -import com.elink.esua.epdc.modules.personroom.redis.EpidemicPlotGridRedis; -import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotGridService; +import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotGridDao; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotGridEntity; +import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicPlotGridRedis; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotGridService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java similarity index 92% rename from epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java index 1f5edfa..55a7c08 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.modules.personroom.service.impl; +package com.elink.esua.epdc.vaccine.personroom.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,10 +24,10 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; -import com.elink.esua.epdc.modules.personroom.dao.EpidemicUnitOwnerDao; -import com.elink.esua.epdc.modules.personroom.entity.EpidemicUnitOwnerEntity; -import com.elink.esua.epdc.modules.personroom.redis.EpidemicUnitOwnerRedis; -import com.elink.esua.epdc.modules.personroom.service.EpidemicUnitOwnerService; +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.redis.EpidemicUnitOwnerRedis; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml similarity index 93% rename from epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml rename to epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml index fa5d14b..03ba48c 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml @@ -1,9 +1,9 @@ - + - + @@ -90,7 +90,7 @@ ORDER BY u.CREATED_TIME DESC - SELECT id FROM @@ -113,7 +113,7 @@ bu.ID = #{id} - SELECT * FROM diff --git a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml similarity index 94% rename from epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml rename to epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml index 724760f..379fd6d 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml @@ -1,9 +1,9 @@ - + - + @@ -19,7 +19,7 @@ - SELECT id FROM @@ -134,7 +134,7 @@ order by building_code desc limit 1 - select * from epidemic_plot_building where del_flag = '0' @@ -144,19 +144,19 @@ and GRID_ID=#{gridId} and BUILDING_NAME = #{buildingName} - select id,BUILDING_NAME from epidemic_plot_building where del_flag = '0' and building_code=#{buildingCode} - select * from epidemic_plot_building where del_flag = '0' and building_code=#{buildingCode} and id!=#{id} - select * from epidemic_plot_building where del_flag = '0' diff --git a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingErrorDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingErrorDao.xml similarity index 96% rename from epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingErrorDao.xml rename to epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingErrorDao.xml index 83a9971..c0143ff 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingErrorDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingErrorDao.xml @@ -1,9 +1,9 @@ - + - + diff --git a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml similarity index 95% rename from epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml rename to epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml index 7b1742e..f51ed2b 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml @@ -1,9 +1,9 @@ - + - + @@ -123,7 +123,7 @@ - SELECT * FROM @@ -158,7 +158,7 @@ LIMIT 1 - select id, PLOT_NAME from epidemic_plot_coordinate diff --git a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateErrorDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateErrorDao.xml similarity index 93% rename from epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateErrorDao.xml rename to epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateErrorDao.xml index 15a0a25..756ee65 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateErrorDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateErrorDao.xml @@ -1,9 +1,9 @@ - + - + diff --git a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotGridDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotGridDao.xml similarity index 87% rename from epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotGridDao.xml rename to epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotGridDao.xml index ffbf347..1a0a1d1 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotGridDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotGridDao.xml @@ -1,9 +1,9 @@ - + - + diff --git a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml similarity index 89% rename from epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml rename to epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml index 43682d3..7ef7292 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml @@ -1,9 +1,9 @@ - + - +