删除一些层级

src/main/java/com/docus/server/backup/controller/Package.java

@@ -1,5 +0,0 @@
-package com.docus.server.backup.controller;
-
-public class Package {
-
-}

src/main/java/com/docus/server/backup/controller/param/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.backup.controller.param;
-
-public class Package {
-}

src/main/java/com/docus/server/backup/controller/vo/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.backup.controller.vo;
-
-public class Package {
-}

src/main/java/com/docus/server/backup/infrastructure/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.backup.infrastructure;
-
-public class Package {
-}

src/main/java/com/docus/server/backup/infrastructure/cache/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.backup.infrastructure.cache;
-
-public class Package {
-}

src/main/java/com/docus/server/backup/infrastructure/client/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.backup.infrastructure.client;
-
-public class Package {
-}

src/main/java/com/docus/server/backup/infrastructure/dao/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.backup.infrastructure.dao;
-
-public class Package {
-}

src/main/java/com/docus/server/backup/service/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.backup.service;
-
-public class Package {
-}

src/main/java/com/docus/server/backup/service/impl/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.backup.service.impl;
-
-public class Package {
-}

src/main/java/com/docus/server/collection/infrastructure/dao/entity/PowerDept.java

@@ -1,4 +1,4 @@
-package com.docus.server.collection.entity;
+package com.docus.server.collection.infrastructure.dao.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/docus/server/collection/infrastructure/dao/entity/PowerUser.java

@@ -1,4 +1,4 @@
-package com.docus.server.collection.entity;
+package com.docus.server.collection.infrastructure.dao.entity;
 
 
 import io.swagger.annotations.ApiModel;

src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasic.java

@@ -1,4 +1,4 @@
-package com.docus.server.collection.entity;
+package com.docus.server.collection.infrastructure.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasicExtend.java

@@ -1,4 +1,4 @@
-package com.docus.server.collection.entity;
+package com.docus.server.collection.infrastructure.dao.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/docus/server/collection/infrastructure/dao/mapper/PowerDeptMapper.java

@@ -1,7 +1,7 @@
-package com.docus.server.collection.mapper;
+package com.docus.server.collection.infrastructure.dao.mapper;
 
 import com.docus.server.collection.dto.DeptModifyParam;
