From 8b433a0c86f6c98e14839b76b0f00da15cbd2b50 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Fri, 10 Mar 2023 17:19:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=80=E4=BA=9B=E5=B1=82?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/backup/controller/Package.java | 5 ---- .../backup/controller/param/Package.java | 4 --- .../server/backup/controller/vo/Package.java | 4 --- .../server/backup/infrastructure/Package.java | 4 --- .../backup/infrastructure/cache/Package.java | 4 --- .../backup/infrastructure/client/Package.java | 4 --- .../backup/infrastructure/dao/Package.java | 4 --- .../docus/server/backup/service/Package.java | 4 --- .../server/backup/service/impl/Package.java | 4 --- .../dao}/entity/PowerDept.java | 2 +- .../dao}/entity/PowerUser.java | 2 +- .../dao}/entity/TBasic.java | 2 +- .../dao}/entity/TBasicExtend.java | 2 +- .../dao}/mapper/PowerDeptMapper.java | 4 +-- .../dao}/mapper/PowerUserMapper.java | 4 +-- .../dao}/mapper/TBasicMapper.java | 6 ++--- .../receiver/MzZyMqReceiver.java | 2 +- .../service/impl/PowerDeptServiceImpl.java | 4 +-- .../service/impl/PowerUserServiceImpl.java | 4 +-- .../service/impl/TBasicServiceImpl.java | 6 ++--- .../inspection/controller/TestController.java | 27 ------------------- .../inspection/infrastructure/Package.java | 4 --- .../server/inspection/service/Package.java | 4 --- src/main/resources/mapper/PowerDeptMapper.xml | 4 +-- src/main/resources/mapper/PowerUserMapper.xml | 4 +-- src/main/resources/mapper/TBasicMapper.xml | 2 +- 26 files changed, 24 insertions(+), 96 deletions(-) delete mode 100644 src/main/java/com/docus/server/backup/controller/Package.java delete mode 100644 src/main/java/com/docus/server/backup/controller/param/Package.java delete mode 100644 src/main/java/com/docus/server/backup/controller/vo/Package.java delete mode 100644 src/main/java/com/docus/server/backup/infrastructure/Package.java delete mode 100644 src/main/java/com/docus/server/backup/infrastructure/cache/Package.java delete mode 100644 src/main/java/com/docus/server/backup/infrastructure/client/Package.java delete mode 100644 src/main/java/com/docus/server/backup/infrastructure/dao/Package.java delete mode 100644 src/main/java/com/docus/server/backup/service/Package.java delete mode 100644 src/main/java/com/docus/server/backup/service/impl/Package.java rename src/main/java/com/docus/server/collection/{ => infrastructure/dao}/entity/PowerDept.java (95%) rename src/main/java/com/docus/server/collection/{ => infrastructure/dao}/entity/PowerUser.java (97%) rename src/main/java/com/docus/server/collection/{ => infrastructure/dao}/entity/TBasic.java (98%) rename src/main/java/com/docus/server/collection/{ => infrastructure/dao}/entity/TBasicExtend.java (92%) rename src/main/java/com/docus/server/collection/{ => infrastructure/dao}/mapper/PowerDeptMapper.java (88%) rename src/main/java/com/docus/server/collection/{ => infrastructure/dao}/mapper/PowerUserMapper.java (88%) rename src/main/java/com/docus/server/collection/{ => infrastructure/dao}/mapper/TBasicMapper.java (63%) rename src/main/java/com/docus/server/collection/{ => infrastructure}/receiver/MzZyMqReceiver.java (96%) delete mode 100644 src/main/java/com/docus/server/inspection/controller/TestController.java delete mode 100644 src/main/java/com/docus/server/inspection/infrastructure/Package.java delete mode 100644 src/main/java/com/docus/server/inspection/service/Package.java diff --git a/src/main/java/com/docus/server/backup/controller/Package.java b/src/main/java/com/docus/server/backup/controller/Package.java deleted file mode 100644 index 8ed63a0..0000000 --- a/src/main/java/com/docus/server/backup/controller/Package.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.backup.controller; - -public class Package { - -} diff --git a/src/main/java/com/docus/server/backup/controller/param/Package.java b/src/main/java/com/docus/server/backup/controller/param/Package.java deleted file mode 100644 index d0de137..0000000 --- a/src/main/java/com/docus/server/backup/controller/param/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.backup.controller.param; - -public class Package { -} diff --git a/src/main/java/com/docus/server/backup/controller/vo/Package.java b/src/main/java/com/docus/server/backup/controller/vo/Package.java deleted file mode 100644 index b2addde..0000000 --- a/src/main/java/com/docus/server/backup/controller/vo/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.backup.controller.vo; - -public class Package { -} diff --git a/src/main/java/com/docus/server/backup/infrastructure/Package.java b/src/main/java/com/docus/server/backup/infrastructure/Package.java deleted file mode 100644 index 50853a3..0000000 --- a/src/main/java/com/docus/server/backup/infrastructure/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.backup.infrastructure; - -public class Package { -} diff --git a/src/main/java/com/docus/server/backup/infrastructure/cache/Package.java b/src/main/java/com/docus/server/backup/infrastructure/cache/Package.java deleted file mode 100644 index 61baaaf..0000000 --- a/src/main/java/com/docus/server/backup/infrastructure/cache/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.backup.infrastructure.cache; - -public class Package { -} diff --git a/src/main/java/com/docus/server/backup/infrastructure/client/Package.java b/src/main/java/com/docus/server/backup/infrastructure/client/Package.java deleted file mode 100644 index 8add156..0000000 --- a/src/main/java/com/docus/server/backup/infrastructure/client/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.backup.infrastructure.client; - -public class Package { -} diff --git a/src/main/java/com/docus/server/backup/infrastructure/dao/Package.java b/src/main/java/com/docus/server/backup/infrastructure/dao/Package.java deleted file mode 100644 index a9898d4..0000000 --- a/src/main/java/com/docus/server/backup/infrastructure/dao/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.backup.infrastructure.dao; - -public class Package { -} diff --git a/src/main/java/com/docus/server/backup/service/Package.java b/src/main/java/com/docus/server/backup/service/Package.java deleted file mode 100644 index 67866be..0000000 --- a/src/main/java/com/docus/server/backup/service/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.backup.service; - -public class Package { -} diff --git a/src/main/java/com/docus/server/backup/service/impl/Package.java b/src/main/java/com/docus/server/backup/service/impl/Package.java deleted file mode 100644 index f618c4c..0000000 --- a/src/main/java/com/docus/server/backup/service/impl/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.backup.service.impl; - -public class Package { -} diff --git a/src/main/java/com/docus/server/collection/entity/PowerDept.java b/src/main/java/com/docus/server/collection/infrastructure/dao/entity/PowerDept.java similarity index 95% rename from src/main/java/com/docus/server/collection/entity/PowerDept.java rename to src/main/java/com/docus/server/collection/infrastructure/dao/entity/PowerDept.java index 3a06f87..0e8cb34 100644 --- a/src/main/java/com/docus/server/collection/entity/PowerDept.java +++ b/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; diff --git a/src/main/java/com/docus/server/collection/entity/PowerUser.java b/src/main/java/com/docus/server/collection/infrastructure/dao/entity/PowerUser.java similarity index 97% rename from src/main/java/com/docus/server/collection/entity/PowerUser.java rename to src/main/java/com/docus/server/collection/infrastructure/dao/entity/PowerUser.java index 12b6647..5823f2c 100644 --- a/src/main/java/com/docus/server/collection/entity/PowerUser.java +++ b/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; diff --git a/src/main/java/com/docus/server/collection/entity/TBasic.java b/src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasic.java similarity index 98% rename from src/main/java/com/docus/server/collection/entity/TBasic.java rename to src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasic.java index 3654b9e..738d453 100644 --- a/src/main/java/com/docus/server/collection/entity/TBasic.java +++ b/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; diff --git a/src/main/java/com/docus/server/collection/entity/TBasicExtend.java b/src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasicExtend.java similarity index 92% rename from src/main/java/com/docus/server/collection/entity/TBasicExtend.java rename to src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasicExtend.java index a3096ee..e584346 100644 --- a/src/main/java/com/docus/server/collection/entity/TBasicExtend.java +++ b/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; diff --git a/src/main/java/com/docus/server/collection/mapper/PowerDeptMapper.java b/src/main/java/com/docus/server/collection/infrastructure/dao/mapper/PowerDeptMapper.java similarity index 88% rename from src/main/java/com/docus/server/collection/mapper/PowerDeptMapper.java rename to src/main/java/com/docus/server/collection/infrastructure/dao/mapper/PowerDeptMapper.java index e689d75..5a2ba4d 100644 --- a/src/main/java/com/docus/server/collection/mapper/PowerDeptMapper.java +++ b/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; /** diff --git a/src/main/java/com/docus/server/collection/mapper/PowerUserMapper.java b/src/main/java/com/docus/server/collection/infrastructure/dao/mapper/PowerUserMapper.java similarity index 88% rename from src/main/java/com/docus/server/collection/mapper/PowerUserMapper.java rename to src/main/java/com/docus/server/collection/infrastructure/dao/mapper/PowerUserMapper.java index d716658..66ecfde 100644 --- a/src/main/java/com/docus/server/collection/mapper/PowerUserMapper.java +++ b/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; /** diff --git a/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java b/src/main/java/com/docus/server/collection/infrastructure/dao/mapper/TBasicMapper.java similarity index 63% rename from src/main/java/com/docus/server/collection/mapper/TBasicMapper.java rename to src/main/java/com/docus/server/collection/infrastructure/dao/mapper/TBasicMapper.java index 9b2dcec..ab756db 100644 --- a/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java +++ b/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; /** diff --git a/src/main/java/com/docus/server/collection/receiver/MzZyMqReceiver.java b/src/main/java/com/docus/server/collection/infrastructure/receiver/MzZyMqReceiver.java similarity index 96% rename from src/main/java/com/docus/server/collection/receiver/MzZyMqReceiver.java rename to src/main/java/com/docus/server/collection/infrastructure/receiver/MzZyMqReceiver.java index f85d34f..8669e8c 100644 --- a/src/main/java/com/docus/server/collection/receiver/MzZyMqReceiver.java +++ b/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; diff --git a/src/main/java/com/docus/server/collection/service/impl/PowerDeptServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/PowerDeptServiceImpl.java index f9ab6d1..fcd5627 100644 --- a/src/main/java/com/docus/server/collection/service/impl/PowerDeptServiceImpl.java +++ b/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; diff --git a/src/main/java/com/docus/server/collection/service/impl/PowerUserServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/PowerUserServiceImpl.java index 55a3076..933ed4f 100644 --- a/src/main/java/com/docus/server/collection/service/impl/PowerUserServiceImpl.java +++ b/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; diff --git a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java index f9cca9d..693cb8d 100644 --- a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java +++ b/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; diff --git a/src/main/java/com/docus/server/inspection/controller/TestController.java b/src/main/java/com/docus/server/inspection/controller/TestController.java deleted file mode 100644 index 493479c..0000000 --- a/src/main/java/com/docus/server/inspection/controller/TestController.java +++ /dev/null @@ -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 objects = ExcelUtil.readExcel(multipartFile, null); - System.out.println(objects); - } - - - @RequestMapping("test") - public CommonResult test(){ - - return CommonResult.success(""); - } -} diff --git a/src/main/java/com/docus/server/inspection/infrastructure/Package.java b/src/main/java/com/docus/server/inspection/infrastructure/Package.java deleted file mode 100644 index c73e90e..0000000 --- a/src/main/java/com/docus/server/inspection/infrastructure/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.inspection.infrastructure; - -public class Package { -} diff --git a/src/main/java/com/docus/server/inspection/service/Package.java b/src/main/java/com/docus/server/inspection/service/Package.java deleted file mode 100644 index 185553d..0000000 --- a/src/main/java/com/docus/server/inspection/service/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.inspection.service; - -public class Package { -} diff --git a/src/main/resources/mapper/PowerDeptMapper.xml b/src/main/resources/mapper/PowerDeptMapper.xml index 32680ae..52af0fe 100644 --- a/src/main/resources/mapper/PowerDeptMapper.xml +++ b/src/main/resources/mapper/PowerDeptMapper.xml @@ -2,7 +2,7 @@ - + INSERT INTO `docus_system`.`power_dept`(`dept_id`, `dept_code`, @@ -24,7 +24,7 @@ delete from `docus_system`.`power_dept` where `dept_code` = #{deptCode} - SELECT `dept_id`,`dept_code`,`dept_name` FROM `docus_system`.`power_dept` WHERE `dept_code` = #{deptCode} LIMIT 1 diff --git a/src/main/resources/mapper/PowerUserMapper.xml b/src/main/resources/mapper/PowerUserMapper.xml index d63a165..bcc846c 100644 --- a/src/main/resources/mapper/PowerUserMapper.xml +++ b/src/main/resources/mapper/PowerUserMapper.xml @@ -2,7 +2,7 @@ - + INSERT INTO `docus_system`.`power_user`(`user_id`, `user_name`, @@ -31,7 +31,7 @@ delete from `docus_system`.`power_user` where `user_name` = #{userName} - SELECT `user_id`,`user_name`,`user_pwd` FROM `docus_system`.`power_user` WHERE `user_name` = #{userName} LIMIT 1 diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index 08b34c6..fd0620e 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -2,7 +2,7 @@ - + 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`)