Merge branch 'feature/codemove' into feature/user_house_import

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<List<SysPopulationSimpleDictDTO>> listPopulationSimple(@RequestBody SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO);
 
-    /**
-     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
-     * @param dictType
-     * @return
-     */
-    @GetMapping("/sys/dict/listSimple/{dictType}")
-    Result<List<SysSimpleDictDTO>> 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<AllDeptDTO> 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<AllDeptDTO> getAllDeptInfoByName(@PathVariable("gridName") String gridName);
 }

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<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listSimple", dictType);
-    }
 
-    @Override
-    public Result<AllDeptDTO> getAllDeptInfoByGridName(String gridName) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAllDeptInfoByGridName", gridName);
-    }
-
-    @Override
-    public Result<AllDeptDTO> getAllDeptInfoByName(String gridName) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAllDeptInfoByName", gridName);
-    }
 }

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<List<SysPopulationSimpleDictDTO>> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO);
+
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     * @param dictType
+     * @return
+     */
+    @GetMapping("/sys/dict/listSimple/{dictType}")
+    Result<List<SysSimpleDictDTO>> 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<AllDeptDTO> 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<AllDeptDTO> getAllDeptInfoByName(@PathVariable("gridName") String gridName);
 }

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<List<SysPopulationSimpleDictDTO>> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO){
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listPopulationSimple", sysPopulationSimpleDictFormDTO);
     }
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listSimple", dictType);
+    }
+
+    @Override
+    public Result<AllDeptDTO> getAllDeptInfoByGridName(String gridName) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAllDeptInfoByGridName", gridName);
+    }
+
+    @Override
+    public Result<AllDeptDTO> getAllDeptInfoByName(String gridName) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAllDeptInfoByName", gridName);
+    }
 }

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/BuildingUnitController.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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.*;
 

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/EpidemicPlotBuildingErrorController.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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.*;
 

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/PlotBuildingController.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/controller/PlotCoordinateController.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicBuildingUnitDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;
 

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotBuildingDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;
 

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotBuildingErrorDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotCoordinateDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;
 

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotCoordinateErrorDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;
 

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicPlotGridDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;
 

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/dao/EpidemicUnitOwnerDao.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;
 

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicBuildingUnitEntity.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotBuildingEntity.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotBuildingErrorEntity.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotCoordinateEntity.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotCoordinateErrorEntity.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicPlotGridEntity.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/entity/EpidemicUnitOwnerEntity.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicBuildingUnitExcel.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingErrorExcel.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingExcel.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotBuildingImportExcel.java → 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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateErrorExcel.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateExcel.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotCoordinateImportExcel.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicPlotGridExcel.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/excel/EpidemicUnitOwnerExcel.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicBuildingUnitRedis.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotBuildingErrorRedis.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotBuildingRedis.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotCoordinateErrorRedis.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotCoordinateRedis.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicPlotGridRedis.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/redis/EpidemicUnitOwnerRedis.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicBuildingUnitService.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;
 
 /**
  * 楼栋，房屋信息

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotBuildingErrorService.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotBuildingService.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotCoordinateErrorService.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotCoordinateService.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicPlotGridService.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/EpidemicUnitOwnerService.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingErrorServiceImpl.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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<EpidemicPlo
     private EpidemicBuildingUnitDao epidemicBuildingUnitDao;
 
     @Autowired
-    private AdminFeignClient adminFeignClient;
+    private VimAdminFeignClient adminFeignClient;
 
     @Autowired
     public EpidemicPlotBuildingErrorDao epidemicPlotBuildingErrorDao;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotCoordinateErrorServiceImpl.java → epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateErrorServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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<EpidemicP
     private EpidemicPlotCoordinateErrorService epidemicPlotCoordinateErrorService;
 
     @Autowired
-    private AdminFeignClient adminFeignClient;
+    private VimAdminFeignClient adminFeignClient;
 
     @Autowired
     private EpidemicPlotCoordinateRedis epidemicPlotCoordinateRedis;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotGridServiceImpl.java → epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotGridServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java → 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 <http://www.gnu.org/licenses/>.
  */
 
-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;

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.modules.personroom.dao.EpidemicBuildingUnitDao">
+<mapper namespace="com.elink.esua.epdc.vaccine.personroom.dao.EpidemicBuildingUnitDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.personroom.entity.EpidemicBuildingUnitEntity" id="epidemicBuildingUnitMap">
+    <resultMap type="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity" id="epidemicBuildingUnitMap">
         <result property="id" column="ID"/>
         <result property="buildingId" column="BUILDING_ID"/>
         <result property="unit" column="UNIT"/>
@@ -90,7 +90,7 @@
         ORDER BY u.CREATED_TIME DESC
     </select>
 