-import com.docus.server.collection.entity.PowerDept;
+import com.docus.server.collection.infrastructure.dao.entity.PowerDept;
 import org.apache.ibatis.annotations.Param;
 
 /**

src/main/java/com/docus/server/collection/infrastructure/dao/mapper/PowerUserMapper.java

@@ -1,7 +1,7 @@
-package com.docus.server.collection.mapper;
+package com.docus.server.collection.infrastructure.dao.mapper;
 
 import com.docus.server.collection.dto.UserModifyParam;
-import com.docus.server.collection.entity.PowerUser;
+import com.docus.server.collection.infrastructure.dao.entity.PowerUser;
 import org.apache.ibatis.annotations.Param;
 
 /**

src/main/java/com/docus/server/collection/infrastructure/dao/mapper/TBasicMapper.java

@@ -1,8 +1,8 @@
-package com.docus.server.collection.mapper;
+package com.docus.server.collection.infrastructure.dao.mapper;
 
 
-import com.docus.server.collection.entity.TBasic;
-import com.docus.server.collection.entity.TBasicExtend;
+import com.docus.server.collection.infrastructure.dao.entity.TBasic;
+import com.docus.server.collection.infrastructure.dao.entity.TBasicExtend;
 import org.apache.ibatis.annotations.Param;
 
 /**

src/main/java/com/docus/server/collection/infrastructure/receiver/MzZyMqReceiver.java

@@ -1,4 +1,4 @@
-package com.docus.server.collection.receiver;
+package com.docus.server.collection.infrastructure.receiver;
 
 import com.docus.server.collection.service.IPowerDeptService;
 import com.docus.server.collection.service.IPowerUserService;

src/main/java/com/docus/server/collection/service/impl/PowerDeptServiceImpl.java

@@ -4,8 +4,8 @@ import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
 import com.docus.server.collection.dto.DeptDto;
 import com.docus.server.collection.dto.DeptModifyParam;
-import com.docus.server.collection.entity.PowerDept;
-import com.docus.server.collection.mapper.PowerDeptMapper;
+import com.docus.server.collection.infrastructure.dao.entity.PowerDept;
+import com.docus.server.collection.infrastructure.dao.mapper.PowerDeptMapper;
 import com.docus.server.collection.service.IPowerDeptService;
 import org.springframework.stereotype.Service;
 

src/main/java/com/docus/server/collection/service/impl/PowerUserServiceImpl.java

@@ -5,8 +5,8 @@ import com.docus.infrastructure.redis.service.IdService;
 import com.docus.server.collection.config.UserSyncConfig;
 import com.docus.server.collection.dto.UserDto;
 import com.docus.server.collection.dto.UserModifyParam;
-import com.docus.server.collection.entity.PowerUser;
-import com.docus.server.collection.mapper.PowerUserMapper;
+import com.docus.server.collection.infrastructure.dao.entity.PowerUser;
+import com.docus.server.collection.infrastructure.dao.mapper.PowerUserMapper;
 import com.docus.server.collection.service.IPowerUserService;
 import org.springframework.stereotype.Service;
 

src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java

@@ -5,9 +5,9 @@ import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
 import com.docus.server.collection.dto.TBasicDto;
-import com.docus.server.collection.entity.TBasic;
-import com.docus.server.collection.entity.TBasicExtend;
-import com.docus.server.collection.mapper.TBasicMapper;
+import com.docus.server.collection.infrastructure.dao.entity.TBasic;
+import com.docus.server.collection.infrastructure.dao.entity.TBasicExtend;
+import com.docus.server.collection.infrastructure.dao.mapper.TBasicMapper;
 import com.docus.server.collection.service.ITBasicService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/docus/server/inspection/controller/TestController.java

@@ -1,27 +0,0 @@
-package com.docus.server.inspection.controller;
-
-import com.docus.infrastructure.util.easyexcel.ExcelUtil;
-import com.docus.infrastructure.web.api.CommonResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-@RestController
-public class TestController {
-
-
-    @RequestMapping("upload")
-    public void upload(MultipartFile multipartFile){
-        List<Object> objects = ExcelUtil.readExcel(multipartFile, null);
-        System.out.println(objects);
-    }
-
-
-    @RequestMapping("test")
-    public CommonResult test(){
-
-        return CommonResult.success("");
-    }
-}

src/main/java/com/docus/server/inspection/infrastructure/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.inspection.infrastructure;
-
-public class Package {
-}

src/main/java/com/docus/server/inspection/service/Package.java

@@ -1,4 +0,0 @@
-package com.docus.server.inspection.service;
-
-public class Package {
-}

src/main/resources/mapper/PowerDeptMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.docus.server.collection.mapper.PowerDeptMapper">
+<mapper namespace="com.docus.server.collection.infrastructure.dao.mapper.PowerDeptMapper">
     <insert id="addDept">
         INSERT INTO `docus_system`.`power_dept`(`dept_id`,
                                                 `dept_code`,
@@ -24,7 +24,7 @@
         delete from `docus_system`.`power_dept` where `dept_code` = #{deptCode}
     </delete>
 
-    <select id="getDeptByDeptCode" resultType="com.docus.server.collection.entity.PowerDept">
+    <select id="getDeptByDeptCode" resultType="com.docus.server.collection.infrastructure.dao.entity.PowerDept">
         SELECT `dept_id`,`dept_code`,`dept_name` FROM `docus_system`.`power_dept`
         WHERE `dept_code` = #{deptCode}   LIMIT 1
     </select>

src/main/resources/mapper/PowerUserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.docus.server.collection.mapper.PowerUserMapper">
+<mapper namespace="com.docus.server.collection.infrastructure.dao.mapper.PowerUserMapper">
     <insert id="addUser">
         INSERT INTO `docus_system`.`power_user`(`user_id`,
                                                 `user_name`,
@@ -31,7 +31,7 @@
         delete from `docus_system`.`power_user` where `user_name` = #{userName}
     </delete>
 
-    <select id="getUserByUserName" resultType="com.docus.server.collection.entity.PowerUser">
+    <select id="getUserByUserName" resultType="com.docus.server.collection.infrastructure.dao.entity.PowerUser">
         SELECT `user_id`,`user_name`,`user_pwd` FROM `docus_system`.`power_user`
         WHERE `user_name` = #{userName}   LIMIT 1
     </select>

src/main/resources/mapper/TBasicMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.docus.server.collection.mapper.TBasicMapper">
+<mapper namespace="com.docus.server.collection.infrastructure.dao.mapper.TBasicMapper">
     <insert id="insert">
         INSERT INTO `docus_medicalrecord`.`t_basic`
         (`admiss_days`,`is_dead`,`sex_name`,`bed_num`,`age`,`sex`,`id_card`,`dis_dept`,`patient_id`, `admiss_times`, `inpatient_no`,`name`,  `admiss_date`,  `admiss_dept_name`, `dis_date`, `dis_dept_name`,`attending_name`,`jzh`)