From 587649d30ce11394f937247cabb5be07d52b31a2 Mon Sep 17 00:00:00 2001 From: beeajax <1105173470@qq.com> Date: Mon, 12 Jun 2023 22:41:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95userviewjob=EF=BC=8C=E7=BC=96?= =?UTF-8?q?=E5=86=99user=20view=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infrastructure/mapper/BlTBasicMapper.java | 2 +- .../docus/server/bl/service/IBlService.java | 2 +- .../server/bl/service/impl/BlServiceImpl.java | 2 +- .../main/resources/mapper/BlTBasicMapper.xml | 2 +- .../basic/http/HttpTBasicCollectorImpl.java | 2 +- .../basic/http/HttpTBasicConverter.java | 2 +- .../basic/ws/WsBasicCollectorImpl.java | 2 +- .../collect/basic/ws/WsTBasicConverter.java | 2 +- collect-sdry/src/main/resources/bootstrap.yml | 37 +++++++----- .../basic/http/BasicRestController.java | 2 +- .../basic/http/TBasicHttpCollectJob.java | 2 +- .../mq/impl/BasicJmsMqCollectServiceImpl.java | 2 +- .../impl/BasicRabbitMqCollectServiceImpl.java | 2 +- .../impl/BasicRocketMqCollectServiceImpl.java | 2 +- .../basic/view/TBasicViewCollectJob.java | 2 +- .../basic/ws/impl/BasicServerImpl.java | 2 +- .../collect/dept/view/DeptViewCollectJob.java | 1 + .../collect/user/view/UserViewCollectJob.java | 60 +++++++++++++------ .../collect/web/job/AbstractCollectJob.java | 1 - .../collect/web/service/CollectService.java | 2 +- .../server/archivefile/pojo/dto/IdType.java | 2 +- .../archivefile/pojo/dto/InpatientNo.java | 2 +- docus-common/pom.xml | 26 ++++++++ .../java/com/docus/server}/common/Sort.java | 2 +- .../docus/server}/common/UserProperties.java | 2 +- .../server/common/service}/IBaseService.java | 7 ++- .../common/service/impl}/BaseServiceImpl.java | 18 ++---- docus-medical-record/pom.xml | 11 ++++ .../server/record/common/DSKeyConstants.java | 11 ++++ .../record/{ => common}/pojo/dto/IdType.java | 2 +- .../{ => common}/pojo/dto/InpatientNo.java | 2 +- .../{ => common}/pojo/dto/TBasicDTO.java | 2 +- .../pojo/entity/MedicalRecord.java | 6 +- .../pojo/entity/MedicalRecordEntity.java | 2 +- .../{ => common}/pojo/entity/TBasic.java | 2 +- .../pojo/entity/TBasicExtend.java | 2 +- .../server/record/mapper/TBasicMapper.java | 7 ++- .../record/service/IMedicalRecordService.java | 2 +- .../server/record/service/ITBasicService.java | 8 +-- .../impl/MedicalRecordServiceImpl.java | 4 +- .../service/impl/TBasicServiceImpl.java | 10 ++-- .../main/resources/mapper/TBasicMapper.xml | 6 +- docus-sys/pom.xml | 8 +++ .../docus/server/sys/common/OperatorType.java | 9 --- .../server/sys/service/IPowerDeptService.java | 2 +- .../sys/service/IPowerThirdLoginService.java | 2 +- .../server/sys/service/IPowerUserService.java | 2 +- .../service/impl/PowerDeptServiceImpl.java | 2 +- .../impl/PowerThirdLoginServiceImpl.java | 2 +- .../service/impl/PowerUserServiceImpl.java | 4 +- .../mapper/EcgTBasicMapper.java | 2 +- .../docus/server/ecg/service/IEcgService.java | 2 +- .../ecg/service/impl/EcgServiceImpl.java | 2 +- .../main/resources/mapper/EcgTBasicMapper.xml | 2 +- .../mapper/EmrTBasicMapper.java | 2 +- .../docus/server/emr/service/IEmrService.java | 2 +- .../emr/service/impl/EmrServiceImpl.java | 2 +- .../main/resources/mapper/EmrTBasicMapper.xml | 2 +- .../mapper/HisTBasicMapper.java | 2 +- .../docus/server/his/service/IHisService.java | 2 +- .../his/service/impl/HisServiceImpl.java | 2 +- .../main/resources/mapper/HisTBasicMapper.xml | 2 +- .../infrastructure/mapper/HlTBasicMapper.java | 2 +- .../docus/server/hl/service/IHlService.java | 2 +- .../server/hl/service/impl/HlServiceImpl.java | 2 +- .../main/resources/mapper/HlTBasicMapper.xml | 2 +- .../mapper/IssubmitTBasicMapper.java | 2 +- .../issubmit/service/IIssubmitService.java | 2 +- .../service/impl/IssubmitServiceImpl.java | 2 +- .../resources/mapper/IssubmitTBasicMapper.xml | 2 +- .../mapper/LisTBasicMapper.java | 2 +- .../docus/server/lis/service/ILisService.java | 2 +- .../lis/service/impl/LisServiceImpl.java | 2 +- .../main/resources/mapper/LisTBasicMapper.xml | 2 +- .../mapper/PacsTBasicMapper.java | 2 +- .../server/pacs/service/IPacsService.java | 2 +- .../pacs/service/impl/PacsServiceImpl.java | 2 +- .../resources/mapper/PacsTBasicMapper.xml | 2 +- pom.xml | 1 + .../mapper/VteTBasicMapper.java | 2 +- .../docus/server/vte/service/IVteService.java | 2 +- .../vte/service/impl/VteServiceImpl.java | 2 +- .../main/resources/mapper/VteTBasicMapper.xml | 2 +- .../infrastructure/mapper/ZzTBasicMapper.java | 2 +- .../docus/server/zz/service/IZzService.java | 2 +- .../server/zz/service/impl/ZzServiceImpl.java | 2 +- .../main/resources/mapper/ZzTBasicMapper.xml | 2 +- 87 files changed, 223 insertions(+), 148 deletions(-) create mode 100644 docus-common/pom.xml rename {docus-sys/src/main/java/com/docus/server/sys => docus-common/src/main/java/com/docus/server}/common/Sort.java (97%) rename {docus-sys/src/main/java/com/docus/server/sys => docus-common/src/main/java/com/docus/server}/common/UserProperties.java (88%) rename {docus-sys/src/main/java/com/docus/server/sys/common => docus-common/src/main/java/com/docus/server/common/service}/IBaseService.java (82%) rename {docus-sys/src/main/java/com/docus/server/sys/common => docus-common/src/main/java/com/docus/server/common/service/impl}/BaseServiceImpl.java (93%) create mode 100644 docus-medical-record/src/main/java/com/docus/server/record/common/DSKeyConstants.java rename docus-medical-record/src/main/java/com/docus/server/record/{ => common}/pojo/dto/IdType.java (70%) rename docus-medical-record/src/main/java/com/docus/server/record/{ => common}/pojo/dto/InpatientNo.java (92%) rename docus-medical-record/src/main/java/com/docus/server/record/{ => common}/pojo/dto/TBasicDTO.java (97%) rename docus-medical-record/src/main/java/com/docus/server/record/{ => common}/pojo/entity/MedicalRecord.java (94%) rename docus-medical-record/src/main/java/com/docus/server/record/{ => common}/pojo/entity/MedicalRecordEntity.java (94%) rename docus-medical-record/src/main/java/com/docus/server/record/{ => common}/pojo/entity/TBasic.java (98%) rename docus-medical-record/src/main/java/com/docus/server/record/{ => common}/pojo/entity/TBasicExtend.java (94%) delete mode 100644 docus-sys/src/main/java/com/docus/server/sys/common/OperatorType.java diff --git a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlTBasicMapper.java b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlTBasicMapper.java index 6a7ed88..38fdcda 100644 --- a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlTBasicMapper.java +++ b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlTBasicMapper.java @@ -2,7 +2,7 @@ package com.docus.server.bl.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.docus.server.bl.common.DSKeyConstants; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java b/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java index 32aecf6..411f5c5 100644 --- a/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java +++ b/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java @@ -1,6 +1,6 @@ package com.docus.server.bl.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java b/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java index b12c9a6..b68252e 100644 --- a/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java +++ b/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.server.bl.infrastructure.mapper.BlDeptMapper; import com.docus.server.bl.infrastructure.mapper.BlTBasicMapper; import com.docus.server.bl.infrastructure.mapper.BlUserMapper; import com.docus.server.bl.service.IBlService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; diff --git a/bl-sysem/src/main/resources/mapper/BlTBasicMapper.xml b/bl-sysem/src/main/resources/mapper/BlTBasicMapper.xml index be14d98..6e6aa66 100644 --- a/bl-sysem/src/main/resources/mapper/BlTBasicMapper.xml +++ b/bl-sysem/src/main/resources/mapper/BlTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java index 9fa42be..e4ca7f7 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java @@ -1,7 +1,7 @@ package com.docus.server.collect.basic.http; import com.docus.server.collect.IHttpCollector; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java index 2e805e8..a453a56 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java @@ -4,7 +4,7 @@ import com.docus.core.util.DateUtil; import com.docus.log.context.TrackContext; import com.docus.server.collect.basic.ws.impl.BasicServerImpl; import com.docus.server.collect.web.process.VisitorProcessor; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java index 75234e8..8690fa0 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java @@ -1,7 +1,7 @@ package com.docus.server.collect.basic.ws; import com.docus.server.collect.IWsCollector; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java index 99feafa..4ad6d61 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java @@ -4,7 +4,7 @@ import com.docus.core.util.DateUtil; import com.docus.log.context.TrackContext; import com.docus.server.collect.basic.ws.impl.BasicServerImpl; import com.docus.server.collect.web.process.VisitorProcessor; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index 97e6138..b818dff 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/collect-sdry/src/main/resources/bootstrap.yml @@ -13,85 +13,92 @@ spring: #公司病案的文件服务数据库 master: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + username: root + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #公司病案的系统服务数据库 system: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_system?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + username: root + password: root + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + type: com.alibaba.druid.pool.DruidDataSource + #公司病案的基础服务数据库 + record: + url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_medicalrecord?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai + username: root + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #医院的用户/科室/基础数据的数据库 his: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #病理数据 bl: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #电生理系统数据 ecg: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #电子病历系统数据 emr: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #护理文书系统数据 hl: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #手麻系统数据 issubmit: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #lis系统数据 lis: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #Pacs系统数据视图 pacs: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #vte静脉血栓栓塞症 vte: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #重症系统数据 zz: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource # rabbitmq: @@ -101,7 +108,7 @@ spring: # password: guest redis: host: redis.docus.cn - password: JSdocus@702 + # password: JSdocus@702 cloud: nacos: discovery: diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java index 6613795..7185209 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java @@ -9,7 +9,7 @@ import com.docus.server.collect.IHttpResult; import com.docus.server.collect.web.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java index 90969e4..c060409 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java @@ -3,7 +3,7 @@ package com.docus.server.collect.basic.http; import com.docus.server.collect.ICollector; import com.docus.server.collect.IHttpCollector; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java index 3b6cb21..1f91b5f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java @@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper; import com.docus.server.collect.basic.mq.IBasicMqCollectService; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java index 9d18150..034fdf5 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java @@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper; import com.docus.server.collect.basic.mq.IBasicMqCollectService; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java index a8713da..9ec1bcb 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java @@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper; import com.docus.server.collect.basic.mq.IBasicMqCollectService; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java index 85e723f..0358b29 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java @@ -3,7 +3,7 @@ package com.docus.server.collect.basic.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.his.service.IHisService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java index 8ca5be0..c44f5a6 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java @@ -9,7 +9,7 @@ import com.docus.server.collect.basic.ws.IBasicServer; import com.docus.server.collect.web.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java index f1ab375..b1368e1 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java @@ -14,6 +14,7 @@ import java.util.List; /** * 主动view请求科室数据job * + * @author linruifeng * @see AbstractCollectJob * @see com.docus.server.collect.IJob * @see ICollector diff --git a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java index 3eb1812..5e552cc 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java @@ -17,6 +17,7 @@ import javax.annotation.Resource; import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Objects; /** * 主动view请求用户数据job @@ -48,33 +49,18 @@ public class UserViewCollectJob extends AbstractCollectJob { @Override public void batchInsertOrUpdate(List t) { + //docus-BasicDataReceive同步user逻辑 Collection userNames = ListUtils.distinctSelect(t, UserDTO::getUserName); List powerUsers = userService.findByList("userName", userNames); List existUserNames = ListUtils.distinctSelect(powerUsers, PowerUser::getUserName); t.forEach(p -> { String userName = p.getUserName(); + String pwd = p.getPwd(); if (existUserNames.contains(userName)) { - PowerThirdLogin user = thirdLoginService.findOneBy("user", userName); - user.setPwd(p.getPwd()); - thirdLoginService.updateById(user); + updateThirdLogin(pwd, userName); } else { - p.setPwd(userProperties.getPassword()); - if (Func.isNotBlank(p.getDeptId())) { - PowerDept powerDept = deptService.findOneBy("deptCode", p.getDeptId()); - p.setDeptId(powerDept.getDeptId().toString()); - } - userService.insertOrUpdatePowerUser(p); - PowerUser powerUser = userService.findOneBy("userName", userName); - - PowerThirdLogin powerThirdLogin = new PowerThirdLogin(); - powerThirdLogin.setId(idService.getDateSeq()); - powerThirdLogin.setPowerUserId(powerUser.getUserId().toString()); - powerThirdLogin.setUser(userName); - powerThirdLogin.setPwd(p.getPwd()); - powerThirdLogin.setSource(0); - powerThirdLogin.setCreateTime(DateUtil.now()); - thirdLoginService.save(powerThirdLogin); + insertUserAndThirdLogin(p, userName); } }); } @@ -84,4 +70,40 @@ public class UserViewCollectJob extends AbstractCollectJob { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 return hisService.getUserListView(startDate, endDate, pageNum, pageSize); } + + private void insertUserAndThirdLogin(UserDTO p, String userName) { + p.setPwd(userProperties.getPassword()); + + if (Func.isEmpty(p.getAuthorId())) { + p.setAuthorId("admin"); + } + if (Func.isEmpty(p.getAuthorName())) { + p.setAuthorName("admin"); + } + + if (Func.isNotBlank(p.getDeptId())) { + PowerDept powerDept = deptService.findOneBy("deptCode", p.getDeptId()); + if (!Objects.isNull(powerDept)) { + p.setDeptId(String.valueOf(powerDept.getDeptId())); + } + } + userService.insertOrUpdatePowerUser(p); + PowerUser powerUser = userService.findOneBy("userName", userName); + + PowerThirdLogin powerThirdLogin = new PowerThirdLogin(); + powerThirdLogin.setId(idService.getDateSeq()); + powerThirdLogin.setPowerUserId(String.valueOf(powerUser.getUserId())); + powerThirdLogin.setUser(userName); + powerThirdLogin.setPwd(p.getPwd()); + powerThirdLogin.setSource(0); + powerThirdLogin.setCreateTime(DateUtil.now()); + thirdLoginService.save(powerThirdLogin); + } + + private void updateThirdLogin(String pwd, String userName) { + PowerThirdLogin user = thirdLoginService.findOneBy("user", userName); + user.setPwd(pwd); + thirdLoginService.updateById(user); + } + } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java index 4e8abcd..948173d 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java @@ -8,7 +8,6 @@ import com.docus.server.collect.web.enums.StateEnum; import com.docus.server.collect.web.service.ITaskConfigService; import com.docus.server.collect.web.utils.PeriodTime; import com.docus.server.record.service.ITBasicService; -import com.docus.server.sys.common.UserProperties; import com.docus.server.sys.service.IPowerDeptService; import com.docus.server.sys.service.IPowerThirdLoginService; import com.docus.server.sys.service.IPowerUserService; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java index d07f0cd..b57f5b7 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java @@ -1,7 +1,7 @@ package com.docus.server.collect.web.service; import com.docus.core.util.Func; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.record.service.ITBasicService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/IdType.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/IdType.java index 50e424c..df082a0 100644 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/IdType.java +++ b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/IdType.java @@ -1,4 +1,4 @@ -package com.docus.server.record.pojo.dto; +package com.docus.server.record.common.pojo.dto; public enum IdType { /** diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/InpatientNo.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/InpatientNo.java index e702407..448258b 100644 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/InpatientNo.java +++ b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/InpatientNo.java @@ -1,4 +1,4 @@ -package com.docus.server.record.pojo.dto; +package com.docus.server.record.common.pojo.dto; import com.docus.infrastructure.core.exception.BaseException; import com.docus.server.record.RecordExceptionEnum; diff --git a/docus-common/pom.xml b/docus-common/pom.xml new file mode 100644 index 0000000..da6ac15 --- /dev/null +++ b/docus-common/pom.xml @@ -0,0 +1,26 @@ + + + docus-collector-server + com.docus + 1.0-SNAPSHOT + + 4.0.0 + docus-common + Archetype - docus-common + http://maven.apache.org + + + + + src/main/java + + **/*.xml + + + + src/main/resources + + + + diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/Sort.java b/docus-common/src/main/java/com/docus/server/common/Sort.java similarity index 97% rename from docus-sys/src/main/java/com/docus/server/sys/common/Sort.java rename to docus-common/src/main/java/com/docus/server/common/Sort.java index 5e2a6fd..85f242e 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/common/Sort.java +++ b/docus-common/src/main/java/com/docus/server/common/Sort.java @@ -1,4 +1,4 @@ -package com.docus.server.sys.common; +package com.docus.server.common; import java.util.ArrayList; import java.util.Collections; diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/UserProperties.java b/docus-common/src/main/java/com/docus/server/common/UserProperties.java similarity index 88% rename from docus-sys/src/main/java/com/docus/server/sys/common/UserProperties.java rename to docus-common/src/main/java/com/docus/server/common/UserProperties.java index b103f17..2498a8e 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/common/UserProperties.java +++ b/docus-common/src/main/java/com/docus/server/common/UserProperties.java @@ -1,4 +1,4 @@ -package com.docus.server.sys.common; +package com.docus.server.common; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/IBaseService.java b/docus-common/src/main/java/com/docus/server/common/service/IBaseService.java similarity index 82% rename from docus-sys/src/main/java/com/docus/server/sys/common/IBaseService.java rename to docus-common/src/main/java/com/docus/server/common/service/IBaseService.java index cd18266..136d81b 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/common/IBaseService.java +++ b/docus-common/src/main/java/com/docus/server/common/service/IBaseService.java @@ -1,7 +1,8 @@ -package com.docus.server.sys.common; +package com.docus.server.common.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; +import com.docus.server.common.Sort; import java.util.Collection; import java.util.List; @@ -12,9 +13,9 @@ public interface IBaseService extends IService { List findByIds(Collection ids); - public List findBy(String propertyName, Object propertyValue); + List findBy(String propertyName, Object propertyValue); - public List findByList(String propertyName, Collection propertyValue); + List findByList(String propertyName, Collection propertyValue); List findActiveBy(String propertyName, Object propertyValue); diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/BaseServiceImpl.java b/docus-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java similarity index 93% rename from docus-sys/src/main/java/com/docus/server/sys/common/BaseServiceImpl.java rename to docus-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java index 3b770b6..2ab2802 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/common/BaseServiceImpl.java +++ b/docus-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java @@ -1,4 +1,4 @@ -package com.docus.server.sys.common; +package com.docus.server.common.service.impl; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -8,20 +8,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.docus.server.common.Sort; +import com.docus.server.common.service.IBaseService; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; public abstract class BaseServiceImpl, T> extends ServiceImpl implements IBaseService { - private static final Logger logger = LoggerFactory.getLogger(BaseServiceImpl.class); - @Override public T findById(String id) { if (id == null) { @@ -53,7 +47,7 @@ public abstract class BaseServiceImpl, T> extends Servic @Override public List findByList(String propertyName, Collection propertyValue) { String columnName = getColumnName(propertyName); - return baseMapper.selectList(new QueryWrapper().in(!Objects.isNull(propertyName), columnName, propertyValue)); + return baseMapper.selectList(new QueryWrapper().in(!Objects.isNull(propertyValue), columnName, propertyValue)); } @Override @@ -95,7 +89,7 @@ public abstract class BaseServiceImpl, T> extends Servic @Override public T findOneByList(String propertyName, Collection propertyValue) { String columnName = getColumnName(propertyName); - List list = baseMapper.selectList(new QueryWrapper().eq(!Objects.isNull(propertyName), columnName, propertyValue)); + List list = baseMapper.selectList(new QueryWrapper().eq(!Objects.isNull(propertyValue), columnName, propertyValue)); return (list == null || list.size() == 0) ? null : list.get(0); } diff --git a/docus-medical-record/pom.xml b/docus-medical-record/pom.xml index 4963e19..fad41fe 100644 --- a/docus-medical-record/pom.xml +++ b/docus-medical-record/pom.xml @@ -10,6 +10,15 @@ Archetype - docus-medical-record http://maven.apache.org + + + com.docus + docus-common + 1.0-SNAPSHOT + compile + + + @@ -23,4 +32,6 @@ + + diff --git a/docus-medical-record/src/main/java/com/docus/server/record/common/DSKeyConstants.java b/docus-medical-record/src/main/java/com/docus/server/record/common/DSKeyConstants.java new file mode 100644 index 0000000..7f7241a --- /dev/null +++ b/docus-medical-record/src/main/java/com/docus/server/record/common/DSKeyConstants.java @@ -0,0 +1,11 @@ +package com.docus.server.record.common; + +/** + * @author linrf + * @date 2023/6/9 11:19 + */ +public class DSKeyConstants { + + public static final String DS_KEY = "record"; + +} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/IdType.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/IdType.java similarity index 70% rename from docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/IdType.java rename to docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/IdType.java index 50e424c..df082a0 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/IdType.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/IdType.java @@ -1,4 +1,4 @@ -package com.docus.server.record.pojo.dto; +package com.docus.server.record.common.pojo.dto; public enum IdType { /** diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/InpatientNo.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/InpatientNo.java similarity index 92% rename from docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/InpatientNo.java rename to docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/InpatientNo.java index e702407..448258b 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/InpatientNo.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/InpatientNo.java @@ -1,4 +1,4 @@ -package com.docus.server.record.pojo.dto; +package com.docus.server.record.common.pojo.dto; import com.docus.infrastructure.core.exception.BaseException; import com.docus.server.record.RecordExceptionEnum; diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/TBasicDTO.java similarity index 97% rename from docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java rename to docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/TBasicDTO.java index c931285..80103a0 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/TBasicDTO.java @@ -1,4 +1,4 @@ -package com.docus.server.record.pojo.dto; +package com.docus.server.record.common.pojo.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecord.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecord.java similarity index 94% rename from docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecord.java rename to docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecord.java index 993cefe..5f0a98f 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecord.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecord.java @@ -1,10 +1,10 @@ -package com.docus.server.record.pojo.entity; +package com.docus.server.record.common.pojo.entity; import com.docus.core.util.Func; import com.docus.infrastructure.core.exception.BaseException; import com.docus.server.record.RecordExceptionEnum; -import com.docus.server.record.pojo.dto.IdType; -import com.docus.server.record.pojo.dto.InpatientNo; +import com.docus.server.record.common.pojo.dto.IdType; +import com.docus.server.record.common.pojo.dto.InpatientNo; import lombok.Getter; import java.util.Map; diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecordEntity.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecordEntity.java similarity index 94% rename from docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecordEntity.java rename to docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecordEntity.java index 0c725ce..aba1631 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecordEntity.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecordEntity.java @@ -1,4 +1,4 @@ -package com.docus.server.record.pojo.entity; +package com.docus.server.record.common.pojo.entity; public class MedicalRecordEntity { diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasic.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java similarity index 98% rename from docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasic.java rename to docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java index 5ae803d..3a7ca56 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasic.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java @@ -1,4 +1,4 @@ -package com.docus.server.record.pojo.entity; +package com.docus.server.record.common.pojo.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasicExtend.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasicExtend.java similarity index 94% rename from docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasicExtend.java rename to docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasicExtend.java index 2476da3..d93ef50 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasicExtend.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasicExtend.java @@ -1,4 +1,4 @@ -package com.docus.server.record.pojo.entity; +package com.docus.server.record.common.pojo.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java b/docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java index aa1bc9e..cab9971 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java @@ -1,8 +1,10 @@ package com.docus.server.record.mapper; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.record.pojo.entity.TBasic; -import com.docus.server.record.pojo.entity.TBasicExtend; +import com.docus.server.record.common.DSKeyConstants; +import com.docus.server.record.common.pojo.entity.TBasic; +import com.docus.server.record.common.pojo.entity.TBasicExtend; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -17,6 +19,7 @@ import java.util.List; * @since 2021-04-14 */ @Mapper +@DS(DSKeyConstants.DS_KEY) public interface TBasicMapper extends BaseMapper { /** * 根据住院号和住院次数查询业务系统中病案主键 diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/IMedicalRecordService.java b/docus-medical-record/src/main/java/com/docus/server/record/service/IMedicalRecordService.java index 1749f1e..8beac6f 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/IMedicalRecordService.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/service/IMedicalRecordService.java @@ -1,6 +1,6 @@ package com.docus.server.record.service; -import com.docus.server.record.pojo.entity.MedicalRecord; +import com.docus.server.record.common.pojo.entity.MedicalRecord; public interface IMedicalRecordService { void receive(MedicalRecord medicalRecord); diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java b/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java index e60c58a..bc1628f 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java @@ -1,12 +1,12 @@ package com.docus.server.record.service; -import com.baomidou.mybatisplus.extension.service.IService; -import com.docus.server.record.pojo.dto.TBasicDTO; -import com.docus.server.record.pojo.entity.TBasic; +import com.docus.server.common.service.IBaseService; +import com.docus.server.record.common.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.entity.TBasic; import java.util.List; -public interface ITBasicService extends IService { +public interface ITBasicService extends IBaseService { /** * 新增 diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordServiceImpl.java b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordServiceImpl.java index c5e0600..78696d6 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordServiceImpl.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordServiceImpl.java @@ -1,7 +1,7 @@ package com.docus.server.record.service.impl; -import com.docus.server.record.pojo.dto.IdType; -import com.docus.server.record.pojo.entity.MedicalRecord; +import com.docus.server.record.common.pojo.dto.IdType; +import com.docus.server.record.common.pojo.entity.MedicalRecord; import com.docus.server.record.service.IMedicalRecordService; import org.springframework.stereotype.Service; diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java index 4c2bd09..987646c 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java @@ -1,14 +1,14 @@ package com.docus.server.record.service.impl; import cn.hutool.core.util.NumberUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; +import com.docus.server.common.service.impl.BaseServiceImpl; import com.docus.server.record.mapper.TBasicMapper; -import com.docus.server.record.pojo.dto.TBasicDTO; -import com.docus.server.record.pojo.entity.TBasic; -import com.docus.server.record.pojo.entity.TBasicExtend; +import com.docus.server.record.common.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.entity.TBasic; +import com.docus.server.record.common.pojo.entity.TBasicExtend; import com.docus.server.record.service.ITBasicService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,7 +18,7 @@ import java.util.Date; import java.util.List; @Service -public class TBasicServiceImpl extends ServiceImpl implements ITBasicService { +public class TBasicServiceImpl extends BaseServiceImpl implements ITBasicService { @Resource private TBasicMapper tBasicMapper; diff --git a/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml b/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml index b9379d0..a0e6667 100644 --- a/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml +++ b/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml @@ -102,7 +102,7 @@ - select * from `docus_medicalrecord`.`t_basic` where admiss_date between #{admissStartDate} AND #{admissEndDate} @@ -114,7 +114,7 @@ from `docus_medicalrecord`.`t_basic_extend` where patient_id=#{patientId} - select `patient_id`, `admiss_times`, `inpatient_no`, @@ -137,7 +137,7 @@ limit #{offset} , #{size} - select `patient_id`, `admiss_times`, `inpatient_no`, diff --git a/docus-sys/pom.xml b/docus-sys/pom.xml index 77bccd2..c1c60b0 100644 --- a/docus-sys/pom.xml +++ b/docus-sys/pom.xml @@ -23,4 +23,12 @@ + + + com.docus + docus-common + 1.0-SNAPSHOT + compile + + diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/OperatorType.java b/docus-sys/src/main/java/com/docus/server/sys/common/OperatorType.java deleted file mode 100644 index 507983e..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/common/OperatorType.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.docus.server.sys.common; - -/** - * @author linrf - * @date 2023/6/12 15:27 - */ -public enum OperatorType { - IN, EQ -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java index 663af8e..64eb5c4 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java @@ -1,6 +1,6 @@ package com.docus.server.sys.service; -import com.docus.server.sys.common.IBaseService; +import com.docus.server.common.service.IBaseService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.entity.PowerDept; diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java index 390d317..c75a08f 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java @@ -1,6 +1,6 @@ package com.docus.server.sys.service; -import com.docus.server.sys.common.IBaseService; +import com.docus.server.common.service.IBaseService; import com.docus.server.sys.common.pojo.entity.PowerThirdLogin; /** diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java index a26e8fa..3c3085f 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java @@ -1,6 +1,6 @@ package com.docus.server.sys.service; -import com.docus.server.sys.common.IBaseService; +import com.docus.server.common.service.IBaseService; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.sys.common.pojo.entity.PowerUser; diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java index 4566a62..828713d 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java @@ -2,7 +2,7 @@ package com.docus.server.sys.service.impl; import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; -import com.docus.server.sys.common.BaseServiceImpl; +import com.docus.server.common.service.impl.BaseServiceImpl; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.DeptModifyParam; import com.docus.server.sys.common.pojo.entity.PowerDept; diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java index e908ed8..a16918b 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java @@ -1,6 +1,6 @@ package com.docus.server.sys.service.impl; -import com.docus.server.sys.common.BaseServiceImpl; +import com.docus.server.common.service.impl.BaseServiceImpl; import com.docus.server.sys.common.pojo.entity.PowerThirdLogin; import com.docus.server.sys.mapper.PowerThirdLoginMapper; import com.docus.server.sys.service.IPowerThirdLoginService; diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java index 443dc6c..9ef6176 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java @@ -2,8 +2,8 @@ package com.docus.server.sys.service.impl; import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; -import com.docus.server.sys.common.BaseServiceImpl; -import com.docus.server.sys.common.UserProperties; +import com.docus.server.common.UserProperties; +import com.docus.server.common.service.impl.BaseServiceImpl; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.sys.common.pojo.dto.UserModifyParam; import com.docus.server.sys.common.pojo.entity.PowerUser; diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgTBasicMapper.java b/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgTBasicMapper.java index 24ffa47..e43dd0c 100644 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgTBasicMapper.java +++ b/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgTBasicMapper.java @@ -2,7 +2,7 @@ package com.docus.server.ecg.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.docus.server.ecg.common.DSKeyConstants; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java b/ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java index 1ed8c2c..a27e191 100644 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java +++ b/ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java @@ -1,6 +1,6 @@ package com.docus.server.ecg.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java b/ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java index 3ded54b..30a9569 100644 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java +++ b/ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.server.ecg.infrastructure.mapper.EcgDeptMapper; import com.docus.server.ecg.infrastructure.mapper.EcgTBasicMapper; import com.docus.server.ecg.infrastructure.mapper.EcgUserMapper; import com.docus.server.ecg.service.IEcgService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; diff --git a/ecg-sysem/src/main/resources/mapper/EcgTBasicMapper.xml b/ecg-sysem/src/main/resources/mapper/EcgTBasicMapper.xml index b3964a6..8233ffb 100644 --- a/ecg-sysem/src/main/resources/mapper/EcgTBasicMapper.xml +++ b/ecg-sysem/src/main/resources/mapper/EcgTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc diff --git a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrTBasicMapper.java b/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrTBasicMapper.java index 842b8f7..e151250 100644 --- a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrTBasicMapper.java +++ b/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrTBasicMapper.java @@ -2,7 +2,7 @@ package com.docus.server.emr.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.docus.server.emr.common.DSKeyConstants; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java b/emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java index 61707a1..9f489b8 100644 --- a/emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java +++ b/emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java @@ -1,6 +1,6 @@ package com.docus.server.emr.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java b/emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java index 27833a9..73f84c3 100644 --- a/emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java +++ b/emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.server.emr.infrastructure.mapper.EmrDeptMapper; import com.docus.server.emr.infrastructure.mapper.EmrTBasicMapper; import com.docus.server.emr.infrastructure.mapper.EmrUserMapper; import com.docus.server.emr.service.IEmrService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; diff --git a/emr-sysem/src/main/resources/mapper/EmrTBasicMapper.xml b/emr-sysem/src/main/resources/mapper/EmrTBasicMapper.xml index afe86d5..dbca15e 100644 --- a/emr-sysem/src/main/resources/mapper/EmrTBasicMapper.xml +++ b/emr-sysem/src/main/resources/mapper/EmrTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java index 3831be0..a03c581 100644 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java +++ b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java @@ -2,7 +2,7 @@ package com.docus.server.his.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.docus.server.his.common.DSKeyConstants; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java b/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java index ec5ff1e..cb38700 100644 --- a/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java +++ b/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java @@ -1,6 +1,6 @@ package com.docus.server.his.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/his-sysem/src/main/java/com/docus/server/his/service/impl/HisServiceImpl.java b/his-sysem/src/main/java/com/docus/server/his/service/impl/HisServiceImpl.java index 69d8ded..ca711f0 100644 --- a/his-sysem/src/main/java/com/docus/server/his/service/impl/HisServiceImpl.java +++ b/his-sysem/src/main/java/com/docus/server/his/service/impl/HisServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.server.his.infrastructure.mapper.HisDeptMapper; import com.docus.server.his.infrastructure.mapper.HisTBasicMapper; import com.docus.server.his.infrastructure.mapper.HisUserMapper; import com.docus.server.his.service.IHisService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; diff --git a/his-sysem/src/main/resources/mapper/HisTBasicMapper.xml b/his-sysem/src/main/resources/mapper/HisTBasicMapper.xml index 428fce7..8ec7c65 100644 --- a/his-sysem/src/main/resources/mapper/HisTBasicMapper.xml +++ b/his-sysem/src/main/resources/mapper/HisTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc diff --git a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlTBasicMapper.java b/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlTBasicMapper.java index ce2a170..0b4f427 100644 --- a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlTBasicMapper.java +++ b/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlTBasicMapper.java @@ -2,7 +2,7 @@ package com.docus.server.hl.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.docus.server.hl.common.DSKeyConstants; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java b/hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java index 3603e30..5b20010 100644 --- a/hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java +++ b/hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java @@ -1,6 +1,6 @@ package com.docus.server.hl.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java b/hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java index bc09702..fc9c509 100644 --- a/hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java +++ b/hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.server.hl.infrastructure.mapper.HlDeptMapper; import com.docus.server.hl.infrastructure.mapper.HlTBasicMapper; import com.docus.server.hl.infrastructure.mapper.HlUserMapper; import com.docus.server.hl.service.IHlService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; diff --git a/hl-sysem/src/main/resources/mapper/HlTBasicMapper.xml b/hl-sysem/src/main/resources/mapper/HlTBasicMapper.xml index e46ed38..73d347a 100644 --- a/hl-sysem/src/main/resources/mapper/HlTBasicMapper.xml +++ b/hl-sysem/src/main/resources/mapper/HlTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitTBasicMapper.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitTBasicMapper.java index e0fb3a9..6b57e36 100644 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitTBasicMapper.java +++ b/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitTBasicMapper.java @@ -2,7 +2,7 @@ package com.docus.server.issubmit.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.docus.server.issubmit.common.DSKeyConstants; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java index 786ab7a..14e4202 100644 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java +++ b/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java @@ -1,6 +1,6 @@ package com.docus.server.issubmit.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java index 9ccee25..52da928 100644 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java +++ b/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.server.issubmit.infrastructure.mapper.IssubmitDeptMapper; import com.docus.server.issubmit.infrastructure.mapper.IssubmitTBasicMapper; import com.docus.server.issubmit.infrastructure.mapper.IssubmitUserMapper; import com.docus.server.issubmit.service.IIssubmitService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; diff --git a/issubmit-sysem/src/main/resources/mapper/IssubmitTBasicMapper.xml b/issubmit-sysem/src/main/resources/mapper/IssubmitTBasicMapper.xml index b314f84..e806b8f 100644 --- a/issubmit-sysem/src/main/resources/mapper/IssubmitTBasicMapper.xml +++ b/issubmit-sysem/src/main/resources/mapper/IssubmitTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc diff --git a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisTBasicMapper.java b/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisTBasicMapper.java index df41895..1faf17d 100644 --- a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisTBasicMapper.java +++ b/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisTBasicMapper.java @@ -2,7 +2,7 @@ package com.docus.server.lis.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.docus.server.lis.common.DSKeyConstants; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java b/lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java index 1491195..3181181 100644 --- a/lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java +++ b/lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java @@ -1,6 +1,6 @@ package com.docus.server.lis.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java b/lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java index e256102..3b07400 100644 --- a/lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java +++ b/lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.server.lis.infrastructure.mapper.LisDeptMapper; import com.docus.server.lis.infrastructure.mapper.LisTBasicMapper; import com.docus.server.lis.infrastructure.mapper.LisUserMapper; import com.docus.server.lis.service.ILisService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; diff --git a/lis-sysem/src/main/resources/mapper/LisTBasicMapper.xml b/lis-sysem/src/main/resources/mapper/LisTBasicMapper.xml index 3f7e45d..fc66b28 100644 --- a/lis-sysem/src/main/resources/mapper/LisTBasicMapper.xml +++ b/lis-sysem/src/main/resources/mapper/LisTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsTBasicMapper.java b/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsTBasicMapper.java index 4737045..5810a43 100644 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsTBasicMapper.java +++ b/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsTBasicMapper.java @@ -2,7 +2,7 @@ package com.docus.server.pacs.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.docus.server.pacs.common.DSKeyConstants; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java b/pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java index d769823..c0160df 100644 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java +++ b/pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java @@ -1,6 +1,6 @@ package com.docus.server.pacs.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java b/pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java index 4143435..97c9960 100644 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java +++ b/pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.server.pacs.infrastructure.mapper.PacsDeptMapper; import com.docus.server.pacs.infrastructure.mapper.PacsTBasicMapper; import com.docus.server.pacs.infrastructure.mapper.PacsUserMapper; import com.docus.server.pacs.service.IPacsService; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; diff --git a/pacs-sysem/src/main/resources/mapper/PacsTBasicMapper.xml b/pacs-sysem/src/main/resources/mapper/PacsTBasicMapper.xml index 309f256..6197cb5 100644 --- a/pacs-sysem/src/main/resources/mapper/PacsTBasicMapper.xml +++ b/pacs-sysem/src/main/resources/mapper/PacsTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc diff --git a/pom.xml b/pom.xml index 1f71e72..fe26a0a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ pacs-sysem vte-sysem zz-sysem + docus-common diff --git a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteTBasicMapper.java b/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteTBasicMapper.java index 5033420..5efe82b 100644 --- a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteTBasicMapper.java +++ b/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteTBasicMapper.java @@ -1,7 +1,7 @@ package com.docus.server.vte.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.vte.common.DSKeyConstants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java b/vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java index fdb5ff3..04627f5 100644 --- a/vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java +++ b/vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java @@ -1,6 +1,6 @@ package com.docus.server.vte.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java b/vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java index cc43c93..67ff142 100644 --- a/vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java +++ b/vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java @@ -1,6 +1,6 @@ package com.docus.server.vte.service.impl; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.vte.infrastructure.mapper.VteDeptMapper; diff --git a/vte-sysem/src/main/resources/mapper/VteTBasicMapper.xml b/vte-sysem/src/main/resources/mapper/VteTBasicMapper.xml index cb564ec..18e60d0 100644 --- a/vte-sysem/src/main/resources/mapper/VteTBasicMapper.xml +++ b/vte-sysem/src/main/resources/mapper/VteTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc diff --git a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzTBasicMapper.java b/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzTBasicMapper.java index f56bd17..959c557 100644 --- a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzTBasicMapper.java +++ b/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzTBasicMapper.java @@ -1,7 +1,7 @@ package com.docus.server.zz.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.zz.common.DSKeyConstants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java b/zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java index 498ded3..8cacf2e 100644 --- a/zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java +++ b/zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java @@ -1,6 +1,6 @@ package com.docus.server.zz.service; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java b/zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java index 897dfa0..3540f25 100644 --- a/zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java +++ b/zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java @@ -1,6 +1,6 @@ package com.docus.server.zz.service.impl; -import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.zz.infrastructure.mapper.ZzDeptMapper; diff --git a/zz-sysem/src/main/resources/mapper/ZzTBasicMapper.xml b/zz-sysem/src/main/resources/mapper/ZzTBasicMapper.xml index a95de91..a8e1dad 100644 --- a/zz-sysem/src/main/resources/mapper/ZzTBasicMapper.xml +++ b/zz-sysem/src/main/resources/mapper/ZzTBasicMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic` WHERE update_time between #{startDate} and #{endDate} order by update_time asc