-    <select id="selectByBuildingId" resultType="com.elink.esua.epdc.modules.personroom.entity.EpidemicBuildingUnitEntity">
+    <select id="selectByBuildingId" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity">
         SELECT
             id
         FROM
@@ -113,7 +113,7 @@
             bu.ID = #{id}
     </select>
 
-    <select id="selectOldData" resultType="com.elink.esua.epdc.modules.personroom.entity.EpidemicBuildingUnitEntity">
+    <select id="selectOldData" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity">
         SELECT
             *
         FROM

epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml → epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotBuildingDao">
+<mapper namespace="com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotBuildingDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingEntity" id="epidemicPlotBuildingMap">
+    <resultMap type="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity" id="epidemicPlotBuildingMap">
         <result property="id" column="ID"/>
         <result property="plotId" column="PLOT_ID"/>
         <result property="buildingName" column="BUILDING_NAME"/>
@@ -19,7 +19,7 @@
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
 
-    <select id="selectByPlotId" resultType="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingEntity">
+    <select id="selectByPlotId" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity">
         SELECT
             id
         FROM
@@ -134,7 +134,7 @@
         order by building_code desc
         limit 1
     </select>
-    <select id="selectByGridPlotAndName" resultType="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingEntity">
+    <select id="selectByGridPlotAndName" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity">
         select *
         from epidemic_plot_building
         where del_flag = '0'
@@ -144,19 +144,19 @@
               and GRID_ID=#{gridId}
               and BUILDING_NAME = #{buildingName}
     </select>
-    <select id="selectByBuildingCode" resultType="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingEntity">
+    <select id="selectByBuildingCode" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity">
         select id,BUILDING_NAME
         from epidemic_plot_building
         where del_flag = '0'
               and building_code=#{buildingCode}
     </select>
-    <select id="selectExistUpdate" resultType="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingEntity">
+    <select id="selectExistUpdate" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity">
         select * from epidemic_plot_building
         where del_flag = '0'
               and building_code=#{buildingCode}
               and id!=#{id}
     </select>
-    <select id="selectExistByName" resultType="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingEntity">
+    <select id="selectExistByName" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity">
         select *
         from epidemic_plot_building
         where del_flag = '0'

epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingErrorDao.xml → epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingErrorDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotBuildingErrorDao">
+<mapper namespace="com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotBuildingErrorDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotBuildingErrorEntity" id="epidemicPlotBuildingErrorMap">
+    <resultMap type="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingErrorEntity" id="epidemicPlotBuildingErrorMap">
         <result property="id" column="ID"/>
         <result property="plotId" column="PLOT_ID"/>
         <result property="buildingName" column="BUILDING_NAME"/>

epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml → epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotCoordinateDao">
+<mapper namespace="com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotCoordinateDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateEntity" id="epidemicPlotCoordinateMap">
+    <resultMap type="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateEntity" id="epidemicPlotCoordinateMap">
         <result property="id" column="ID"/>
         <result property="streetName" column="STREET_NAME"/>
         <result property="streetId" column="STREET_ID"/>
@@ -123,7 +123,7 @@
         </where>
     </select>
 
-    <select id="getOldData" resultType="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateEntity">
+    <select id="getOldData" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateEntity">
         SELECT
             *
         FROM
@@ -158,7 +158,7 @@
         </where>
         LIMIT 1
     </select>
-    <select id="getListByGridId" resultType="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateEntity">
+    <select id="getListByGridId" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateEntity">
         select id,
                PLOT_NAME
         from epidemic_plot_coordinate

epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateErrorDao.xml → epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateErrorDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotCoordinateErrorDao">
+<mapper namespace="com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotCoordinateErrorDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotCoordinateErrorEntity" id="epidemicPlotCoordinateErrorMap">
+    <resultMap type="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateErrorEntity" id="epidemicPlotCoordinateErrorMap">
         <result property="id" column="ID"/>
         <result property="streetName" column="STREET_NAME"/>
         <result property="streetId" column="STREET_ID"/>

epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotGridDao.xml → epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotGridDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.modules.personroom.dao.EpidemicPlotGridDao">
+<mapper namespace="com.elink.esua.epdc.vaccine.personroom.dao.EpidemicPlotGridDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.personroom.entity.EpidemicPlotGridEntity" id="epidemicPlotGridMap">
+    <resultMap type="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotGridEntity" id="epidemicPlotGridMap">
         <result property="id" column="ID"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>

epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml → epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.modules.personroom.dao.EpidemicUnitOwnerDao">
+<mapper namespace="com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.personroom.entity.EpidemicUnitOwnerEntity" id="epidemicUnitOwnerMap">
+    <resultMap type="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity" id="epidemicUnitOwnerMap">
         <result property="id" column="ID"/>
         <result property="unitId" column="UNIT_ID"/>
         <result property="ownerName" column="OWNER_NAME"/>