diff --git a/bl-sysem/pom.xml b/bl-sysem/pom.xml deleted file mode 100644 index 7ff68fb..0000000 --- a/bl-sysem/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - bl-sysem - Archetype - bl-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/bl-mapper - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/bl-sysem/src/main/java/com/docus/server/bl/common/DSKeyConstants.java b/bl-sysem/src/main/java/com/docus/server/bl/common/DSKeyConstants.java deleted file mode 100644 index e573f3c..0000000 --- a/bl-sysem/src/main/java/com/docus/server/bl/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.bl.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "bl"; - -} diff --git a/bl-sysem/src/main/java/com/docus/server/bl/common/annotation/CacheLayer.java b/bl-sysem/src/main/java/com/docus/server/bl/common/annotation/CacheLayer.java deleted file mode 100644 index 18d3928..0000000 --- a/bl-sysem/src/main/java/com/docus/server/bl/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.bl.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/cache/DeptCacheLayer.java b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index 3aeec6f..0000000 --- a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.bl.infrastructure.cache; - -public class DeptCacheLayer { -} diff --git a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/client/DownLoadAPI.java b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index 5275e7b..0000000 --- a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.bl.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java deleted file mode 100644 index 4210d62..0000000 --- a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.docus.server.bl.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.bl.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface BlDeptMapper { - - List> page(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - - List> BatchForJZH(@Param("jzhs") List jzhs); - - List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForEXAMTIME(@Param("datas") List> datas); -} 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 deleted file mode 100644 index 38fdcda..0000000 --- a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.common.pojo.dto.TBasicDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface BlTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlUserMapper.java b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlUserMapper.java deleted file mode 100644 index 0eac73e..0000000 --- a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.sys.common.pojo.dto.UserDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface BlUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index d42efd2..0000000 --- a/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.docus.server.bl.service; - -import com.docus.server.client.api.IHospitalApi; - -public interface IBlService extends IHospitalApi { -} 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 deleted file mode 100644 index 2dd6ad8..0000000 --- a/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.docus.server.bl.service.impl; - -import com.docus.server.bl.common.DSKeyConstants; -import com.docus.server.bl.infrastructure.mapper.BlDeptMapper; -import com.docus.server.bl.service.IBlService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Component(DSKeyConstants.DS_KEY + "ServiceImpl") -@AllArgsConstructor -public class BlServiceImpl implements IBlService { - - private final BlDeptMapper blDeptMapper; - - @Override - public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { - return blDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List> BatchForJZH(List jzhs) { - return blDeptMapper.BatchForJZH(jzhs); - } - - @Override - public List> BatchForJZHAndAdmissTimes(List> datas) { - return blDeptMapper.BatchForJZHAndAdmissTimes(datas); - } - - @Override - public List> BatchForZYHAndAdmissTimes(List> datas) { - return blDeptMapper.BatchForZYHAndAdmissTimes(datas); - } - - @Override - public List> BatchForEXAMTIME(List> datas) { - return blDeptMapper.BatchForEXAMTIME(datas); - } - -} diff --git a/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml b/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml deleted file mode 100644 index 00618aa..0000000 --- a/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bl-sysem/src/main/resources/mapper/BlTBasicMapper.xml b/bl-sysem/src/main/resources/mapper/BlTBasicMapper.xml deleted file mode 100644 index 63468f9..0000000 --- a/bl-sysem/src/main/resources/mapper/BlTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bl-sysem/src/main/resources/mapper/BlUserMapper.xml b/bl-sysem/src/main/resources/mapper/BlUserMapper.xml deleted file mode 100644 index 5831e49..0000000 --- a/bl-sysem/src/main/resources/mapper/BlUserMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java index 8f9a3fe..da531d8 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java @@ -2,12 +2,12 @@ package com.docus.server.collect.report; import com.alibaba.fastjson.JSONObject; import com.docus.core.util.Func; +import com.docus.core.util.ParamsUtils; import com.docus.core.util.XmlUtil; import com.docus.infrastructure.core.exception.BaseException; import com.docus.server.archivefile.pojo.dto.ReportDTO; import com.docus.server.collect.IConverter; import com.docus.server.collect.web.utils.TableJsonRead; -import com.docus.server.common.util.ParamsUtils; import org.springframework.stereotype.Component; import org.w3c.dom.Node; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java index c2eb552..7cbaf6e 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java @@ -1,13 +1,13 @@ package com.docus.server.collect.report.noview; import com.docus.core.util.Func; +import com.docus.core.util.MapObjUtil; import com.docus.core.util.json.JSON; import com.docus.server.collect.AbstractJobCollector; import com.docus.server.collect.web.common.dto.NoViewCollectionDto; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.enums.QueryWayEnum; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.common.util.MapObjUtil; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java index 772a442..6a0bca3 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import com.docus.core.util.Func; +import com.docus.core.util.MapObjUtil; import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; import com.docus.server.archivefile.service.IAfCollectSysDictionary; import com.docus.server.collect.web.common.DocusProperties; @@ -18,7 +19,6 @@ import com.docus.server.collect.web.enums.RedisKeyEnum; import com.docus.server.collect.web.utils.MqQueueUtils; import com.docus.server.collect.web.utils.RedisMq; import com.docus.server.common.message.MqMessage; -import com.docus.server.common.util.MapObjUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.core.AmqpTemplate; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java index c7aef66..f698cb6 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java @@ -4,10 +4,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.SpringUtils; import com.docus.infrastructure.redis.service.IdService; +import com.docus.server.api.IHospitalApi; import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; import com.docus.server.archivefile.service.IAfViewCollectionLogService; -import com.docus.server.client.api.IHospitalApi; import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.BasicProperties; import com.docus.server.collect.web.common.DocusProperties; @@ -22,7 +23,6 @@ import com.docus.server.collect.web.utils.MqQueueUtils; import com.docus.server.collect.web.utils.RedisMq; import com.docus.server.collect.web.utils.SpringRestTemplateUtils; import com.docus.server.common.message.MqMessage; -import com.docus.server.common.util.SpringUtils; import com.docus.server.record.service.ITBasicService; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/MQTestRestController.java b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/MQTestRestController.java index ee86a51..f9e257d 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/MQTestRestController.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/MQTestRestController.java @@ -2,7 +2,7 @@ package com.docus.server.collect.user.mq.test; import com.docus.server.collect.IConverter; import com.docus.server.collect.IHttpResult; -import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index 5d8955d..4fdf3b0 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/collect-sdry/src/main/resources/bootstrap.yml @@ -13,92 +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: root - password: root + username: docus + password: docus702 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: root - password: root + username: docus + password: docus702 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 + username: docus + password: docus702 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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/lis?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource # rabbitmq: @@ -108,7 +108,7 @@ spring: # password: guest redis: host: redis.docus.cn - # password: JSdocus@702 + password: JSdocus@702 cloud: nacos: discovery: @@ -174,7 +174,7 @@ mybatis-plus: field-strategy: NOT_EMPTY db-type: MYSQL mapper-locations: classpath*:/mapper/*Mapper.xml,file:mybatis.mapper/**/*Mapper.xml - type-enums-package: com.docus.server.collect.web.enums,com.docus.server.common.enums + type-enums-package: com.docus.server.enums xxl: job: 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 a6d523b..e8532b8 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 @@ -6,7 +6,7 @@ import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.IConverter; import com.docus.server.collect.IHttpResult; -import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.record.common.pojo.dto.TBasicDTO; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java index 4fcff35..ee8858d 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java @@ -3,14 +3,14 @@ package com.docus.server.collect.basic.http.test; import com.docus.core.util.json.JSON; import com.docus.log.executor.TrackRetrySpringExecutor; import com.docus.log.handler.IJobHandler; -import com.docus.log.handler.MethodJobHandler; +import com.docus.log.handler.impl.MethodJobHandler; import com.docus.server.collect.IConverter; import com.docus.server.collect.IHttpResult; import com.docus.server.collect.web.common.entity.TaskOriginalMessage; -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.collect.web.service.ITaskOriginalMessageService; +import com.docus.server.enums.CollectTypeEnum; 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/ws/impl/BasicServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java index 17681cc..da753d1 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 @@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper; import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; import com.docus.server.collect.basic.ws.IBasicServer; -import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.record.common.pojo.dto.TBasicDTO; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java index 2da8bc8..6654bea 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java @@ -6,7 +6,7 @@ import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.IConverter; import com.docus.server.collect.IHttpResult; -import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.collect.web.process.VisitorProcessor; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java index 3c3a51e..353f82a 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java @@ -5,7 +5,7 @@ import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; -import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.collect.web.process.VisitorProcessor; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java index a7b859e..5045102 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java @@ -1,6 +1,5 @@ package com.docus.server.collect.report.view; -import com.docus.server.bl.common.DSKeyConstants; import com.docus.server.bl.service.IBlService; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; @@ -8,6 +7,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.constants.DSKeyConstants; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -49,7 +49,7 @@ public class BlViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override public void doHandle(List> results, String param) { - jobResult.handle(results, DSKeyConstants.DS_KEY); + jobResult.handle(results, DSKeyConstants.BL_DS_KEY); } @Override diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java index 025acbd..5165961 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.ecg.common.DSKeyConstants; +import com.docus.server.constants.DSKeyConstants; import com.docus.server.ecg.service.IEcgService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -49,7 +49,7 @@ public class EcgViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override public void doHandle(List> results, String param) { - jobResult.handle(results, DSKeyConstants.DS_KEY); + jobResult.handle(results, DSKeyConstants.ECG_DS_KEY); } @Override diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java index bed0aac..22d95df 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.emr.common.DSKeyConstants; +import com.docus.server.constants.DSKeyConstants; import com.docus.server.emr.service.IEmrService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -49,7 +49,7 @@ public class EmrViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override public void doHandle(List> results, String param) { - jobResult.handle(results, DSKeyConstants.DS_KEY); + jobResult.handle(results, DSKeyConstants.EMR_DS_KEY); } @Override diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java index accfcc1..89a5906 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.hl.common.DSKeyConstants; +import com.docus.server.constants.DSKeyConstants; import com.docus.server.hl.service.IHlService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -49,8 +49,9 @@ public class HlViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override public void doHandle(List> results, String param) { - jobResult.handle(results, DSKeyConstants.DS_KEY); + jobResult.handle(results, DSKeyConstants.HL_DS_KEY); } + @Override public List> execute(PeriodTime periodTime, TaskConfig taskConfig) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java index f70c287..0910a1b 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.issubmit.common.DSKeyConstants; +import com.docus.server.constants.DSKeyConstants; import com.docus.server.issubmit.service.IIssubmitService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -49,8 +49,9 @@ public class IssubmitViewCollectJob extends AbstractCollectJob> results, String param) { - jobResult.handle(results, DSKeyConstants.DS_KEY); + jobResult.handle(results, DSKeyConstants.ISSUBMIT_DS_KEY); } + @Override public List> execute(PeriodTime periodTime, TaskConfig taskConfig) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java index 4419193..e17e2f7 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.lis.common.DSKeyConstants; +import com.docus.server.constants.DSKeyConstants; import com.docus.server.lis.service.ILisService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -49,7 +49,7 @@ public class LisViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override public void doHandle(List> results, String param) { - jobResult.handle(results, DSKeyConstants.DS_KEY); + jobResult.handle(results, DSKeyConstants.LIS_DS_KEY); } @Override diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java index 04f4f7b..0b517bd 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.pacs.common.DSKeyConstants; +import com.docus.server.constants.DSKeyConstants; import com.docus.server.pacs.service.IPacsService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -49,8 +49,9 @@ public class PacsViewCollectJob extends AbstractCollectJob> @SuppressWarnings("unchecked") @Override public void doHandle(List> results, String param) { - jobResult.handle(results, DSKeyConstants.DS_KEY); + jobResult.handle(results, DSKeyConstants.PACS_DS_KEY); } + @Override public List> execute(PeriodTime periodTime, TaskConfig taskConfig) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java index df57654..74e8b57 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.vte.common.DSKeyConstants; +import com.docus.server.constants.DSKeyConstants; import com.docus.server.vte.service.IVteService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -49,8 +49,9 @@ public class VteViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override public void doHandle(List> results, String param) { - jobResult.handle(results, DSKeyConstants.DS_KEY); + jobResult.handle(results, DSKeyConstants.VTE_DS_KEY); } + @Override public List> execute(PeriodTime periodTime, TaskConfig taskConfig) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java index e9ef3ac..8f0a9d3 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.zz.common.DSKeyConstants; +import com.docus.server.constants.DSKeyConstants; import com.docus.server.zz.service.IZzService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -49,7 +49,7 @@ public class ZzViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override public void doHandle(List> results, String param) { - jobResult.handle(results, DSKeyConstants.DS_KEY); + jobResult.handle(results, DSKeyConstants.ZZ_DS_KEY); } @Override diff --git a/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java index 00b62c6..71bef34 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java @@ -8,7 +8,7 @@ import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; import com.docus.server.collect.report.service.IReportService; import com.docus.server.collect.report.ws.IReportServer; -import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java b/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java index 384f517..4ecc00d 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java @@ -6,7 +6,7 @@ import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.IConverter; import com.docus.server.collect.IHttpResult; -import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java index 646dbaf..a5625b6 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java @@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper; import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; import com.docus.server.collect.user.ws.IUserServer; -import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java b/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java index fb44ade..93a5c4d 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java @@ -3,7 +3,7 @@ package com.docus.server.collect.web.common.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.docus.server.collect.web.utils.DateSpiltUtil; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.common.enums.StateEnum; +import com.docus.server.enums.StateEnum; import lombok.Data; import java.util.Date; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskOriginalMessage.java b/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskOriginalMessage.java index 19bc5c9..0179909 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskOriginalMessage.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskOriginalMessage.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.docus.server.collect.web.enums.CollectTypeEnum; -import com.docus.server.common.enums.StateEnum; +import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java b/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java index a3ca0d0..fd76158 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java @@ -3,8 +3,8 @@ package com.docus.server.collect.web.convert; import com.docus.core.util.DateUtil; import com.docus.infrastructure.redis.service.IdService; import com.docus.server.collect.web.common.entity.TaskOriginalMessage; -import com.docus.server.collect.web.enums.CollectTypeEnum; -import com.docus.server.common.enums.StateEnum; +import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; import org.springframework.stereotype.Component; import javax.annotation.Resource; 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 3a19dfd..cf757c4 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,7 @@ import com.docus.server.collect.web.service.CollectService; import com.docus.server.collect.web.service.ITaskConfigService; import com.docus.server.collect.web.utils.PeriodTime; import com.docus.server.common.config.UserProperties; -import com.docus.server.common.enums.StateEnum; +import com.docus.server.enums.StateEnum; import com.docus.server.record.service.ITBasicService; import com.docus.server.sys.service.IPowerDeptService; import com.docus.server.sys.service.IPowerThirdLoginService; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java index 1b21ded..a8ee536 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java @@ -3,7 +3,7 @@ package com.docus.server.collect.web.job; import com.docus.server.collect.web.common.entity.TaskOriginalMessage; import com.docus.server.collect.web.service.ITaskOriginalMessageService; import com.docus.server.collect.web.service.TrackRetryService; -import com.docus.server.common.enums.StateEnum; +import com.docus.server.enums.StateEnum; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java index 72d214a..9c969bc 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java @@ -1,16 +1,16 @@ package com.docus.server.collect.web.process; import com.docus.core.util.Func; +import com.docus.core.util.SpringUtils; import com.docus.core.util.json.JSON; +import com.docus.infrastructure.core.db.enums.IIntegerEnum; import com.docus.log.context.TrackContext; import com.docus.log.processor.AbstractProcessor; import com.docus.server.collect.IConverter; import com.docus.server.collect.IResult; -import com.docus.server.collect.web.enums.CollectTypeEnum; import com.docus.server.collect.web.service.ITaskOriginalMessageService; -import com.docus.server.common.enums.IIntegerEnum; -import com.docus.server.common.enums.StateEnum; -import com.docus.server.common.util.SpringUtils; +import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java index c35d5c7..1fd9a88 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java @@ -1,7 +1,7 @@ package com.docus.server.collect.web.service; +import com.docus.infrastructure.core.db.service.IBaseService; import com.docus.server.collect.web.common.entity.TaskConfig; -import com.docus.server.common.service.IBaseService; import java.util.Date; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java index 7d8230b..3e2ef3e 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java @@ -1,9 +1,9 @@ package com.docus.server.collect.web.service; +import com.docus.infrastructure.core.db.service.IBaseService; import com.docus.server.collect.web.common.entity.TaskOriginalMessage; -import com.docus.server.collect.web.enums.CollectTypeEnum; -import com.docus.server.common.enums.StateEnum; -import com.docus.server.common.service.IBaseService; +import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; public interface ITaskOriginalMessageService extends IBaseService { diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java index 5f19ccb..4781d2d 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java @@ -3,7 +3,7 @@ package com.docus.server.collect.web.service; import com.docus.core.util.json.JSON; import com.docus.log.executor.TrackRetrySpringExecutor; import com.docus.log.handler.IJobHandler; -import com.docus.log.handler.MethodJobHandler; +import com.docus.log.handler.impl.MethodJobHandler; import com.docus.server.collect.web.common.entity.TaskOriginalMessage; import org.springframework.retry.annotation.Backoff; import org.springframework.retry.annotation.Retryable; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java index 1eba12a..3ba26a3 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java @@ -1,9 +1,9 @@ package com.docus.server.collect.web.service.impl; +import com.docus.infrastructure.core.db.service.impl.BaseServiceImpl; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.mapper.TaskConfigMapper; import com.docus.server.collect.web.service.ITaskConfigService; -import com.docus.server.common.service.impl.BaseServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java index b0138c8..8a79870 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java @@ -2,13 +2,13 @@ package com.docus.server.collect.web.service.impl; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.service.impl.BaseServiceImpl; import com.docus.server.collect.web.common.entity.TaskOriginalMessage; import com.docus.server.collect.web.convert.TaskOriginalMessageConverter; -import com.docus.server.collect.web.enums.CollectTypeEnum; import com.docus.server.collect.web.mapper.TaskOriginalMessageMapper; import com.docus.server.collect.web.service.ITaskOriginalMessageService; -import com.docus.server.common.enums.StateEnum; -import com.docus.server.common.service.impl.BaseServiceImpl; +import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/common-docus/docus-medical-record/src/main/java/com/docus/server/record/common/A.java b/common-docus/docus-medical-record/src/main/java/com/docus/server/record/common/A.java new file mode 100644 index 0000000..9859e16 --- /dev/null +++ b/common-docus/docus-medical-record/src/main/java/com/docus/server/record/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.record.common; + +public class A { +} diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/common/A.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/common/A.java new file mode 100644 index 0000000..4285092 --- /dev/null +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.sys.common; + +public class A { +} diff --git a/common-sysem/bl-sysem/src/main/java/com/docus/server/bl/common/A.java b/common-sysem/bl-sysem/src/main/java/com/docus/server/bl/common/A.java new file mode 100644 index 0000000..5e09b92 --- /dev/null +++ b/common-sysem/bl-sysem/src/main/java/com/docus/server/bl/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.bl.common; + +public class A { +} diff --git a/common-sysem/ecg-sysem/src/main/java/com/docus/server/ecg/common/A.java b/common-sysem/ecg-sysem/src/main/java/com/docus/server/ecg/common/A.java new file mode 100644 index 0000000..c1320c8 --- /dev/null +++ b/common-sysem/ecg-sysem/src/main/java/com/docus/server/ecg/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.ecg.common; + +public class A { +} diff --git a/common-sysem/his-sysem/src/main/java/com/docus/server/his/common/A.java b/common-sysem/his-sysem/src/main/java/com/docus/server/his/common/A.java new file mode 100644 index 0000000..972e57a --- /dev/null +++ b/common-sysem/his-sysem/src/main/java/com/docus/server/his/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.his.common; + +public class A { +} diff --git a/common-sysem/hl-sysem/src/main/java/com/docus/server/hl/common/A.java b/common-sysem/hl-sysem/src/main/java/com/docus/server/hl/common/A.java new file mode 100644 index 0000000..abf4f66 --- /dev/null +++ b/common-sysem/hl-sysem/src/main/java/com/docus/server/hl/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.hl.common; + +public class A { +} diff --git a/common-sysem/issubmit-sysem/src/main/java/com/docus/server/issubmit/common/A.java b/common-sysem/issubmit-sysem/src/main/java/com/docus/server/issubmit/common/A.java new file mode 100644 index 0000000..109d633 --- /dev/null +++ b/common-sysem/issubmit-sysem/src/main/java/com/docus/server/issubmit/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.issubmit.common; + +public class A { +} diff --git a/common-sysem/lis-sysem/src/main/java/com/docus/server/lis/common/A.java b/common-sysem/lis-sysem/src/main/java/com/docus/server/lis/common/A.java new file mode 100644 index 0000000..38519d5 --- /dev/null +++ b/common-sysem/lis-sysem/src/main/java/com/docus/server/lis/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.lis.common; + +public class A { +} diff --git a/common-sysem/pacs-sysem/src/main/java/com/docus/server/pacs/common/A.java b/common-sysem/pacs-sysem/src/main/java/com/docus/server/pacs/common/A.java new file mode 100644 index 0000000..ea4f384 --- /dev/null +++ b/common-sysem/pacs-sysem/src/main/java/com/docus/server/pacs/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.pacs.common; + +public class A { +} diff --git a/common-sysem/vte-sysem/src/main/java/com/docus/server/vte/common/A.java b/common-sysem/vte-sysem/src/main/java/com/docus/server/vte/common/A.java new file mode 100644 index 0000000..5f44778 --- /dev/null +++ b/common-sysem/vte-sysem/src/main/java/com/docus/server/vte/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.vte.common; + +public class A { +} diff --git a/common-sysem/zz-sysem/src/main/java/com/docus/server/zz/common/A.java b/common-sysem/zz-sysem/src/main/java/com/docus/server/zz/common/A.java new file mode 100644 index 0000000..948a83f --- /dev/null +++ b/common-sysem/zz-sysem/src/main/java/com/docus/server/zz/common/A.java @@ -0,0 +1,4 @@ +package com.docus.server.zz.common; + +public class A { +} diff --git a/docus-api-common/src/main/java/com/docus/server/common/db/KeyGenerator.java b/docus-api-common/src/main/java/com/docus/server/common/db/KeyGenerator.java deleted file mode 100644 index 593cb22..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/db/KeyGenerator.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.docus.server.common.db; - -import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator; - -import java.util.UUID; - -public class KeyGenerator implements IKeyGenerator { - public static String genId() { - return UUID.randomUUID().toString().replace("-", "").toUpperCase(); - } - - @Override - public String executeSql(String incrementerName) { - return genId(); - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTimeTypeHandler.java b/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTimeTypeHandler.java deleted file mode 100644 index 7e84772..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTimeTypeHandler.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.docus.server.common.db.type.handler; - -import org.apache.ibatis.type.BaseTypeHandler; -import org.apache.ibatis.type.JdbcType; -import org.apache.ibatis.type.MappedTypes; - -import java.sql.*; -import java.time.LocalDateTime; - -//用于兼容gbase localdatetime 转换 -@MappedTypes(value = LocalDateTime.class) -public class LocalDateTimeTypeHandler extends BaseTypeHandler { - - //驱动是否原生支持 - private Boolean isJdbcSupport; - - private boolean getIsJdbcSupport(ResultSet rs, String columnName) { - if (isJdbcSupport == null) { - try { - rs.getObject(columnName, LocalDateTime.class); - isJdbcSupport = true; - } catch (Exception e) { - isJdbcSupport = false; - } - } - return isJdbcSupport; - } - - private boolean getIsJdbcSupport(CallableStatement cs, int columnIndex) { - if (isJdbcSupport == null) { - try { - cs.getObject(columnIndex, LocalDateTime.class); - isJdbcSupport = true; - } catch (Exception e) { - isJdbcSupport = false; - } - } - return isJdbcSupport; - } - - private boolean getIsJdbcSupport(ResultSet rs, int columnIndex) { - if (isJdbcSupport == null) { - try { - rs.getObject(columnIndex, LocalDateTime.class); - isJdbcSupport = true; - } catch (Exception e) { - isJdbcSupport = false; - } - } - return isJdbcSupport; - } - - @Override - public void setNonNullParameter(PreparedStatement ps, int i, LocalDateTime localDateTime, JdbcType jdbcType) throws SQLException { - if (isJdbcSupport != null && isJdbcSupport) { - ps.setObject(i, localDateTime); - } else { - ps.setObject(i, Timestamp.valueOf(localDateTime)); - } - } - - @Override - public LocalDateTime getNullableResult(ResultSet resultSet, String columnName) throws SQLException { - if (getIsJdbcSupport(resultSet, columnName)) { - return resultSet.getObject(columnName, LocalDateTime.class); - } else { - Timestamp timestamp = resultSet.getTimestamp(columnName); - return timestamp == null ? null : timestamp.toLocalDateTime(); - } - } - - @Override - public LocalDateTime getNullableResult(ResultSet resultSet, int columnIndex) throws SQLException { - if (getIsJdbcSupport(resultSet, columnIndex)) { - return resultSet.getObject(columnIndex, LocalDateTime.class); - } else { - Timestamp timestamp = resultSet.getTimestamp(columnIndex); - return timestamp == null ? null : timestamp.toLocalDateTime(); - } - } - - @Override - public LocalDateTime getNullableResult(CallableStatement callableStatement, int columnIndex) throws SQLException { - if (getIsJdbcSupport(callableStatement, columnIndex)) { - return callableStatement.getObject(columnIndex, LocalDateTime.class); - } else { - Timestamp timestamp = callableStatement.getTimestamp(columnIndex); - return timestamp == null ? null : timestamp.toLocalDateTime(); - } - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTypeHandler.java b/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTypeHandler.java deleted file mode 100644 index 973965a..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTypeHandler.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.docus.server.common.db.type.handler; - -import org.apache.ibatis.type.BaseTypeHandler; -import org.apache.ibatis.type.JdbcType; -import org.apache.ibatis.type.MappedTypes; - -import java.sql.*; -import java.time.LocalDate; - -//用于兼容gbase LocalDate 转换 -@MappedTypes(value = LocalDate.class) -public class LocalDateTypeHandler extends BaseTypeHandler { - - //驱动是否原生支持 - private Boolean isJdbcSupport; - - private boolean getIsJdbcSupport(ResultSet rs, String columnName) { - if (isJdbcSupport == null) { - try { - rs.getObject(columnName, LocalDate.class); - isJdbcSupport = true; - } catch (Exception e) { - isJdbcSupport = false; - } - } - return isJdbcSupport; - } - - private boolean getIsJdbcSupport(CallableStatement cs, int columnIndex) { - if (isJdbcSupport == null) { - try { - cs.getObject(columnIndex, LocalDate.class); - isJdbcSupport = true; - } catch (Exception e) { - isJdbcSupport = false; - } - } - return isJdbcSupport; - } - - private boolean getIsJdbcSupport(ResultSet rs, int columnIndex) { - if (isJdbcSupport == null) { - try { - rs.getObject(columnIndex, LocalDate.class); - isJdbcSupport = true; - } catch (Exception e) { - isJdbcSupport = false; - } - } - return isJdbcSupport; - } - - @Override - public void setNonNullParameter(PreparedStatement ps, int i, LocalDate localDate, JdbcType jdbcType) throws SQLException { - if (isJdbcSupport != null && isJdbcSupport) { - ps.setObject(i, localDate); - } else { - ps.setObject(i, Date.valueOf(localDate)); - } - } - - @Override - public LocalDate getNullableResult(ResultSet resultSet, String columnName) throws SQLException { - if (getIsJdbcSupport(resultSet, columnName)) { - return resultSet.getObject(columnName, LocalDate.class); - } else { - Date date = resultSet.getDate(columnName); - return date == null ? null : date.toLocalDate(); - } - } - - @Override - public LocalDate getNullableResult(ResultSet resultSet, int columnIndex) throws SQLException { - if (getIsJdbcSupport(resultSet, columnIndex)) { - return resultSet.getObject(columnIndex, LocalDate.class); - } else { - Date date = resultSet.getDate(columnIndex); - return date == null ? null : date.toLocalDate(); - } - } - - @Override - public LocalDate getNullableResult(CallableStatement callableStatement, int columnIndex) throws SQLException { - if (getIsJdbcSupport(callableStatement, columnIndex)) { - return callableStatement.getObject(columnIndex, LocalDate.class); - } else { - Date date = callableStatement.getDate(columnIndex); - return date == null ? null : date.toLocalDate(); - } - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalTimeTypeHandler.java b/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalTimeTypeHandler.java deleted file mode 100644 index 5c33890..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalTimeTypeHandler.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.docus.server.common.db.type.handler; - -import org.apache.ibatis.type.BaseTypeHandler; -import org.apache.ibatis.type.JdbcType; -import org.apache.ibatis.type.MappedTypes; - -import java.sql.*; -import java.time.LocalTime; - -//用于兼容gbase LocalTime 转换 -@MappedTypes(value = LocalTime.class) -public class LocalTimeTypeHandler extends BaseTypeHandler { - - //驱动是否原生支持 - private Boolean isJdbcSupport; - - private boolean getIsJdbcSupport(ResultSet rs, String columnName) { - if (isJdbcSupport == null) { - try { - rs.getObject(columnName, LocalTime.class); - isJdbcSupport = true; - } catch (Exception e) { - isJdbcSupport = false; - } - } - return isJdbcSupport; - } - - private boolean getIsJdbcSupport(CallableStatement cs, int columnIndex) { - if (isJdbcSupport == null) { - try { - cs.getObject(columnIndex, LocalTime.class); - isJdbcSupport = true; - } catch (Exception e) { - isJdbcSupport = false; - } - } - return isJdbcSupport; - } - - private boolean getIsJdbcSupport(ResultSet rs, int columnIndex) { - if (isJdbcSupport == null) { - try { - rs.getObject(columnIndex, LocalTime.class); - isJdbcSupport = true; - } catch (Exception e) { - isJdbcSupport = false; - } - } - return isJdbcSupport; - } - - @Override - public void setNonNullParameter(PreparedStatement ps, int i, LocalTime LocalTime, JdbcType jdbcType) throws SQLException { - if (isJdbcSupport != null && isJdbcSupport) { - ps.setObject(i, LocalTime); - } else { - ps.setObject(i, Time.valueOf(LocalTime)); - } - } - - @Override - public LocalTime getNullableResult(ResultSet resultSet, String columnName) throws SQLException { - if (getIsJdbcSupport(resultSet, columnName)) { - return resultSet.getObject(columnName, LocalTime.class); - } else { - Time time = resultSet.getTime(columnName); - return time == null ? null : time.toLocalTime(); - } - } - - @Override - public LocalTime getNullableResult(ResultSet resultSet, int columnIndex) throws SQLException { - if (getIsJdbcSupport(resultSet, columnIndex)) { - return resultSet.getObject(columnIndex, LocalTime.class); - } else { - Time time = resultSet.getTime(columnIndex); - return time == null ? null : time.toLocalTime(); - } - } - - @Override - public LocalTime getNullableResult(CallableStatement callableStatement, int columnIndex) throws SQLException { - if (getIsJdbcSupport(callableStatement, columnIndex)) { - return callableStatement.getObject(columnIndex, LocalTime.class); - } else { - Time time = callableStatement.getTime(columnIndex); - return time == null ? null : time.toLocalTime(); - } - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/enums/EnumItemView.java b/docus-api-common/src/main/java/com/docus/server/common/enums/EnumItemView.java deleted file mode 100644 index 94b65bf..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/enums/EnumItemView.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.docus.server.common.enums; - -public class EnumItemView { - - private Integer value; - private String display; - - public EnumItemView() { - } - - public EnumItemView(Integer value, String display) { - this.value = value; - this.display = display; - } - - public Integer getValue() { - return value; - } - - public void setValue(Integer value) { - this.value = value; - } - - public String getDisplay() { - return display; - } - - public void setDisplay(String display) { - this.display = display; - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/enums/EnumTypeHandlerDispatch.java b/docus-api-common/src/main/java/com/docus/server/common/enums/EnumTypeHandlerDispatch.java deleted file mode 100644 index 45e3f22..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/enums/EnumTypeHandlerDispatch.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.docus.server.common.enums; - -import org.apache.ibatis.type.BaseTypeHandler; -import org.apache.ibatis.type.EnumTypeHandler; -import org.apache.ibatis.type.JdbcType; - -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -//mybatis枚举类型分发 -public class EnumTypeHandlerDispatch> extends BaseTypeHandler { - private BaseTypeHandler typeHandler; - - public EnumTypeHandlerDispatch(Class type) { - if (type == null) { - throw new IllegalArgumentException("Type argument. cannot be nu11"); - } - if (IIntegerEnum.class.isAssignableFrom(type)) { - //如果实现了IIntegerEnum,使用自定义的转换器 - typeHandler = new IntegerEnumHandler(type); - } else { - //默认转换器 - typeHandler = new EnumTypeHandler<>(type); - } - } - - @Override - public void setNonNullParameter(PreparedStatement ps, int i, E parameter, JdbcType jdbcType) throws - SQLException { - typeHandler.setNonNullParameter(ps, i, parameter, jdbcType); - } - - @Override - public E getNullableResult(ResultSet rs, String columnName) throws SQLException { - return typeHandler.getNullableResult(rs, columnName); - } - - @Override - public E getNullableResult(ResultSet rs, int columnIndex) throws SQLException { - return typeHandler.getNullableResult(rs, columnIndex); - } - - @Override - public E getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { - return typeHandler.getNullableResult(cs, columnIndex); - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/enums/IIntegerEnum.java b/docus-api-common/src/main/java/com/docus/server/common/enums/IIntegerEnum.java deleted file mode 100644 index be5e30e..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/enums/IIntegerEnum.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.docus.server.common.enums; - -import com.baomidou.mybatisplus.annotation.IEnum; - -import java.util.Objects; - -public interface IIntegerEnum extends IEnum { - - @Override - Integer getValue(); - - String getDisplay(); - - static T fromValue(Class enumType, Integer value) { - for (T object : enumType.getEnumConstants()) { - if (Objects.equals(value, object.getValue())) { - return object; - } - } - throw new IllegalArgumentException("No. enum value 。" + value + "of " + enumType.getCanonicalName()); - } - - static T fromDisplay(Class enumType, String display) { - for (T object : enumType.getEnumConstants()) { - if (Objects.equals(display, object.getDisplay())) { - return object; - } - } - throw new IllegalArgumentException("No. enum value 。" + display + "of " + enumType.getCanonicalName()); - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/enums/IntegerEnumHandler.java b/docus-api-common/src/main/java/com/docus/server/common/enums/IntegerEnumHandler.java deleted file mode 100644 index fac3bfe..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/enums/IntegerEnumHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.docus.server.common.enums; - -import org.apache.ibatis.type.BaseTypeHandler; -import org.apache.ibatis.type.JdbcType; - -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -//mybatis枚举类型转换 -public class IntegerEnumHandler extends BaseTypeHandler { - private final Class type; - - public IntegerEnumHandler(Class type) { - if (type == null) { - throw new IllegalArgumentException("Type argument. cannot. be nu11"); - } - this.type = type; - } - - @Override - public void setNonNullParameter(PreparedStatement ps, int i, E parameter, JdbcType jdbcType) throws SQLException { - if (jdbcType == null) { - ps.setInt(i, parameter.getValue()); - } else { - ps.setObject(i, parameter.getValue(), jdbcType.TYPE_CODE); //1 / see r3589 - } - } - - @Override - public E getNullableResult(ResultSet rs, String columnName) throws SQLException { - String s = rs.getString(columnName); - return s == null ? null : IIntegerEnum.fromValue(type, Integer.parseInt(s)); - } - - @Override - public E getNullableResult(ResultSet rs, int columnIndex) throws SQLException { - String s = rs.getString(columnIndex); - return s == null ? null : IIntegerEnum.fromValue(type, Integer.parseInt(s)); - } - - @Override - public E getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { - String s = cs.getString(columnIndex); - return s == null ? null : IIntegerEnum.fromValue(type, Integer.parseInt(s)); - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/service/IBaseService.java b/docus-api-common/src/main/java/com/docus/server/common/service/IBaseService.java deleted file mode 100644 index d15892b..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/service/IBaseService.java +++ /dev/null @@ -1,46 +0,0 @@ -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.service.impl.Sort; - -import java.io.Serializable; -import java.util.Collection; -import java.util.List; - -public interface IBaseService extends IService { - - T findById(Serializable id); - - List findByIds(Collection ids); - - List findBy(String propertyName, Object propertyValue); - - List findByList(String propertyName, Collection propertyValue); - - List findActiveBy(String propertyName, Object propertyValue); - - List findBy(String propertyName, Object propertyValue, Sort sort); - - List findActiveBy(String propertyName, Object propertyValue, Sort sort); - - T findOneBy(String propertyName, Object propertyValue); - - T findOneByList(String propertyName, Collection propertyValue); - - T findActiveOneBy(String propertyName, Object propertyValue); - - List find(LambdaQueryWrapper queryWrapper); - - T findOne(LambdaQueryWrapper queryWrapper); - - List findAll(); - - List findAllActive(); - - List findAll(Sort sort); - - List findAllActive(Sort sort); - - int deleteByIdList(List idList); -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java b/docus-api-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java deleted file mode 100644 index aabcd02..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.docus.server.common.service.impl; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -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 com.docus.server.common.service.IBaseService; - -import java.io.Serializable; -import java.lang.reflect.Field; -import java.util.*; - -public abstract class BaseServiceImpl, T> extends ServiceImpl implements IBaseService { - - @Override - public T findById(Serializable id) { - if (id == null) { - throw new RuntimeException("param id is required"); - } - return baseMapper.selectById(id); - } - - @Override - public List findByIds(Collection ids) { - if (ids == null || ids.size() == 0) { - return new ArrayList<>(); - } - return baseMapper.selectBatchIds(ids); - } - - /** - * 按字段查询，返回所有匹配的记录, eq - */ - @Override - public List findBy(String propertyName, Object propertyValue) { - String columnName = getColumnName(propertyName); - return baseMapper.selectList(new QueryWrapper().eq(columnName, propertyValue)); - } - - /** - * 按字段查询，返回所有匹配的记录, in - */ - @Override - public List findByList(String propertyName, Collection propertyValue) { - String columnName = getColumnName(propertyName); - return baseMapper.selectList(new QueryWrapper().in(!Objects.isNull(propertyValue), columnName, propertyValue)); - } - - @Override - public List findActiveBy(String propertyName, Object propertyValue) { - String columnName = getColumnName(propertyName); - QueryWrapper queryWrapper = new QueryWrapper().eq(columnName, propertyValue); - queryWrapper.ne("state", 1); - return baseMapper.selectList(queryWrapper); - } - - //返回所有匹配的记录并排序 - @Override - public List findBy(String propertyName, Object propertyValue, Sort sort) { - String columnName = getColumnName(propertyName); - QueryWrapper query = new QueryWrapper().eq(columnName, propertyValue); - buildSort(sort, query); - return baseMapper.selectList(query); - } - - /** - * 返回所有匹配的Active记录并排序 - */ - @Override - public List findActiveBy(String propertyName, Object propertyValue, Sort sort) { - String columnName = getColumnName(propertyName); - QueryWrapper query = new QueryWrapper().eq(columnName, propertyValue); - query.ne("state", 1); - buildSort(sort, query); - return baseMapper.selectList(query); - } - - @Override - public T findOneBy(String propertyName, Object propertyValue) { - String columnName = getColumnName(propertyName); - List list = baseMapper.selectList(new QueryWrapper().eq(columnName, propertyValue)); - return (list == null || list.size() == 0) ? null : list.get(0); - } - - @Override - public T findOneByList(String propertyName, Collection propertyValue) { - String columnName = getColumnName(propertyName); - List list = baseMapper.selectList(new QueryWrapper().eq(!Objects.isNull(propertyValue), columnName, propertyValue)); - return (list == null || list.size() == 0) ? null : list.get(0); - } - - //按字段查询，返回第一条Active 记录 - @Override - public T findActiveOneBy(String propertyName, Object propertyValue) { - String columnName = getColumnName(propertyName); - QueryWrapper queryWrapper = new QueryWrapper().eq(columnName, propertyValue); - queryWrapper.ne("state", 1); - List list = baseMapper.selectList(queryWrapper); - return (list == null || list.size() == 0) ? null : list.get(0); - } - - //* L ambda方式自由组合查询条件 - @Override - public List find(LambdaQueryWrapper queryWrapper) { - return baseMapper.selectList(queryWrapper); - } - - //L ambda方式自由组合查询条件，返回第一条记录 - @Override - public T findOne(LambdaQueryWrapper queryWrapper) { - List list = baseMapper.selectList(queryWrapper); - return (list == null || list.size() == 0) ? null : list.get(0); - } - - //返回表所有记录 - @Override - public List findAll() { - return baseMapper.selectList(null); - } - - //返回表所有Active的记录 - @Override - public List findAllActive() { - return baseMapper.selectList(Wrappers.query().ne("state", 1)); - } - - //返回表所有记录并排序 - @Override - public List findAll(Sort sort) { - QueryWrapper query = new QueryWrapper(); - buildSort(sort, query); - return baseMapper.selectList(query); - } - - //返回表所有Active记录并排序 - @Override - public List findAllActive(Sort sort) { - QueryWrapper query = new QueryWrapper(); - query.ne("state", 1); - buildSort(sort, query); - return baseMapper.selectList(query); - } - - //组装排序语句 - private void buildSort(Sort sort, QueryWrapper query) { - if (sort != null) { - List sortList = sort.getSortList(); - - for (Sort.SortItem sortItem : sortList) { - if (sortItem.getDirection() == Sort.Direction.ASC) { - query.orderByAsc(getColumnName(sortItem.getProperty())); - } else { - query.orderByDesc(getColumnName(sortItem.getProperty())); - } - } - } - } - - @Override - public int deleteByIdList(List idList) { - if (idList == null || idList.size() == 0) { - return 0; - } - return baseMapper.deleteBatchIds(idList); - } - - - //通过实体属性获取对应的数据库字段名 - public String getColumnName(String propertyName) { - Map fieldMap = ReflectionKit.getFieldMap(getEntityClass()); - if (fieldMap != null) { - Field field = fieldMap.get(propertyName); - - if (field != null) { - TableField annotation = field.getAnnotation(TableField.class); - if (annotation != null) { - return annotation.value(); - } - TableId idAnnotation = field.getAnnotation(TableId.class); - if (idAnnotation != null) { - return idAnnotation.value(); - } - } - } - throw new RuntimeException("获取不到属性" + propertyName + "的列名"); - } - -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/service/impl/Sort.java b/docus-api-common/src/main/java/com/docus/server/common/service/impl/Sort.java deleted file mode 100644 index 86afad9..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/service/impl/Sort.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.docus.server.common.service.impl; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -//排序定义 -public class Sort { - private List sortByProperties = new ArrayList<>(); - - // 隐藏构造函数 - private Sort() { - } - - public static Sort byAsc(String property) { - return new Sort().thenByAsc(property); - } - - public static Sort byDesc(String property) { - return new Sort().thenByDesc(property); - } - - public Sort thenByAsc(String property) { - sortByProperties.add(new SortItem(property, Direction.ASC)); - - return this; - } - - public Sort thenByDesc(String property) { - sortByProperties.add(new SortItem(property, Direction.DESC)); - return this; - } - - - public List getSortList() { - //复制、只读 - List copyList = new ArrayList<>(sortByProperties); - return Collections.unmodifiableList(copyList); - } - - public class SortItem { - private String property; - private Direction direction; - - private SortItem(String property, Direction direction) { - this.property = property; - this.direction = direction; - } - - public String getProperty() { - return property; - } - - public Direction getDirection() { - return direction; - } - } - - public enum Direction { - ASC, DESC; - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/util/MapObjUtil.java b/docus-api-common/src/main/java/com/docus/server/common/util/MapObjUtil.java deleted file mode 100644 index 79bbaac..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/util/MapObjUtil.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.docus.server.common.util; - -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ArrayUtils; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -@Slf4j -public class MapObjUtil { - /** - * 实体对象转成Map - * - * @param obj 实体对象 - * @return - */ - public static Map object2Map(Object obj) { - Map map = new HashMap(); - if (obj == null) { - return map; - } - Class clazz = obj.getClass(); - Field[] fields = clazz.getDeclaredFields(); - try { - for (Field field : fields) { - field.setAccessible(true); - map.put(field.getName(), field.get(obj)); - } - } catch (Exception e) { - log.error(e.getMessage()); - } - return map; - } - - /** - * Map转成实体对象 - * - * @param map map实体对象包含属性 - * @param clazz 实体对象类型 - * @return - */ - public static T map2Object(Map map, Class clazz) { - if (map == null) { - return null; - } - T obj = null; - try { - obj = clazz.newInstance(); - - Field[] fields = obj.getClass().getDeclaredFields(); - for (Field field : fields) { - int mod = field.getModifiers(); - if (Modifier.isStatic(mod) || Modifier.isFinal(mod)) { - continue; - } - field.setAccessible(true); - String filedTypeName = field.getType().getName(); - String fieldName =field.getName().toLowerCase(); - if (filedTypeName.equalsIgnoreCase("java.util.date")) { - if (map.containsKey(field.getName().toLowerCase())) { - String datetimestamp = String.valueOf(map.get(fieldName)); - - if (datetimestamp.equalsIgnoreCase("null")) { - field.set(obj, null); - } else { - field.set(obj, new Date(Long.parseLong(datetimestamp))); - } - } - } - else { - if (map.containsKey(field.getName().toLowerCase())&& (!String.valueOf(map.get(fieldName)).equals("null")) ) { - field.set(obj, map.get(fieldName)); - } - } - } - } catch (Exception e) { - log.error(e.getMessage()); - } - return obj; - } - - /** - * Map转成实体对象，map带下划线 - * @param map map实体对象包含属性 - * @param beanClass 实体对象类型 - * @param - * @return - */ - public static T map2ObjectUnderlined(Map map, Class beanClass) { - if (map == null) { - return null; - } - Map data=toReplaceKeyLow(map); - return map2Object(data,beanClass); - } - - - private static String underlineToCamel2(String param){ - param = param.toLowerCase();//此处为全部转小写，方便根据_判定后一位转驼峰 - if (param==null||"".equals(param.trim())){ - return ""; - } - //使用正则表达式 - StringBuilder sb=new StringBuilder(param); - Matcher mc= Pattern.compile("_").matcher(param); - int i=0; - while (mc.find()){ - int position=mc.end()-(i++); - //String.valueOf(Character.toUpperCase(sb.charAt(position))); - sb.replace(position-1,position+1,sb.substring(position,position+1).toUpperCase()); - } - return sb.toString(); - } - - /** - * map转化，将map key下划线去掉 - * @param map 原map - * @return - */ - private static Map toReplaceKeyLow(Map map) { - Map re_map = new HashMap(); - if(re_map != null) { -// Iterator var2 = map.entrySet().iterator(); - for (Map.Entry entry : map.entrySet()) { - re_map.put(underlineToCamel2(entry.getKey().trim()), entry.getValue()); - } -// while(var2.hasNext()) { -// Entry entry = (Entry)var2.next(); -// re_map.put(underlineToCamel2((String)entry.getKey()), map.get(entry.getKey())); -// } - - map.clear(); - } - - return re_map; - } - - - /** - * Map中根据key批量删除键值对 - * @param map - * @param excludeKeys - * @param - * @param - * @return - */ - public static Map removeEntries(Map map, K[] excludeKeys) { - Iterator iterator = map.keySet().iterator(); - while (iterator.hasNext()) { - K k = iterator.next(); - // 如果k刚好在要排除的key的范围中 - if (ArrayUtils.contains(excludeKeys, k)) { - iterator.remove(); - map.remove(k); - } - } - return map; - } - -} - diff --git a/docus-api-common/src/main/java/com/docus/server/common/util/ParamsUtils.java b/docus-api-common/src/main/java/com/docus/server/common/util/ParamsUtils.java deleted file mode 100644 index c6213f0..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/util/ParamsUtils.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.docus.server.common.util; - -import java.util.HashMap; -import java.util.Map; - -public final class ParamsUtils { - - public static Param addParam(String key, Object obj) { - return new Param(key, obj); - } - - public Map param(String key, Object obj) { - return new Param(key, obj).param(); - } - - public static final class Param { - - private Map params = new HashMap(); - - - public Param(String key, Object value) { - addParam(key, value); - } - - public Param addParam(String key, Object value) { - this.params.put(key, value); - return this; - } - - public Map param() { - return this.params; - } - } -} diff --git a/docus-api-common/src/main/java/com/docus/server/common/util/SpringUtils.java b/docus-api-common/src/main/java/com/docus/server/common/util/SpringUtils.java deleted file mode 100644 index 538203a..0000000 --- a/docus-api-common/src/main/java/com/docus/server/common/util/SpringUtils.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.docus.server.common.util; - -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.AutowireCapableBeanFactory; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.SingletonBeanRegistry; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.beans.factory.support.GenericBeanDefinition; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.context.annotation.Configuration; -import org.springframework.util.ReflectionUtils; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * @author linruifeng - */ -@Configuration -public class SpringUtils implements ApplicationContextAware { - - /** - * Spring容器 spring应用上下文对象 - */ - private static ApplicationContext applicationContext; - - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - SpringUtils.applicationContext = applicationContext; - } - - /** - * bean名称 - * - * @param name 要查询的bean的名称 - * @return true：包含 - */ - public static boolean containsBean(String name) { - return applicationContext.containsBean(name); - } - - /** - * 通过对象名称获取spring bean对象 - * - * @param name bean的名称 - * @return 对象 - */ - public static Object getBean(String name) throws BeansException { - return applicationContext.getBean(name); - } - - /** - * 返回与给定对象类型唯一匹配的bean实例(如果有) - * - * @param requiredType bean 必须匹配的类型； 可以是接口或超 - * @return 匹配所需类型的单个 bean 的实例 - */ - public static T getBean(Class requiredType) throws BeansException { - return applicationContext.getBean(requiredType); - } - - /** - * 返回与给定对象类型（包括子类）匹配的 bean 实例 - * - * @param type 要匹配的类或接口 - * @return Map - */ - public static Map getBeansOfType(Class type) throws BeansException { - return applicationContext.getBeansOfType(type); - } - - public static T getBean(String beanName, Class beanClass) { - return applicationContext.getBean(beanName, beanClass); - } - - public static T createBean(Class beanClass) { - return applicationContext.getAutowireCapableBeanFactory().createBean(beanClass); - } - - - public static List getBeans(Class beanClass) { - return new ArrayList<>(applicationContext.getBeansOfType(beanClass).values()); - } - - @SuppressWarnings("unchecked") - public static T initializeBean(T bean) { - AutowireCapableBeanFactory beanFactory = applicationContext.getAutowireCapableBeanFactory(); - beanFactory.autowireBean(bean); - return (T) beanFactory.initializeBean(bean, bean.getClass().getName()); - } - - public static void registerSingletonBean(String beanName, Class beanClass) { - GenericBeanDefinition definition = new GenericBeanDefinition(); - definition.setBeanClass(beanClass); - definition.setScope(BeanDefinition.SCOPE_SINGLETON); - BeanDefinitionRegistry registry = (BeanDefinitionRegistry) applicationContext.getAutowireCapableBeanFactory(); - registry.registerBeanDefinition(beanName, definition); - } - - public static void registerSingletonBean(String beanName, Object bean) { - SingletonBeanRegistry registry = (SingletonBeanRegistry) applicationContext.getAutowireCapableBeanFactory(); - registry.registerSingleton(beanName, bean); - } - - public static Object invokeMethod(Class requiredType, String methodName, Object[] params) { - Object service = getBean(requiredType); - Class[] paramClass = null; - if (params != null) { - int paramsLength = params.length; - paramClass = new Class[paramsLength]; - for (int i = 0; i < paramsLength; i++) { - paramClass[i] = params[i].getClass(); - } - } - // 找到方法 - Method method = ReflectionUtils.findMethod(service.getClass(), methodName, paramClass); - // 执行方法 - return ReflectionUtils.invokeMethod(method, service, params); - } - - /** - * 根据bean名称、方法名反射调用spring bean中的方法 - * - * @param serviceName 服务名 - * @param methodName 方法名 - * @param params 参数 - * @return 对象 - */ - public static Object invokeMethod(String serviceName, String methodName, Object[] params) { - Object service = getBean(serviceName); - Class[] paramClass = null; - if (params != null) { - int paramsLength = params.length; - paramClass = new Class[paramsLength]; - for (int i = 0; i < paramsLength; i++) { - paramClass[i] = params[i].getClass(); - } - } - // 找到方法 - Method method = ReflectionUtils.findMethod(service.getClass(), methodName, paramClass); - // 执行方法 - return ReflectionUtils.invokeMethod(method, service, params); - } -} diff --git a/docus-api-common/src/main/resources/application.properties b/docus-api-common/src/main/resources/application.properties new file mode 100644 index 0000000..e69de29 diff --git a/docus-archivefile/pom.xml b/docus-archivefile/pom.xml deleted file mode 100644 index 6887415..0000000 --- a/docus-archivefile/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - docus-archivefile - Archetype - docus-archivefile - http://maven.apache.org - - - - com.docus - docus-api-common - 1.0-SNAPSHOT - compile - - - - - - - src/main/java - - **/*.xml - - - - src/main/resources - - - - diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/RecordExceptionEnum.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/RecordExceptionEnum.java deleted file mode 100644 index 2b98c78..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/RecordExceptionEnum.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.docus.server.record; - -import com.docus.infrastructure.core.exception.IErrorCode; - -public enum RecordExceptionEnum implements IErrorCode { - - /** - * 备份实例不存在 - */ - NOT_NULL("1001", "参数不能为空！"), - ; - - - private String msgCode; - private String msg; - - - /** - * 模块业务码,例如微信是 WX，每个模块独立标识 - */ - private String moduleCode = "MR"; - - - RecordExceptionEnum(String msgCode, String msg) { - this.msgCode = msgCode; - this.msg = msg; - } - - - @Override - public String getCode() { - return moduleCode + this.msgCode; - } - - @Override - public String getMessage() { - return msg; - } - -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/Package.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/Package.java deleted file mode 100644 index 65a1b37..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/Package.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.record.controller; - -public class Package { - -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/param/Package.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/param/Package.java deleted file mode 100644 index aceed35..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/param/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.record.controller.param; - -public class Package { -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/vo/Package.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/vo/Package.java deleted file mode 100644 index 0b5b3fd..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/vo/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.record.controller.vo; - -public class Package { -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectSysDictionaryMapper.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectSysDictionaryMapper.java deleted file mode 100644 index 7d1f1f6..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectSysDictionaryMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.docus.server.archivefile.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface AfCollectSysDictionaryMapper extends BaseMapper { -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectTaskMapper.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectTaskMapper.java deleted file mode 100644 index 5cd744f..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfCollectTaskMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.docus.server.archivefile.mapper; - -import com.docus.server.archivefile.pojo.entity.AfCollectTask; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * 任务采集表mapper - * - * @author wyb - */ -@Mapper -public interface AfCollectTaskMapper { - - - /** - * 保存任务 - * - * @param afCollectTask 采集任务 - * @return 数据库操作结果 - */ - int saveTask(@Param("task") AfCollectTask afCollectTask); - - /** - * 根据任务主键查询任务 - * - * @param taskId 任务主键 - * @return 任务信息 - */ - AfCollectTask getTaskById(@Param("id") Long taskId); -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfJobTimeMapper.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfJobTimeMapper.java deleted file mode 100644 index eb418e1..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfJobTimeMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.docus.server.archivefile.mapper; - -import com.docus.server.archivefile.pojo.entity.AfJobTime; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - - -/** - * job 记录时间 - * @author wyb - */ -@Mapper -public interface AfJobTimeMapper { - /** - * 根据任务类型查询任务时间记录 - * @param jobType 任务类型 - * @return 任务时间记录 - */ - AfJobTime getAfJobTimeByJobType(@Param("jobType") String jobType); - - /** - * 插入job时间参数 - * @param afJobTime job时间参数 - * @return 数据库操作结果 - */ - int insert(@Param("afJobTime") AfJobTime afJobTime); - - /** - * 修改job时间 - * @param afJobTime job时间 - * @return 数据库操作结果 - */ - int updateById(@Param("afJobTime") AfJobTime afJobTime); -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfReportRecordMapper.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfReportRecordMapper.java deleted file mode 100644 index 2b1b3a3..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfReportRecordMapper.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.docus.server.archivefile.mapper; - -import com.docus.server.archivefile.pojo.entity.AfReportRecord; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 上报记录保存表 - * - * @author wyb - */ -@Mapper -public interface AfReportRecordMapper { - /** - * 保存报告推送记录 - * - * @param afReportRecord 报告推送记录 - * @return 数据库操作结果 - */ - int saveRecord(@Param("reportRecord") AfReportRecord afReportRecord); - - /** - * 根据文件唯一号 住院号 住院次数 系统标识 得到唯一推送记录 - * - * @param serialnum 报告唯一号 - * @param inpatientNo 住院号 - * @param admisstimes 住院次数 - * @param sysFlag 系统标识 - * @return 报告推送记录 - */ - AfReportRecord getRecordBySerialnumAndInpatientNoAndSysFlag(@Param("serialnum") String serialnum, @Param("inpatientNo") String inpatientNo, @Param("admisstimes") Integer admisstimes, @Param("sysFlag") String sysFlag); - - /** - * 更新报告推送 主要更新 下载地址，下载类型，文件名称 - * - * @param afReportRecord 报告推送记录 - * @return 数据库操作结果 - */ - int updateRecordByTaskId(@Param("reportRecord") AfReportRecord afReportRecord); - - /** - * 更新记录的状态 - * - * @param taskId 任务id - * @return 数据库操作结果 - */ - int updateStateByTaskId(@Param("taskId") Long taskId); - - AfReportRecord getReportRecordInfoByTaskId(@Param("taskId") Long taskId); - - /** - * 根据任务id查询有patientId数据的任务id - * - * @param taskIds 任务id集合 - * @return 数据有patientId的任务id集合 - */ - List getHasPatientIdTaskIdsByTaskIds(@Param("taskIds") List taskIds); - - /** - * 获取未开始的报告记录 - * - * @param page 分页页码 - * @param pageSize 一页条数 - * @return 未开始的报告记录 - */ - List getStartStateReportRecord(@Param("page") int page, @Param("pageSize") int pageSize); - - /** - * 根据任务id更新病案主键 - * - * @param patientId 病案主键 - * @param taskId 任务id - * @return 数据库操作结果 - */ - int updateReportRecordPatientId(@Param("patientId") String patientId, @Param("taskId") Long taskId); -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfViewCollectionLogMapper.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfViewCollectionLogMapper.java deleted file mode 100644 index 47f74b7..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/mapper/AfViewCollectionLogMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.docus.server.archivefile.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author linrf - * @date 2023/6/13 17:05 - */ -@Mapper -public interface AfViewCollectionLogMapper extends BaseMapper { - - -} 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 deleted file mode 100644 index df082a0..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/IdType.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.record.common.pojo.dto; - -public enum IdType { - /** - * 记账号 - */ - JZH, - - /** - * 病案号 - */ - INPATIENT_NO -} 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 deleted file mode 100644 index 448258b..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/InpatientNo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.docus.server.record.common.pojo.dto; - -import com.docus.infrastructure.core.exception.BaseException; -import com.docus.server.record.RecordExceptionEnum; - -/** - * 住院号 - */ -public class InpatientNo { - - - private String inpatientNo; - - public InpatientNo(String inpatientNo) { - this.inpatientNo = inpatientNo; - this.vaid(); - } - - - public void vaid() { - if (inpatientNo == null) { - throw new BaseException(RecordExceptionEnum.NOT_NULL, "inpatientNo不能为空"); - } - } - - - public static InpatientNo of(String inpatientNo) { - return new InpatientNo(inpatientNo); - } -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDTO.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDTO.java deleted file mode 100644 index f819cb6..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDTO.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.docus.server.archivefile.pojo.dto; - -import lombok.Data; - -import java.util.Map; - -/** - * 报告推送信息 - */ -@Data -public class ReportDTO { - /** - * 住院号 - */ - private String inpatientNo; - /** - * 记账号/住院流水号 - */ - private String jzh; - /** - * 住院次数 - */ - private Integer admisstimes; - /** - * 采集来源系统 - */ - private String sysFlag; - /** - * 下载地址 - */ - private String downUrl; - /** - * 文件名 - */ - private String fileTitle; - /** - * 采集流水号/文件唯一id - */ - private String serialnum; - - /** - * 文件分类id - */ - private String assortId; - - /** - * 采集类型(文件来源 1:采集器；2：扫描生产软件) - */ - private String fileSource; - - /** - * 文件保存位置类型 1:服务器本地；2：ftp服务器；3：共享文件夹 - */ - private String filestoragetype; - - /** - * 下载对应任务id ,接收处理 - */ - private Long taskId; - - /** - * 业务病案主键 - */ - private String patientId; - - /** - * 下载路径类型 1:url，2:base64，3:url base64，4:共享文件，5：本地文件base64 - */ - private Integer downtype = 1; - - /** - * 拓展参数 - */ - private Map params; -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownDTO.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownDTO.java deleted file mode 100644 index d56634c..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.docus.server.archivefile.pojo.dto; - - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@Data -public class ReportDownDTO { - @ApiModelProperty(value = "采集器id") - private String collectorid; - - @ApiModelProperty(value = "采集器ip") - private String ip; - - @ApiModelProperty(value = "分类id") - private String assortid; - - @ApiModelProperty(value = "患者信息") - private ReportDownPatientDTO patient; - - @ApiModelProperty(value = "文件信息") - private List scanfiles; - - @ApiModelProperty(value = "扫描用户代码") - private String scanusercode; - @ApiModelProperty(value = "扫描用户名称") - private String scanusername; -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownPatientDTO.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownPatientDTO.java deleted file mode 100644 index de67e18..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownPatientDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.docus.server.archivefile.pojo.dto; - -import com.docus.server.archivefile.pojo.entity.AfReportRecord; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ReportDownPatientDTO { - @ApiModelProperty(value = "记帐号") - private String jzh; - @ApiModelProperty(value = "住院次数,记帐号重复则加这个参数，无则Null") - private Integer admisstimes; - @ApiModelProperty(value = "病案主键，如有传则使用，无则使用jzh") - private String patientid; - @ApiModelProperty(value = "病案号") - private String inpatientno; - - @ApiModelProperty(value = "物理存储位置，有则传") - private String storagelocation; - - public ReportDownPatientDTO(AfReportRecord reportRecord) { - this.patientid = reportRecord.getPatientId(); - this.jzh = reportRecord.getJzh(); - this.admisstimes = reportRecord.getAdmissTimes(); - this.inpatientno = reportRecord.getInpatientNo(); - } - - public ReportDownPatientDTO(ReportDTO reportDTO) { - this.patientid = reportDTO.getPatientId(); - this.jzh = reportDTO.getJzh(); - this.admisstimes = reportDTO.getAdmisstimes(); - this.inpatientno = reportDTO.getInpatientNo(); - } -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownScanFileDTO.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownScanFileDTO.java deleted file mode 100644 index 57806e3..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownScanFileDTO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.docus.server.archivefile.pojo.dto; - -import com.docus.server.archivefile.pojo.entity.AfReportRecord; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ReportDownScanFileDTO { - @ApiModelProperty(value = "任务id(如无效任务id，则不更新任务表数据)") - private Long taskid; - @ApiModelProperty(value = "文件标题") - private String filetitle; - @ApiModelProperty(value = "采集类型(文件来源 1:采集器；2：扫描生产软件)") - private int filesource; - @ApiModelProperty(value = "下载类型(1:服务器本地；2：ftp服务器；3：共享文件夹)") - private int filestoragetype; - @ApiModelProperty(value = "文件类型(1:url,2:base64,3:url base64,4:共享文件，5：本地文件base64)") - private int filetype = 1; - @ApiModelProperty(value = "下载地址") - private String downurl; - // @ApiModelProperty(value = "档案信息") -// private String recordid; - @ApiModelProperty(value = "采集流水号") - private String serialnum; - - @ApiModelProperty(value = "排序日期") - private String sortdate; - - @ApiModelProperty(value = "是否作废 ： 0：否 不作废，1：是 作废") - private int cancel = 0; - - public ReportDownScanFileDTO(AfReportRecord reportRecord) { - this.taskid = reportRecord.getTaskId(); - this.filetitle = reportRecord.getFileName(); - this.filesource = 1; - this.filestoragetype = 1; - this.filetype = reportRecord.getDownType(); - this.downurl = reportRecord.getDownUrl(); - this.serialnum = reportRecord.getSerialnum(); - } - - public ReportDownScanFileDTO(ReportDTO reportDto) { - this.taskid = reportDto.getTaskId(); - this.filetitle = reportDto.getFileTitle(); - this.filesource = 1; - this.filestoragetype = 1; - this.filetype = reportDto.getDowntype(); - this.downurl = reportDto.getDownUrl(); - this.serialnum = reportDto.getSerialnum(); - } -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/TBasicDTO.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/TBasicDTO.java deleted file mode 100644 index 0dd4855..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/TBasicDTO.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.docus.server.archivefile.pojo.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Map; - -/** - * @BelongsProject: docus-webservice-sdry - * @BelongsPackage: com.docus.server.collection.webservice - * @Author: chierhao - * @CreateTime: 2023-02-25 14:44 - * @Description: TODO - * @Version: 1.0 - */ -@Data -public class TBasicDTO { - // ---------------------- TBasicDTO info ---------------------- - @ApiModelProperty(value = "记账号") - private String jzh; - @ApiModelProperty(value = "病案号") - private String inpatientNo; - @ApiModelProperty(value = "住院次数") - private String admissTimes; - @ApiModelProperty(value = "患者姓名") - private String name; - @ApiModelProperty(value = "住院日期") - private String admissDate; - @ApiModelProperty(value = "出院日期") - private String disDate; - @ApiModelProperty(value = "住院科室名称") - private String admissDeptName; - @ApiModelProperty(value = "出院科室名称") - private String disDeptName; - @ApiModelProperty(value = "主管医生") - private String attending; - @ApiModelProperty(value = "主管医生名称") - private String attendingName; - @ApiModelProperty(value = "责任护士") - private String dutyNurse; - @ApiModelProperty(value = "住院科室") - private String admissDept; - @ApiModelProperty(value = "年龄_岁") - private String age; - @ApiModelProperty(value = "性别") - private String sex; - @ApiModelProperty(value = "身份证") - private String idCard; - @ApiModelProperty(value = "出院科室") - private String disDept; - @ApiModelProperty(value = "性别名称") - private String sexName; - @ApiModelProperty(value = "床位号") - private String bedNum; - @ApiModelProperty(value = "是否死亡") - private String isDead; - @ApiModelProperty(value = "实际住院天数") - private String admissDays; - // ---------------------- xml info ---------------------- - private String serialId; - private String receive; - private String send; - // ---------------------- sdry info ---------------------- - private String wardCode; - private String wardName; - private String sdryIndex; - - /** - * 拓展参数 - */ - private Map params; -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfCollectTask.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfCollectTask.java deleted file mode 100644 index 410604b..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfCollectTask.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.docus.server.archivefile.pojo.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * 病案采集任务 - *

- * - * @author 曾文和 - * @since 2021-05-07 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AfCollectTask对象", description = "病案采集任务") -public class AfCollectTask implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "id 主键") - @TableId(value = "id", type = IdType.INPUT) - private Long id; - - @ApiModelProperty(value = "病案主键") - private String patientId; - - @ApiModelProperty(value = "来源 1护理文书，2 电子病历，3 Pacs检查，4心电图，5手麻系统，6 Lis检验，7病案首页，8长临医嘱") - private String sysflag; - - @ApiModelProperty(value = "开始时间") - private Date startTime; - - @ApiModelProperty(value = "结束时间") - private Date endTime; - - @ApiModelProperty(value = "任务耗时(毫秒)") - private Long consumingTime; - - @ApiModelProperty(value = "-1 等待采集，0：未开始，1:正在采集，2：采集错误，3采集完成") - private String state; - - @ApiModelProperty(value = "同步时间") - private Date syncTime; - - @ApiModelProperty(value = "最新重新采集时间") - private Date recollectTime; - - @ApiModelProperty(value = "最新重新采集人") - private String recollectName; - - @ApiModelProperty(value = "备注") - private String remark; - - @ApiModelProperty(value = "报告唯一单号") - private String C1; - - @ApiModelProperty(value = "c2") - private String C2; - - @ApiModelProperty(value = "记账号") - private String C3; - - @ApiModelProperty(value = "c4") - private String C4; - - @ApiModelProperty(value = "c6") - private String C6; - - @ApiModelProperty(value = "c9") - private String C9; -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfJobTime.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfJobTime.java deleted file mode 100644 index bac4d5d..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfJobTime.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.docus.server.archivefile.pojo.entity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; - -/** - *

- * - *

- * - * @author 曾文和 - * @since 2021-05-08 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="AfJobTime对象", description="") -public class AfJobTime implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - private Long id; - - @ApiModelProperty(value = "最新刷新时间 格式 yyyy-MM-dd HH:mm:ss") - private String updateTime; - - @ApiModelProperty(value = "调度类型。") - private String jobType; - - public AfJobTime() { - } - - public AfJobTime(Long id, String updateTime, String jobType) { - this.id = id; - this.updateTime = updateTime; - this.jobType = jobType; - } -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfReportRecord.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfReportRecord.java deleted file mode 100644 index 14143fd..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfReportRecord.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.docus.server.archivefile.pojo.entity; - -import com.docus.server.archivefile.pojo.dto.ReportDTO; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 上报记录保存表 - */ -@Data -public class AfReportRecord implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * af_collect_task 主键id - */ - private Long taskId; - - /** - * 住院号 - */ - private String inpatientNo; - - /** - * 住院流水号，记账号 - */ - private String jzh; - - /** - * 住院次数 - */ - private Integer admissTimes; - - /** - * 下载地址，多个使用 | 分隔 - */ - private String downUrl; - - /** - * 下载路径类型 1:url，2:base64，3:url base64，4:共享文件，5：本地文件base64 - */ - private Integer downType; - - /** - * 状态 0 未开始，可用于补偿，1 已发送下载 - */ - private Integer state; - - /** - * 报告唯一id - */ - private String serialnum; - - /** - * 报告来源 采集器标识 - */ - private String sysflag; - - /** - * 报告所属文件分段id - */ - private String zdAssortId; - - /** - * 记录创建时间 - */ - private Date createTime; - - /** - * 记录更新时间 - */ - private Date updateTime; - - /** - * 报告名称 - */ - private String fileName; - - /** - * 病案主键 - */ - private String patientId; - - - public AfReportRecord() { - } - - public AfReportRecord(ReportDTO reportDTO) { - this.jzh = reportDTO.getJzh(); - this.admissTimes = reportDTO.getAdmisstimes(); - this.inpatientNo = reportDTO.getInpatientNo(); - this.downUrl = reportDTO.getDownUrl(); - this.sysflag = reportDTO.getSysFlag(); - this.zdAssortId = reportDTO.getAssortId(); - this.serialnum = reportDTO.getSerialnum(); - this.fileName = reportDTO.getFileTitle(); - this.downType = reportDTO.getDowntype(); - } -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfViewCollectionLog.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfViewCollectionLog.java deleted file mode 100644 index 8d33878..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfViewCollectionLog.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.docus.server.archivefile.pojo.entity; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author zengdl - * @website https://el-admin.vip - * @description / - * @date 2022-03-28 - **/ -@Data -@TableName("af_view_collection_log") -public class AfViewCollectionLog implements Serializable { - - @TableId("id") - @ApiModelProperty(value = "id") - private Long id; - - @TableField("jzh") - @ApiModelProperty(value = "记帐号") - private String jzh; - - @TableField("sys_code") - @ApiModelProperty(value = "采集器分类") - private String sysCode; - - @TableField("file_id") - @ApiModelProperty(value = "文件id") - private String fileId; - - @TableField("file_modify_time") - @ApiModelProperty(value = "文件最后修改时间") - private String fileModifyTime; - - @TableField("create_time") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - public void copy(AfViewCollectionLog source) { - BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); - } -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/CollectsysDictionary.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/CollectsysDictionary.java deleted file mode 100644 index 2c1ac13..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/CollectsysDictionary.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.docus.server.archivefile.pojo.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * @author zengdl - * @website https://el-admin.vip - * @description / - * @date 2022-09-02 - **/ -@Data -@TableName("af_collectsys_dictionary") -public class CollectsysDictionary implements Serializable { - - @TableId("id") - @ApiModelProperty(value = "id 雪花算法") - private Long id; - - @TableField("sys_code") - @ApiModelProperty(value = "采集来源系统编号") - private String sysCode; - - @TableField("sys_name") - @ApiModelProperty(value = "采集来源系统名称") - private String sysName; - -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionary.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionary.java deleted file mode 100644 index 4e66ceb..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionary.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.docus.server.archivefile.service; - -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; -import com.docus.server.common.service.IBaseService; - -public interface IAfCollectSysDictionary extends IBaseService { -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java deleted file mode 100644 index a0eda9d..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.archivefile.service; - -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; -import com.docus.server.common.service.IBaseService; - -/** - * @author linrf - * @date 2023/6/13 17:05 - */ -public interface IAfViewCollectionLogService extends IBaseService { -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java deleted file mode 100644 index 0b7be2f..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.docus.server.archivefile.service.impl; - -import com.docus.server.archivefile.mapper.AfCollectSysDictionaryMapper; -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; -import com.docus.server.archivefile.service.IAfCollectSysDictionary; -import com.docus.server.common.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -@Service -public class AfCollectSysDictionaryImpl - extends BaseServiceImpl implements IAfCollectSysDictionary { -} diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java deleted file mode 100644 index 01f9786..0000000 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.docus.server.archivefile.service.impl; - -import com.docus.server.archivefile.mapper.AfViewCollectionLogMapper; -import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; -import com.docus.server.archivefile.service.IAfViewCollectionLogService; -import com.docus.server.common.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author linrf - * @date 2023/6/13 17:06 - */ -@Service -public class AfViewCollectionLogServiceImpl - extends BaseServiceImpl implements IAfViewCollectionLogService { - - -} diff --git a/docus-archivefile/src/main/resources/mapper/AfCollectTaskMapper.xml b/docus-archivefile/src/main/resources/mapper/AfCollectTaskMapper.xml deleted file mode 100644 index 7356aa5..0000000 --- a/docus-archivefile/src/main/resources/mapper/AfCollectTaskMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - INSERT INTO `docus_archivefile`.`af_collect_task`(`id`, `patient_id`, `sysflag`, - `state`, `C1`,`C2`, `C3`) - VALUES (#{task.id}, #{task.patientId}, #{task.sysflag}, '0', #{task.C1}, #{task.C2}, #{task.C3}); - - - - diff --git a/docus-archivefile/src/main/resources/mapper/AfJobTimeMapper.xml b/docus-archivefile/src/main/resources/mapper/AfJobTimeMapper.xml deleted file mode 100644 index 44b99fc..0000000 --- a/docus-archivefile/src/main/resources/mapper/AfJobTimeMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - INSERT INTO `docus_archivefile`.`af_job_time`(`id`, `update_time`, `job_type`) - VALUES (#{afJobTime.id}, #{afJobTime.updateTime}, #{afJobTime.jobType}); - - - - UPDATE `docus_archivefile`.`af_job_time` - SET `update_time` = #{afJobTime.updateTime}, - WHERE `id` = #{afJobTime.id}; - - - - diff --git a/docus-archivefile/src/main/resources/mapper/AfReportRecordMapper.xml b/docus-archivefile/src/main/resources/mapper/AfReportRecordMapper.xml deleted file mode 100644 index da2483d..0000000 --- a/docus-archivefile/src/main/resources/mapper/AfReportRecordMapper.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - INSERT INTO `docus_archivefile`.`af_report_record`(`task_id`, `inpatient_no`, `jzh`, `admiss_times`, `down_url`, - `down_type`, `state`, `serialnum`, `sysflag`, `zd_assort_id`, - `create_time`, `update_time`, `file_name`, `patient_id`) - VALUES (#{reportRecord.taskId}, #{reportRecord.inpatientNo}, #{reportRecord.jzh}, #{reportRecord.admissTimes}, - #{reportRecord.downUrl}, #{reportRecord.downType}, 0, #{reportRecord.serialnum}, - #{reportRecord.sysflag}, #{reportRecord.zdAssortId}, now(), now(), #{reportRecord.fileName}, - #{reportRecord.patientId}); - - - update `docus_archivefile`.`af_report_record` - set `down_url`=#{reportRecord.downUrl}, - `down_type`=#{reportRecord.downType}, - `state`=0, - `file_name`=#{reportRecord.fileName}, - `patient_id`=#{reportRecord.patientId}, - `update_time`=now() - where `task_id` = #{reportRecord.taskId} - - - update `docus_archivefile`.`af_report_record` - set `state`= 1, - `update_time`=now() - where `task_id` = #{taskId} - - - update `docus_archivefile`.`af_report_record` - set `patient_id`= #{patientId} - where `task_id` = #{taskId} - - - - - - diff --git a/docus-client-interface/src/main/java/com/docus/server/client/api/IHospitalApi.java b/docus-client-interface/src/main/java/com/docus/server/api/IHospitalApi.java similarity index 96% rename from docus-client-interface/src/main/java/com/docus/server/client/api/IHospitalApi.java rename to docus-client-interface/src/main/java/com/docus/server/api/IHospitalApi.java index a30c705..108ec85 100644 --- a/docus-client-interface/src/main/java/com/docus/server/client/api/IHospitalApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/IHospitalApi.java @@ -1,4 +1,4 @@ -package com.docus.server.client.api; +package com.docus.server.api; import java.util.Date; import java.util.List; diff --git a/docus-client-interface/src/main/java/com/docus/server/constants/BusinessConstant.java b/docus-client-interface/src/main/java/com/docus/server/constants/BusinessConstant.java new file mode 100644 index 0000000..7aa3cad --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/constants/BusinessConstant.java @@ -0,0 +1,12 @@ +package com.docus.server.constants; + +public class BusinessConstant { + public static final String HEADER_SYSTEM_CODE = "HEADER_SYSTEM_CODE"; + public static final String REDIS_KEY_USER_TOKEN_PREFIX = "userToken:"; + public static final String HEADER_USER_ID = "HEADER_USER_ID"; + public static final String HEADER_API_TOKEN = "HEADER_API_TOKEN"; + public static final String HEADER_ADMIN_CODE = "HEADER_ADMIN_CODE"; + public static final String HEADER_OWNER_ID = "HEADER_OWNER_ID"; + public static final String HEADER_APP_ID = "HEADER_APP_ID"; + public static final String HEADER_NETWORK_TYPE = "HEADER_NETWORK_TYPE"; +} diff --git a/docus-client-interface/src/main/java/com/docus/server/constants/DSKeyConstants.java b/docus-client-interface/src/main/java/com/docus/server/constants/DSKeyConstants.java new file mode 100644 index 0000000..d24f928 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/constants/DSKeyConstants.java @@ -0,0 +1,37 @@ +package com.docus.server.constants; + +/** + * @author linrf + * @date 2023/6/9 11:19 + */ +public class DSKeyConstants { + + /*common-docus*/ + public static final String SYSTEM_DS_KEY = "system"; + + public static final String RECORD_DS_KEY = "record"; + + + /*common-system*/ + + public static final String BL_DS_KEY = "bl"; + + public static final String ECG_DS_KEY = "ecg"; + + public static final String EMR_DS_KEY = "emr"; + + public static final String HIS_DS_KEY = "his"; + + public static final String HL_DS_KEY = "hl"; + + public static final String ISSUBMIT_DS_KEY = "issubmit"; + + public static final String LIS_DS_KEY = "lis"; + + public static final String PACS_DS_KEY = "pacs"; + + public static final String VTE_DS_KEY = "vte"; + + public static final String ZZ_DS_KEY = "zz"; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/A.java b/docus-client-interface/src/main/java/com/docus/server/entity/A.java new file mode 100644 index 0000000..81dbd73 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/A.java @@ -0,0 +1,4 @@ +package com.docus.server.entity; + +public class A { +} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java b/docus-client-interface/src/main/java/com/docus/server/enums/CollectTypeEnum.java similarity index 97% rename from common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java rename to docus-client-interface/src/main/java/com/docus/server/enums/CollectTypeEnum.java index 16ac286..daaea5f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java +++ b/docus-client-interface/src/main/java/com/docus/server/enums/CollectTypeEnum.java @@ -1,6 +1,6 @@ -package com.docus.server.collect.web.enums; +package com.docus.server.enums; -import com.docus.server.common.enums.IIntegerEnum; +import com.docus.infrastructure.core.db.enums.IIntegerEnum; public enum CollectTypeEnum implements IIntegerEnum { diff --git a/docus-api-common/src/main/java/com/docus/server/common/enums/FlagEnum.java b/docus-client-interface/src/main/java/com/docus/server/enums/FlagEnum.java similarity index 85% rename from docus-api-common/src/main/java/com/docus/server/common/enums/FlagEnum.java rename to docus-client-interface/src/main/java/com/docus/server/enums/FlagEnum.java index 5de85f3..3c4061c 100644 --- a/docus-api-common/src/main/java/com/docus/server/common/enums/FlagEnum.java +++ b/docus-client-interface/src/main/java/com/docus/server/enums/FlagEnum.java @@ -1,4 +1,6 @@ -package com.docus.server.common.enums; +package com.docus.server.enums; + +import com.docus.infrastructure.core.db.enums.IIntegerEnum; public enum FlagEnum implements IIntegerEnum { INSERT(1, "新增"), diff --git a/docus-api-common/src/main/java/com/docus/server/common/enums/StateEnum.java b/docus-client-interface/src/main/java/com/docus/server/enums/StateEnum.java similarity index 81% rename from docus-api-common/src/main/java/com/docus/server/common/enums/StateEnum.java rename to docus-client-interface/src/main/java/com/docus/server/enums/StateEnum.java index 39a4dc2..5c19d2b 100644 --- a/docus-api-common/src/main/java/com/docus/server/common/enums/StateEnum.java +++ b/docus-client-interface/src/main/java/com/docus/server/enums/StateEnum.java @@ -1,4 +1,6 @@ -package com.docus.server.common.enums; +package com.docus.server.enums; + +import com.docus.infrastructure.core.db.enums.IIntegerEnum; public enum StateEnum implements IIntegerEnum { OK(0, "成功"), diff --git a/docus-client-interface/src/main/java/com/docus/server/client/A.java b/docus-client-interface/src/main/java/com/docus/server/util/A.java similarity index 69% rename from docus-client-interface/src/main/java/com/docus/server/client/A.java rename to docus-client-interface/src/main/java/com/docus/server/util/A.java index 01e841e..b15d6be 100644 --- a/docus-client-interface/src/main/java/com/docus/server/client/A.java +++ b/docus-client-interface/src/main/java/com/docus/server/util/A.java @@ -1,4 +1,4 @@ -package com.docus.server.client; +package com.docus.server.util; /** * @author linruifeng diff --git a/docus-medical-record/pom.xml b/docus-medical-record/pom.xml deleted file mode 100644 index 11b015b..0000000 --- a/docus-medical-record/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - docus-medical-record - Archetype - docus-medical-record - http://maven.apache.org - - - - com.docus - docus-api-common - 1.0-SNAPSHOT - compile - - - - - - - src/main/java - - **/*.xml - - - - src/main/resources - - - - - - diff --git a/docus-medical-record/src/main/java/com/docus/server/record/RecordExceptionEnum.java b/docus-medical-record/src/main/java/com/docus/server/record/RecordExceptionEnum.java deleted file mode 100644 index 2b98c78..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/RecordExceptionEnum.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.docus.server.record; - -import com.docus.infrastructure.core.exception.IErrorCode; - -public enum RecordExceptionEnum implements IErrorCode { - - /** - * 备份实例不存在 - */ - NOT_NULL("1001", "参数不能为空！"), - ; - - - private String msgCode; - private String msg; - - - /** - * 模块业务码,例如微信是 WX，每个模块独立标识 - */ - private String moduleCode = "MR"; - - - RecordExceptionEnum(String msgCode, String msg) { - this.msgCode = msgCode; - this.msg = msg; - } - - - @Override - public String getCode() { - return moduleCode + this.msgCode; - } - - @Override - public String getMessage() { - return msg; - } - -} 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 deleted file mode 100644 index 7f7241a..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -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/common/pojo/dto/IdType.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/IdType.java deleted file mode 100644 index df082a0..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/IdType.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.record.common.pojo.dto; - -public enum IdType { - /** - * 记账号 - */ - JZH, - - /** - * 病案号 - */ - INPATIENT_NO -} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/InpatientNo.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/InpatientNo.java deleted file mode 100644 index 448258b..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/InpatientNo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.docus.server.record.common.pojo.dto; - -import com.docus.infrastructure.core.exception.BaseException; -import com.docus.server.record.RecordExceptionEnum; - -/** - * 住院号 - */ -public class InpatientNo { - - - private String inpatientNo; - - public InpatientNo(String inpatientNo) { - this.inpatientNo = inpatientNo; - this.vaid(); - } - - - public void vaid() { - if (inpatientNo == null) { - throw new BaseException(RecordExceptionEnum.NOT_NULL, "inpatientNo不能为空"); - } - } - - - public static InpatientNo of(String inpatientNo) { - return new InpatientNo(inpatientNo); - } -} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/TBasicDTO.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/TBasicDTO.java deleted file mode 100644 index 80103a0..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/TBasicDTO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.docus.server.record.common.pojo.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Map; - -/** - * @BelongsProject: docus-webservice-sdry - * @BelongsPackage: com.docus.server.collection.webservice - * @Author: chierhao - * @CreateTime: 2023-02-25 14:44 - * @Description: TODO - * @Version: 1.0 - */ -@Data -public class TBasicDTO { - // ---------------------- TBasicDTO info ---------------------- - @ApiModelProperty(value = "记账号") - private String jzh; - @ApiModelProperty(value = "病案号") - private String inpatientNo; - @ApiModelProperty(value = "住院次数") - private String admissTimes; - @ApiModelProperty(value = "患者姓名") - private String name; - @ApiModelProperty(value = "住院日期") - private String admissDate; - @ApiModelProperty(value = "出院日期") - private String disDate; - @ApiModelProperty(value = "住院科室名称") - private String admissDeptName; - @ApiModelProperty(value = "出院科室名称") - private String disDeptName; - @ApiModelProperty(value = "主管医生") - private String attending; - @ApiModelProperty(value = "主管医生名称") - private String attendingName; - @ApiModelProperty(value = "责任护士") - private String dutyNurse; - @ApiModelProperty(value = "住院科室") - private String admissDept; - @ApiModelProperty(value = "年龄_岁") - private String age; - @ApiModelProperty(value = "性别") - private String sex; - @ApiModelProperty(value = "身份证") - private String idCard; - @ApiModelProperty(value = "出院科室") - private String disDept; - @ApiModelProperty(value = "性别名称") - private String sexName; - @ApiModelProperty(value = "床位号") - private String bedNum; - @ApiModelProperty(value = "是否死亡") - private String isDead; - @ApiModelProperty(value = "实际住院天数") - private String admissDays; - // ---------------------- xml info ---------------------- - private String serialId; - private String receive; - private String send; - // ---------------------- sdry info ---------------------- - private String wardCode; - private String wardName; - private String sdryIndex; - /** - * 拓展参数 - */ - private Map params; -} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecord.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecord.java deleted file mode 100644 index 5f0a98f..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecord.java +++ /dev/null @@ -1,117 +0,0 @@ -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.common.pojo.dto.IdType; -import com.docus.server.record.common.pojo.dto.InpatientNo; -import lombok.Getter; - -import java.util.Map; - -@Getter -public class MedicalRecord { - /** - * 住院号 - */ - private InpatientNo inpatientNo; - /** - * 记账号/住院流水号 - */ - private String jzh; - /** - * 住院次数 - */ - private Integer admisstimes; - /** - * 采集来源系统 - */ - private String sysFlag; - /** - * 下载地址 - */ - private String downUrl; - /** - * 文件名 - */ - private String fileTitle; - - /** - * 采集流水号/文件唯一id - */ - private String serialnum; - - /** - * 文件分类id - */ - private String assortId; - - /** - * 采集类型(文件来源 1:采集器；2：扫描生产软件) - */ - private String fileSource; - - /** - * 业务病案主键 - */ - private String patientId; - - private String sourceInfo; - - - /** - * 1. 记账号，2. 住院号与次数 - */ - private IdType idType; - - - /** - * 拓展参数 - */ - private Map params; - - - public MedicalRecord(InpatientNo inpatientNo, String jzh, Integer admisstimes, - String sysFlag, String downUrl, String fileTitle, String serialnum, - String assortId, String fileSource, - String patientId, String sourceInfo, IdType idType, Map params) { - this.inpatientNo = inpatientNo; - this.jzh = jzh; - this.admisstimes = admisstimes; - this.sysFlag = sysFlag; - this.downUrl = downUrl; - this.fileTitle = fileTitle; - this.serialnum = serialnum; - this.assortId = assortId; - this.fileSource = fileSource; - this.patientId = patientId; - this.sourceInfo = sourceInfo; - this.idType = idType; - this.params = params; - - //需要强校验每个字段是否符合规则，并且限制值范围。 - - vaid(); - - } - - - public void vaid() { - if (idType == IdType.JZH) { - //根据记账号查询，需要判断 是否存在。 - if (Func.isEmpty(jzh)) { - throw new BaseException(RecordExceptionEnum.NOT_NULL, "jzh不能为空"); - } - } else { - //根据住院号+住院次数 - //根据记账号查询，需要判断 是否存在。 - if (Func.isEmpty(admisstimes) && Func.isEmpty(inpatientNo)) { - throw new BaseException(RecordExceptionEnum.NOT_NULL, "jzh不能为空"); - } - - } - - - } - -} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecordEntity.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecordEntity.java deleted file mode 100644 index aba1631..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecordEntity.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.docus.server.record.common.pojo.entity; - -public class MedicalRecordEntity { - - - private Long id; - - /** - * 住院号 - */ - private String inpatientNo; - /** - * 记账号/住院流水号 - */ - private String jzh; - /** - * 住院次数 - */ - private Integer admisstimes; - /** - * 采集来源系统 - */ - private String sysFlag; - /** - * 下载地址 - */ - private String downUrl; - /** - * 文件名 - */ - private String fileTitle; - - /** - * 采集流水号/文件唯一id - */ - private String serialnum; - - /** - * 文件分类id - */ - private String assortId; - - /** - * 采集类型(文件来源 1:采集器；2：扫描生产软件) - */ - private String fileSource; - - /** - * 业务病案主键 - */ - private String patientId; - - - /** - * 1. 未完成，2. 已完成 - */ - private String state; - - /** - * 任务id - */ - private String taskId; - -} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java deleted file mode 100644 index b3e86a7..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.docus.server.record.common.pojo.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * 病案基本信息 - *

- * - * @author jiashi - * @since 2021-04-14 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "TBasic对象", description = "病案基本信息") -public class TBasic implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "病案主键") - private String patientId; - - @ApiModelProperty(value = "住院次数") - private Integer admissTimes; - - @ApiModelProperty(value = "病案号") - @TableField("inpatientNo") - private String inpatientNo; - - @ApiModelProperty(value = "住院ID号") - private String admissId; - - @ApiModelProperty(value = "患者姓名") - private String name; - - @ApiModelProperty(value = "盘号") - private String ph; - - @ApiModelProperty(value = "性别") - private String sex; - - @ApiModelProperty(value = "年龄_岁") - private Integer age; - - @ApiModelProperty(value = "年龄_月") - private Integer ageMonth; - - @ApiModelProperty(value = "年龄_天") - private Integer ageDay; - - @ApiModelProperty(value = "身份证") - private String idCard; - - @ApiModelProperty(value = "手机号码") - private String telphone; - - @ApiModelProperty(value = "住院日期") - private Date admissDate; - - @ApiModelProperty(value = "住院科室") - private String admissDept; - - @ApiModelProperty(value = "住院科室名称") - private String admissDeptName; - - @ApiModelProperty(value = "出院日期") - private Date disDate; - - @ApiModelProperty(value = "出院科室") - private String disDept; - - @ApiModelProperty(value = "出院科室名称") - private String disDeptName; - - @ApiModelProperty(value = "实际住院天数") - private Integer admissDays; - - @ApiModelProperty(value = "主管医生") - private String attending; - - @ApiModelProperty(value = "主管医生名称") - private String attendingName; - - @ApiModelProperty(value = "主要诊断编码") - private String mainDiagCode; - - @ApiModelProperty(value = "主要诊断名称") - private String mainDiagName; - - @ApiModelProperty(value = "主要手术编码") - private String mainOperateCode; - - @ApiModelProperty(value = "主要手术名称") - private String mainOperateName; - - @ApiModelProperty(value = "是否死亡") - private Integer isDead; - - @ApiModelProperty(value = "是否作废(0：否，1：是)") - private Integer isCancel; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "是否归档 1：已归档，0：未归档") - private Integer isArchive; - - @ApiModelProperty(value = "归档时间") - private Date archiveTime; - - @ApiModelProperty(value = "文件来源 1:af_archive_detail,2:t_scan_assort") - private Integer fileSource; - - @ApiModelProperty(value = "完整性描述") - private String integrityDesc; - - private String bColumn1; - - private String bColumn2; - - private String bColumn3; - - private String bColumn4; - - private String bColumn5; - - private Integer bColumn6; - - private Integer bColumn7; - - private Integer bColumn8; - - private Integer bColumn9; - - private Integer bColumn10; - - @ApiModelProperty(value = "姓名缩写（内部构成）") - private String nameSpell; - - @ApiModelProperty(value = "性别名称") - private String sexName; - - @ApiModelProperty(value = "记账号") - private String jzh; - - @ApiModelProperty(value = "床位号") - private String bedNum; - - @ApiModelProperty(value = "责任护士") - private String dutyNurse; -} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasicExtend.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasicExtend.java deleted file mode 100644 index d93ef50..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasicExtend.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.docus.server.record.common.pojo.entity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; - -/** - * @BelongsProject: docus-webservice-sdry - * @BelongsPackage: com.docus.server.collection.entity - * @Author: chierhao - * @CreateTime: 2023-03-07 15:29 - * @Description: TODO - * @Version: 1.0 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "tBasicExtend对象", description = "病案基本信息扩展") -public class TBasicExtend implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "病案主键") - private String patientId; - - @ApiModelProperty(value = "病区编号") - private String wardCode; - - @ApiModelProperty(value = "病区名称") - private String wardName; - - @ApiModelProperty(value = "第三方索引") - private String sdryIndex; -} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/controller/Package.java b/docus-medical-record/src/main/java/com/docus/server/record/controller/Package.java deleted file mode 100644 index 65a1b37..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/controller/Package.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.record.controller; - -public class Package { - -} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/controller/param/Package.java b/docus-medical-record/src/main/java/com/docus/server/record/controller/param/Package.java deleted file mode 100644 index aceed35..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/controller/param/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.record.controller.param; - -public class Package { -} diff --git a/docus-medical-record/src/main/java/com/docus/server/record/controller/vo/Package.java b/docus-medical-record/src/main/java/com/docus/server/record/controller/vo/Package.java deleted file mode 100644 index 0b5b3fd..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/controller/vo/Package.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.record.controller.vo; - -public class Package { -} 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 deleted file mode 100644 index 1385b29..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java +++ /dev/null @@ -1,84 +0,0 @@ -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.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; - -import java.util.List; -import java.util.Map; - -/** - *

- * 病案基本信息 Mapper 接口 - *

- * - * @author jiashi - * @since 2021-04-14 - */ -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface TBasicMapper extends BaseMapper { - /** - * 根据住院号和住院次数查询业务系统中病案主键 - * - * @param inpatientNo 住院号 - * @param admissTimes 住院次数 - * @return 病案主键 - */ - String getPatientIdByInpatientNoAndAdminssTimes(@Param("inpatientNo") String inpatientNo, - @Param("adminssTimes") Integer admissTimes); - - Integer selectOne(@Param("jzh") String jzh); - - String getPatientId(@Param("jzh") String jzh); - - Integer insertTBasic(@Param("tBasic") TBasic tBasic); - - Integer insertExtend(@Param("tBasicExtend") TBasicExtend tBasicExtend); - - Integer updateTBasic(@Param("tBasic") TBasic tBasic); - - Integer updateExtend(@Param("tBasicExtend") TBasicExtend tBasicExtend); - - List selectBasicListByAdmissDate(@Param("admissStartDate") String admissStartDate, - @Param("admissEndDate") String admissEndDate, - @Param("offset") int offset, - @Param("size") int size); - - /** - * 查询归档关联顺德人医报告的交叉索引 - * - * @param patientId 归档系统病案主键 - * @return 归档关联顺德人医报告的交叉索引 - */ - String getSdRyIndexByPatientId(@Param("patientId") String patientId); - - List selectBasicListByCreateOrUpdateTime(@Param("startDate") String queryBasicStartDate, - @Param("endDate") String queryBasicEndDate, - @Param("offset") int offset, - @Param("size") int size); - - List selectBasicListByPatientIds(@Param("patientIds") List patientIds); - - List> getBasicForZYHs(@Param("zyhs") List zyhs); - - /** - * 查询基础出院数据增量数据 - * - * @param param - * @return - */ - List> getBasicOutData(@Param("param") Map param); - - /** - * 查询基础创建数据增量数据 - * - * @param param - * @return - */ - List> getBasicData(@Param("param") Map param); -} 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 deleted file mode 100644 index 8beac6f..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/IMedicalRecordService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.docus.server.record.service; - -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 deleted file mode 100644 index 4746c4b..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.docus.server.record.service; - -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; -import java.util.Map; - -public interface ITBasicService extends IBaseService { - - /** - * 新增 - * - * @param dto - * @throws Exception - */ - void insertTBasic(TBasicDTO dto); - - /** - * 更新 - * - * @param dto - * @throws Exception - */ - void updateTBasic(TBasicDTO dto); - - /** - * 批量新增 - * - * @param basicDTOList - */ - void batchSaveBasics(List basicDTOList); - - /** - * 根据记账号查询数据 - * - * @param jzh - * @return - */ - Integer findByJzh(String jzh); - - /** - * 根据住院查询住院信息 - * - * @param zyhs - * @return - */ - List> getBasicForZYHs(List zyhs); - - /** - * 查询基础出院数据增量数据 - */ - List> getBasicOutData(Map param); - - /** - * 查询基础创建数据增量数据 - */ - List> getBasicData(Map param); -} 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 deleted file mode 100644 index 78696d6..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.docus.server.record.service.impl; - -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; - -@Service -public class MedicalRecordServiceImpl implements IMedicalRecordService { - - @Override - public void receive(MedicalRecord medicalRecord) { - //判断幂等，不要重复提交。 //判断业务是否正确， - if (isExist(medicalRecord)) { - return; - } - //保存数据内容到数据库。 - this.saveMedicalRecord(medicalRecord); - - //发起下载任务 - - } - - - public void createDownloadTask(MedicalRecord medicalRecord) { - //创建下载任务，改造文件服务， - //确保下载任务成功。 - - //完成任务，保存对应信息到病案系统。 - } - - - public void saveFileInfo() { - - } - - public void saveMedicalRecord(MedicalRecord medicalRecord) { - - } - - - public Boolean isExist(MedicalRecord medicalRecord) { - if (medicalRecord.getIdType() == IdType.JZH) { - //根据记账号查询 - return true; - - } else { - //根据住院号+住院次数 - return true; - } - } - - -} 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 deleted file mode 100644 index 7697140..0000000 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java +++ /dev/null @@ -1,242 +0,0 @@ -package com.docus.server.record.service.impl; - -import cn.hutool.core.util.NumberUtil; -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.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.mapper.TBasicMapper; -import com.docus.server.record.service.ITBasicService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Service -public class TBasicServiceImpl extends BaseServiceImpl implements ITBasicService { - - @Resource - private TBasicMapper tBasicMapper; - - @Resource - private IdService idService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertTBasic(TBasicDTO tBasicDTO) { - //判断jzh是否重复 -// Integer num = tBasicMapper.selectOne(tBasicDTO.getJzh()); -// if (num > 0) { -// updateTBasic(tBasicDTO); -// return; -// } - Long patientId = idService.getDateSeq(); - - //数据类型转化，格式处理 - Date admissDate = null; - if (Func.isNotEmpty(tBasicDTO.getAdmissDate())) { - admissDate = Func.parseDate(tBasicDTO.getAdmissDate(), DateUtil.PATTERN_DATETIME_MINI); - } - Date disDate = null; - if (Func.isNotEmpty(tBasicDTO.getDisDate())) { - disDate = Func.parseDate(tBasicDTO.getDisDate(), DateUtil.PATTERN_DATETIME_MINI); - } - String admissTimesStr = tBasicDTO.getAdmissTimes(); - Integer admissTimes = null; - if (NumberUtil.isInteger(admissTimesStr)) { - admissTimes = Integer.parseInt(admissTimesStr); - } - String ageStr = tBasicDTO.getAge(); - if (Func.isNotEmpty(ageStr)) { - ageStr = ageStr.substring(0, ageStr.length() - 1); - } - Integer age = null; - if (NumberUtil.isInteger(ageStr)) { - age = Integer.parseInt(ageStr); - } - String sexName = tBasicDTO.getSexName(); - if (sexName.length() > 1) { - sexName = sexName.substring(0, 1); - } - String admissDaysStr = tBasicDTO.getAdmissDays(); - Integer admissDays = null; - if (NumberUtil.isInteger(admissDaysStr)) { - admissDays = Integer.parseInt(admissDaysStr); - } - String isDeadStr = tBasicDTO.getIsDead(); - Integer isDead = 0; - if ("死亡".equals(isDeadStr)) { - isDead = 1; - } - - //组装数据 - TBasic tBasic = new TBasic(); - tBasic.setPatientId(patientId.toString()); - tBasic.setJzh(tBasicDTO.getJzh()); - tBasic.setInpatientNo(tBasicDTO.getInpatientNo()); - tBasic.setAdmissTimes(admissTimes); - tBasic.setName(tBasicDTO.getName()); - tBasic.setAdmissDate(admissDate); - tBasic.setDisDate(disDate); - tBasic.setAdmissDeptName(tBasicDTO.getAdmissDeptName()); - tBasic.setDisDeptName(tBasicDTO.getDisDeptName()); - tBasic.setAttendingName(tBasicDTO.getAttendingName()); - tBasic.setAttending(tBasicDTO.getAttending()); - tBasic.setDutyNurse(tBasicDTO.getDutyNurse()); - tBasic.setAdmissDept(tBasicDTO.getAdmissDept()); - tBasic.setCreateTime(DateUtil.now()); - tBasic.setAge(age); - tBasic.setSex(tBasicDTO.getSex()); - tBasic.setIdCard(tBasicDTO.getIdCard()); - tBasic.setDisDept(tBasicDTO.getDisDept()); - tBasic.setSexName(sexName); - tBasic.setBedNum(tBasicDTO.getBedNum()); - tBasic.setAdmissDays(admissDays); - tBasic.setIsDead(isDead); - - TBasicExtend tBasicExtend = new TBasicExtend(); - tBasicExtend.setPatientId(patientId.toString()); - tBasicExtend.setWardCode(tBasicDTO.getWardCode()); - tBasicExtend.setWardName(tBasicDTO.getWardName()); - tBasicExtend.setSdryIndex(tBasicDTO.getSdryIndex()); - - //持久化 - tBasicMapper.insertTBasic(tBasic); - tBasicMapper.insertExtend(tBasicExtend); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTBasic(TBasicDTO tBasicDTO) { - //判断jzh是否存在 - String patientId = tBasicMapper.getPatientId(tBasicDTO.getJzh()); - if (Func.isEmpty(patientId)) { - insertTBasic(tBasicDTO); - return; - } - - //数据类型转化，格式处理 - Date admissDate = null; - if (Func.isNotEmpty(tBasicDTO.getAdmissDate())) { - admissDate = Func.parseDate(tBasicDTO.getAdmissDate(), DateUtil.PATTERN_DATETIME_MINI); - } - Date disDate = null; - if (Func.isNotEmpty(tBasicDTO.getDisDate())) { - disDate = Func.parseDate(tBasicDTO.getDisDate(), DateUtil.PATTERN_DATETIME_MINI); - } - String admissTimesStr = tBasicDTO.getAdmissTimes(); - Integer admissTimes = null; - if (NumberUtil.isInteger(admissTimesStr)) { - admissTimes = Integer.parseInt(admissTimesStr); - } - String ageStr = tBasicDTO.getAge(); - if (Func.isNotEmpty(ageStr)) { - ageStr = ageStr.substring(0, ageStr.length() - 1); - } - Integer age = null; - if (NumberUtil.isInteger(ageStr)) { - age = Integer.parseInt(ageStr); - } - String sexName = tBasicDTO.getSexName(); - if (sexName.length() > 1) { - sexName = sexName.substring(0, 1); - } - String admissDaysStr = tBasicDTO.getAdmissDays(); - Integer admissDays = null; - if (NumberUtil.isInteger(admissDaysStr)) { - admissDays = Integer.parseInt(admissDaysStr); - } - String isDeadStr = tBasicDTO.getIsDead(); - Integer isDead = 0; - if ("死亡".equals(isDeadStr)) { - isDead = 1; - } - - //组装数据 - TBasic tBasic = new TBasic(); - - tBasic.setJzh(tBasicDTO.getJzh()); - tBasic.setPatientId(patientId); - tBasic.setInpatientNo(tBasicDTO.getInpatientNo()); - tBasic.setAdmissTimes(admissTimes); - tBasic.setName(tBasicDTO.getName()); - tBasic.setAdmissDate(admissDate); - tBasic.setDisDate(disDate); - tBasic.setAdmissDeptName(tBasicDTO.getAdmissDeptName()); - tBasic.setDisDeptName(tBasicDTO.getDisDeptName()); - tBasic.setAttendingName(tBasicDTO.getAttendingName()); - tBasic.setAge(age); - tBasic.setSex(tBasicDTO.getSex()); - tBasic.setIdCard(tBasicDTO.getIdCard()); - tBasic.setDisDept(tBasicDTO.getDisDept()); - tBasic.setSexName(sexName); - tBasic.setBedNum(tBasicDTO.getBedNum()); - tBasic.setAdmissDays(admissDays); - tBasic.setIsDead(isDead); - tBasic.setAttending(tBasicDTO.getAttending()); - tBasic.setDutyNurse(tBasicDTO.getDutyNurse()); - tBasic.setAdmissDept(tBasicDTO.getAdmissDept()); - tBasic.setCreateTime(DateUtil.now()); - - TBasicExtend tBasicExtend = new TBasicExtend(); - tBasicExtend.setPatientId(patientId); - tBasicExtend.setWardCode(tBasicDTO.getWardCode()); - tBasicExtend.setWardName(tBasicDTO.getWardName()); - tBasicExtend.setSdryIndex(tBasicDTO.getSdryIndex()); - - //持久化 - tBasicMapper.updateTBasic(tBasic); - tBasicMapper.updateExtend(tBasicExtend); - } - - private void convert() { - - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchSaveBasics(List basicDTOList) { - basicDTOList.forEach(this::updateTBasic); - } - - @Override - public Integer findByJzh(String jzh) { - //判断jzh是否重复 - return tBasicMapper.selectOne(jzh); - } - - /** - * 根据住院查询住院信息 - * - * @param zyhs - * @return - */ - @Override - public List> getBasicForZYHs(List zyhs) { - return tBasicMapper.getBasicForZYHs(zyhs); - } - - /** - * 查询基础出院数据增量数据 - */ - @Override - public List> getBasicOutData(Map param) { - return tBasicMapper.getBasicOutData(param); - } - - /** - * 查询基础创建数据增量数据 - */ - @Override - public List> getBasicData(Map param) { - return tBasicMapper.getBasicData(param); - } -} - - diff --git a/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml b/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml deleted file mode 100644 index 0fafbc1..0000000 --- a/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - 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`,`create_time`) - VALUES - (#{tBasic.admissDays},#{tBasic.isDead},#{tBasic.sexName},#{tBasic.bedNum},#{tBasic.age},#{tBasic.sex},#{tBasic.idCard}, - #{tBasic.disDept},#{tBasic.patientId},#{tBasic.admissTimes},#{tBasic.inpatientNo}, - #{tBasic.name},#{tBasic.admissDate},#{tBasic.admissDeptName},#{tBasic.disDate},#{tBasic.disDeptName}, - #{tBasic.attendingName},#{tBasic.jzh},now()) - - - INSERT INTO `docus_medicalrecord`.`t_basic_extend` - (`patient_id`,`ward_code`,`ward_name`,`sdry_index`) - VALUES - (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName},#{tBasicExtend.sdryIndex}) - - - - UPDATE `docus_medicalrecord`.`t_basic` - - - `admiss_days`=#{tBasic.admissDays}, - - - `is_dead`=#{tBasic.isDead}, - - - `sex_name`=#{tBasic.sexName}, - - - `bed_num`=#{tBasic.bedNum}, - - - `age`=#{tBasic.age}, - - - `sex`=#{tBasic.sex}, - - - `id_card`=#{tBasic.idCard}, - - - `dis_dept`=#{tBasic.disDept}, - - - `admiss_times`=#{tBasic.admissTimes}, - - - `inpatient_no`=#{tBasic.inpatientNo}, - - - `name`=#{tBasic.name}, - - - `admiss_date`=#{tBasic.admissDate}, - - - `admiss_dept_name`=#{tBasic.admissDeptName}, - - - `dis_date`=#{tBasic.disDate}, - - - `dis_dept_name`=#{tBasic.disDeptName}, - - - `attending_name`=#{tBasic.attendingName}, - - `update_time`=now() - - WHERE `patient_id`=#{tBasic.patientId,jdbcType=VARCHAR}; - - - - INSERT INTO `docus_medicalrecord`.`t_basic_extend` - (`patient_id`,`ward_code`,`ward_name`,`sdry_index`) - VALUES - (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName},#{tBasicExtend.sdryIndex}) - on DUPLICATE KEY UPDATE - `ward_code`=#{tBasicExtend.wardCode}, - `ward_name`=#{tBasicExtend.wardName}, - `sdry_index`=#{tBasicExtend.sdryIndex} - - - - - - - - - - - - - - - - diff --git a/docus-sys/pom.xml b/docus-sys/pom.xml deleted file mode 100644 index 66b8551..0000000 --- a/docus-sys/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - docus-sys - Archetype - docus-sys - http://maven.apache.org - - - - - src/main/java - - **/*.xml - - - - src/main/resources - - - - - - com.docus - docus-api-common - 1.0-SNAPSHOT - compile - - - diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/DSKeyConstants.java b/docus-sys/src/main/java/com/docus/server/sys/common/DSKeyConstants.java deleted file mode 100644 index 005e1f9..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.sys.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "system"; - -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java deleted file mode 100644 index debc1a0..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.docus.server.sys.common.pojo.dto; - -import lombok.Data; - -import java.util.Map; - -/** - * @author Fang Ruichuan - * @date 2022-11-14 19:02 - */ -@Data -public class DeptDTO { - // ---------------------- DeptDTO info ---------------------- - /** - * 科室代码 - */ - private String deptCode; - - /** - * 科室名称 - */ - private String deptName; - - /** - * 操作人ID - */ - private String authorId; - /** - * 操作人名称 - */ - private String authorName; - - // ---------------------- xml info ---------------------- - /** - * id-消息流水号 返回消息体需要 - */ - private String messageId; - /** - * 操作消息 - */ - private String message; - /** - * 接收方 - */ - private String receiver; - - /** - * 用户操作 operateType有三种值：C 代表新增、U 代表修改、D 代表删除 - */ - private String operateType; - - /** - * xml原始报文 - */ - private String source; - /** - * 拓展参数 - */ - private Map params; - - /** - * 转换用户修改对象 - * - * @return 用户修改对象 - */ - public DeptModifyParam transDeptAddParam() { - DeptModifyParam deptModifyParam = new DeptModifyParam(); - deptModifyParam.setDeptCode(this.deptCode); - deptModifyParam.setDeptName(this.getDeptName()); - deptModifyParam.setAuthorName(this.authorName); - deptModifyParam.setAuthorId(this.authorId); - return deptModifyParam; - } - - -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptModifyParam.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptModifyParam.java deleted file mode 100644 index 11598e6..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptModifyParam.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.docus.server.sys.common.pojo.dto; - -import lombok.Data; - -/** - * @author wen yongbin - * @date 2023年2月26日00:21:00 - */ -@Data -public class DeptModifyParam { - - /** - * 科室主键id - */ - private Long deptId; - - /** - * 科室代码 - */ - private String deptCode; - - /** - * 科室名称 - */ - private String deptName; - - - /** - * 操作人名称 - */ - private String authorName; - - - /** - * 操作人ID - */ - private String authorId; -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java deleted file mode 100644 index f4be868..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.docus.server.sys.common.pojo.dto; - -import lombok.Data; - -import java.util.Map; - -/** - * @author Fang Ruichuan - * @date 2022-11-14 19:02 - */ -@Data -public class UserDTO { - // ---------------------- UserDTO info ---------------------- - /** - * 用户工号 - */ - private String userName; - /** - * 第三方用户密码 - */ - private String pwd; - /** - * 用户姓名 - */ - private String name; - /** - * 到时同步完让实施找下不重复的导入到角色表，程序再判断职位对应角色表存角色id(roleId),初始roleId=0 - */ - private String position; - /** - * 所属科室编号 - */ - private String deptId; - /** - * 角色Id 初始 0 - */ - private Long roleId; - /** - * 操作人名称 - */ - private String authorName; - /** - * 操作人ID - */ - private String authorId; - - // ---------------------- xml info ---------------------- - /** - * id-消息流水号 返回消息体需要 - */ - private String messageId; - /** - * 接收方 - */ - private String receiver; - - /** - * 用户操作 operateType有三种值：C 代表新增、U 代表修改、D 代表删除 - */ - private String operateType; - /** - * 拓展参数 - */ - private Map params; - - /** - * 转换用户修改对象 - * - * @return 用户修改对象 - */ - public UserModifyParam transUserAddParam() { - UserModifyParam userModifyParam = new UserModifyParam(); - userModifyParam.setUserName(this.userName); - userModifyParam.setName(this.name); - userModifyParam.setPosition(this.position); - userModifyParam.setRoleId(this.roleId); - userModifyParam.setDeptId(this.deptId); - userModifyParam.setAuthorName(this.authorName); - userModifyParam.setAuthorId(this.authorId); - return userModifyParam; - } -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserModifyParam.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserModifyParam.java deleted file mode 100644 index 09b943d..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserModifyParam.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.docus.server.sys.common.pojo.dto; - -import lombok.Data; - -/** - * @author Fang Ruichuan - * @date 2022-11-14 19:02 - */ -@Data -public class UserModifyParam { - /** - * 用户id - */ - private Long userId; - /** - * 用户姓名 - */ - private String name; - /** - * 用户工号 - */ - private String userName; - /** - * 所属科室编号 - */ - private String deptId; - /** - * 到时同步完让实施找下不重复的导入到角色表，程序再判断职位对应角色表存角色id(roleId),初始roleId=0 - */ - private String position; - /** - * 角色Id 初始 0 - */ - private Long roleId; - /** - * 用户密码 - */ - private String userPwd; - - /** - * 操作人名称 - */ - private String authorName; - - - /** - * 操作人ID - */ - private String authorId; -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerDept.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerDept.java deleted file mode 100644 index 46b9c9b..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerDept.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.docus.server.sys.common.pojo.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * 科室 - *

- * - * @author jiashi - * @since 2021-04-15 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "PowerDept对象", description = "科室") -public class PowerDept implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "科室id") - private Long deptId; - - @ApiModelProperty(value = "科室代码") - @TableField("dept_code") - private String deptCode; - - @ApiModelProperty(value = "科室名称") - private String deptName; - - @ApiModelProperty(value = "字典id") - private Integer dictId; - - @ApiModelProperty(value = "是否有效") - private Integer effective; - - @ApiModelProperty(value = "创建时间") - private Date createDate; - - @ApiModelProperty(value = "创建人") - private String creater; - - @ApiModelProperty(value = "更新时间") - private Date updateDate; - - @ApiModelProperty(value = "更新人") - private String updater; - - @ApiModelProperty(value = "备注") - private String remark; - - @ApiModelProperty(value = "临床科室排序") - private Integer sort; - - @ApiModelProperty(value = "0:非临床科室,1:临床科室") - private Integer type; -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerThirdLogin.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerThirdLogin.java deleted file mode 100644 index 5ad876f..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerThirdLogin.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.docus.server.sys.common.pojo.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * 第三方登陆 - *

- * - * @author jiashi - * @since 2021-04-26 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "PowerThirdLogin对象", description = "第三方登陆") -public class PowerThirdLogin implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "id") - @TableId(value = "id", type = IdType.ID_WORKER_STR) - private Long id; - - @ApiModelProperty(value = "power_user表id") - private String powerUserId; - - @ApiModelProperty(value = "用户") - @TableField("user") - private String user; - - @ApiModelProperty(value = "密码") - private String pwd; - - @ApiModelProperty(value = "来源") - private Integer source; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerUser.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerUser.java deleted file mode 100644 index 0b487fd..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerUser.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.docus.server.sys.common.pojo.entity; - - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "PowerUser对象", description = "用户表") -public class PowerUser implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "用户id") - private Long userId; - - @ApiModelProperty(value = "登陆名") - @TableField("user_name") - private String userName; - - @ApiModelProperty(value = "用户密码") - private String userPwd; - - @ApiModelProperty(value = "性别 0 男 1 女") - private Integer userSex; - - @ApiModelProperty(value = "年龄") - private Integer userAge; - - @ApiModelProperty(value = "电话") - private String userTel; - - @ApiModelProperty(value = "邮箱") - private String userEmail; - - @ApiModelProperty(value = "微信信息") - private String wxBank; - - @ApiModelProperty(value = "职位") - private String userPosition; - - @ApiModelProperty(value = "角色") - private Long roleId; - - @ApiModelProperty(value = "部门id") - private String deptId; - - @ApiModelProperty(value = "是否有效") - private Integer effective; - - @ApiModelProperty(value = "创建时间") - private Date createDate; - - @ApiModelProperty(value = "创建人") - private String creater; - - @ApiModelProperty(value = "更新时间") - private Date updateDate; - - @ApiModelProperty(value = "更新人") - private String updater; - - @ApiModelProperty(value = "备注") - private String remark; - - @ApiModelProperty(value = "登录标志 默认为0为未登录 1登录") - private Integer loginFlag; - - @ApiModelProperty(value = "用户名称") - private String name; - - @ApiModelProperty(value = "所属科室代码 多个以,分隔") - @TableField(exist = false) - private String deptCode; - - @ApiModelProperty(value = "权限科室 拥有对科室查阅权限") - private String powerDept; - - @ApiModelProperty(value = "权限 拥有对主管医生查阅权限") - private String powerAttending; - -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/controller/TestController.java b/docus-sys/src/main/java/com/docus/server/sys/controller/TestController.java deleted file mode 100644 index c17a124..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/controller/TestController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.docus.server.sys.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/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerDeptMapper.java b/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerDeptMapper.java deleted file mode 100644 index 589f344..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerDeptMapper.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.docus.server.sys.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.sys.common.DSKeyConstants; -import com.docus.server.sys.common.pojo.dto.DeptModifyParam; -import com.docus.server.sys.common.pojo.entity.PowerDept; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 科室表 baseMapper - *

- * - * @author wen yongbin - * @since 2023年2月25日22:28:58 - */ -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface PowerDeptMapper extends BaseMapper { - - /** - * 根据科室编码查询科室信息 - * - * @param deptCode 科室编码 - * @return 科室信息 - */ - PowerDept getDeptByDeptCode(@Param("deptCode") String deptCode); - - /** - * 更新用户信息 - * - * @param deptModifyParam 科室操作参数 - * @return 数据库更新信息 - */ - int updateDept(@Param("dept") DeptModifyParam deptModifyParam); - - /** - * 添加新科室 - * - * @param deptModifyParam 科室操作参数 - * @return 数据库添加信息 - */ - int addDept(@Param("dept") DeptModifyParam deptModifyParam); - - /** - * 根据科室编码删除科室信息 - * - * @param deptCode 科室编码 - * @return 数据库删除信息 - */ - int delDeptByDeptCode(@Param("deptCode") String deptCode); -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerThirdLoginMapper.java b/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerThirdLoginMapper.java deleted file mode 100644 index d1eb40b..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerThirdLoginMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.docus.server.sys.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.sys.common.DSKeyConstants; -import com.docus.server.sys.common.pojo.entity.PowerThirdLogin; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 第三方登陆 Mapper 接口 - *

- * - * @author jiashi - * @since 2021-04-26 - */ -@DS(DSKeyConstants.DS_KEY) -@Mapper -public interface PowerThirdLoginMapper extends BaseMapper { - -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerUserMapper.java b/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerUserMapper.java deleted file mode 100644 index 5645369..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerUserMapper.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.docus.server.sys.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.sys.common.DSKeyConstants; -import com.docus.server.sys.common.pojo.dto.UserModifyParam; -import com.docus.server.sys.common.pojo.entity.PowerUser; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 用户表 baseMapper - *

- * - * @author wen yongbin - * @since 2023年2月25日22:28:58 - */ -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface PowerUserMapper extends BaseMapper { - - /** - * 根据用户工号查询用户信息 - * - * @param userName 用户工号 - * @return 用户信息 - */ - PowerUser getUserByUserName(@Param("userName") String userName); - - /** - * 更新用户信息 - * - * @param userModifyParam 用户操作参数 - * @return 数据库更新信息 - */ - int updateUser(@Param("user") UserModifyParam userModifyParam); - - /** - * 添加新用户 - * - * @param userModifyParam 用户操作参数 - * @return 数据库添加信息 - */ - int addUser(@Param("user") UserModifyParam userModifyParam); - - /** - * 根据用户工号删除用户信息 - * - * @param userName 用户工号 - * @return 数据库删除信息 - */ - int delUserByUserName(@Param("userName") String userName); -} 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 deleted file mode 100644 index 64eb5c4..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.docus.server.sys.service; - -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; - -import java.util.List; - -public interface IPowerDeptService extends IBaseService { - - /** - * 科室注册 - * - * @param deptDto 用户注册参数 - * @return 处理结果 - */ - boolean insertOrUpdatePowerDept(DeptDTO deptDto); - - /** - * 根据科室编号删除科室 - * - * @param deptCode 科室编码 - * @return 删除结果 - */ - boolean delDeptByDeptCode(String deptCode); - - /** - * 批量新增或修改 - * - * @param deptDTOList - */ - void batchInsertOrUpdatePowerDept(List deptDTOList); -} 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 deleted file mode 100644 index c75a08f..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.docus.server.sys.service; - -import com.docus.server.common.service.IBaseService; -import com.docus.server.sys.common.pojo.entity.PowerThirdLogin; - -/** - *

- * 第三方登陆 服务类 - *

- * - * @author jiashi - * @since 2021-04-26 - */ -public interface IPowerThirdLoginService extends IBaseService { - -} 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 deleted file mode 100644 index 3c3085f..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.docus.server.sys.service; - -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; - -import java.util.List; - -/** - * 用户服务 - */ -public interface IPowerUserService extends IBaseService { - /** - * 用户注册 - * - * @param userDTO 用户注册参数 - * @return 处理结果 - */ - boolean insertOrUpdatePowerUser(UserDTO userDTO); - - /** - * 根据用户工号删除用户 - * - * @param userName 用户工号 - * @return 删除结果 - */ - boolean delUserByUserName(String userName); - - /** - * 批量保存 - * - * @param users - */ - void batchInsertOrUpdatePowerUser(List users); -} 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 deleted file mode 100644 index 828713d..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.docus.server.sys.service.impl; - -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.sys.common.pojo.dto.DeptDTO; -import com.docus.server.sys.common.pojo.dto.DeptModifyParam; -import com.docus.server.sys.common.pojo.entity.PowerDept; -import com.docus.server.sys.mapper.PowerDeptMapper; -import com.docus.server.sys.service.IPowerDeptService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 科室服务实现 - * - * @author wyb - */ -@Service -public class PowerDeptServiceImpl extends BaseServiceImpl implements IPowerDeptService { - @Resource - private IdService idService; - - @Transactional - @Override - public void batchInsertOrUpdatePowerDept(List deptDTOList) { - deptDTOList.forEach(this::insertOrUpdatePowerDept); - } - - @Transactional - @Override - public boolean insertOrUpdatePowerDept(DeptDTO deptDTO) { - PowerDept powerDept = baseMapper.getDeptByDeptCode(deptDTO.getDeptCode()); - DeptModifyParam deptModifyParam = deptDTO.transDeptAddParam(); - if (Func.isEmpty(powerDept)) { - long deptId = idService.getDateSeq(); - deptModifyParam.setDeptId(deptId); - baseMapper.addDept(deptModifyParam); - return true; - } - deptModifyParam.setDeptId(powerDept.getDeptId()); - baseMapper.updateDept(deptModifyParam); - return true; - } - - @Transactional - @Override - public boolean delDeptByDeptCode(String deptCode) { - PowerDept powerDept = baseMapper.getDeptByDeptCode(deptCode); - if (Func.isEmpty(powerDept)) { - return true; - } - baseMapper.delDeptByDeptCode(deptCode); - return true; - } -} 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 deleted file mode 100644 index a16918b..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.docus.server.sys.service.impl; - -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; -import org.springframework.stereotype.Service; - -/** - *

- * 第三方登陆 服务实现类 - *

- * - * @author jiashi - * @since 2021-04-26 - */ -@Service -public class PowerThirdLoginServiceImpl extends BaseServiceImpl implements 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 deleted file mode 100644 index 0bf1014..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.docus.server.sys.service.impl; - -import com.docus.core.util.Func; -import com.docus.infrastructure.redis.service.IdService; -import com.docus.server.common.config.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; -import com.docus.server.sys.mapper.PowerUserMapper; -import com.docus.server.sys.service.IPowerUserService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 用户服务实现 - * - * @author wyb - */ -@Service -public class PowerUserServiceImpl extends BaseServiceImpl implements IPowerUserService { - @Resource - private IdService idService; - @Resource - private UserProperties userProperties; - - @Transactional - @Override - public void batchInsertOrUpdatePowerUser(List userDTOList) { - userDTOList.forEach(this::insertOrUpdatePowerUser); - } - - @Transactional - @Override - public boolean insertOrUpdatePowerUser(UserDTO userDTO) { - PowerUser powerUser = baseMapper.getUserByUserName(userDTO.getUserName()); - UserModifyParam userModifyParam = userDTO.transUserAddParam(); - if (Func.isEmpty(powerUser)) { - long userId = idService.getDateSeq(); - userModifyParam.setUserId(userId); - userModifyParam.setUserPwd(userProperties.getPassword()); - baseMapper.addUser(userModifyParam); - return true; - } - userModifyParam.setUserId(powerUser.getUserId()); - baseMapper.updateUser(userModifyParam); - return true; - } - - @Transactional - @Override - public boolean delUserByUserName(String userName) { - PowerUser powerUser = baseMapper.getUserByUserName(userName); - if (Func.isEmpty(powerUser)) { - return true; - } - baseMapper.delUserByUserName(userName); - return true; - } - - -} diff --git a/docus-sys/src/main/resources/mapper/PowerDeptMapper.xml b/docus-sys/src/main/resources/mapper/PowerDeptMapper.xml deleted file mode 100644 index f387507..0000000 --- a/docus-sys/src/main/resources/mapper/PowerDeptMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - INSERT INTO `docus_system`.`power_dept`(`dept_id`, - `dept_code`, - `dept_name`, - `create_date`, - `creater`, - `update_date`, - `updater`) - VALUES (#{dept.deptId},#{dept.deptCode},#{dept.deptName},now(),#{dept.authorName},now(),#{dept.authorName}) - - - update `docus_system`.`power_dept` set - `dept_name`=#{dept.deptName}, - `updater`=#{dept.authorName}, - `update_date`=now() - where `dept_code`=#{dept.deptCode} - - - delete from `docus_system`.`power_dept` where `dept_code` = #{deptCode} - - - - diff --git a/docus-sys/src/main/resources/mapper/PowerUserMapper.xml b/docus-sys/src/main/resources/mapper/PowerUserMapper.xml deleted file mode 100644 index 9b1edd1..0000000 --- a/docus-sys/src/main/resources/mapper/PowerUserMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - INSERT INTO `docus_system`.`power_user`(`user_id`, - `user_name`, - `name`, - `user_pwd`, - `user_position`, - `role_id`, - `dept_id`, - `create_date`, - `creater`, - `update_date`, - `updater`) - VALUES (#{user.userId},#{user.userName},#{user.name},#{user.userPwd},#{user.position},#{user.roleId} - ,#{user.deptId},now(),#{user.authorName},now(),#{user.authorName}) - - - update `docus_system`.`power_user` set - `updater`=#{user.authorName}, - `dept_id`=#{user.deptId}, - `user_position`=#{user.position}, - `name`=#{user.name}, - `update_date`=now() - where `user_id`=#{user.userId} - - - delete from `docus_system`.`power_user` where `user_name` = #{userName} - - - - diff --git a/ecg-sysem/pom.xml b/ecg-sysem/pom.xml deleted file mode 100644 index a046227..0000000 --- a/ecg-sysem/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - ecg-sysem - Archetype - ecg-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/ecg-mapper - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/common/DSKeyConstants.java b/ecg-sysem/src/main/java/com/docus/server/ecg/common/DSKeyConstants.java deleted file mode 100644 index e88ca48..0000000 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.ecg.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "ecg"; - -} diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/common/annotation/CacheLayer.java b/ecg-sysem/src/main/java/com/docus/server/ecg/common/annotation/CacheLayer.java deleted file mode 100644 index 1b7758c..0000000 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.ecg.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/cache/DeptCacheLayer.java b/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index f0885ff..0000000 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.ecg.infrastructure.cache; - - -public class DeptCacheLayer { -} diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/client/DownLoadAPI.java b/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index ea8c2a9..0000000 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.ecg.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgDeptMapper.java b/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgDeptMapper.java deleted file mode 100644 index 3d05222..0000000 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgDeptMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.docus.server.ecg.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.ecg.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface EcgDeptMapper { - - List> page(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - - List> BatchForJZH(@Param("jzhs") List jzhs); - - List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForEXAMTIME(@Param("datas") List> datas); - -} 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 deleted file mode 100644 index e43dd0c..0000000 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.common.pojo.dto.TBasicDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface EcgTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgUserMapper.java b/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgUserMapper.java deleted file mode 100644 index d85cb2b..0000000 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.sys.common.pojo.dto.UserDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface EcgUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index 91ac5c6..0000000 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.docus.server.ecg.service; - -import com.docus.server.client.api.IHospitalApi; - -public interface IEcgService extends IHospitalApi { -} 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 deleted file mode 100644 index ff5c521..0000000 --- a/ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.docus.server.ecg.service.impl; - -import com.docus.server.ecg.common.DSKeyConstants; -import com.docus.server.ecg.infrastructure.mapper.EcgDeptMapper; -import com.docus.server.ecg.service.IEcgService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Component(DSKeyConstants.DS_KEY + "ServiceImpl") -@AllArgsConstructor -public class EcgServiceImpl implements IEcgService { - - private final EcgDeptMapper ecgDeptMapper; - - @Override - public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { - return ecgDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List> BatchForJZH(List jzhs) { - return ecgDeptMapper.BatchForJZH(jzhs); - } - - @Override - public List> BatchForJZHAndAdmissTimes(List> datas) { - return ecgDeptMapper.BatchForJZHAndAdmissTimes(datas); - } - - @Override - public List> BatchForZYHAndAdmissTimes(List> datas) { - return ecgDeptMapper.BatchForZYHAndAdmissTimes(datas); - } - - @Override - public List> BatchForEXAMTIME(List> datas) { - return ecgDeptMapper.BatchForEXAMTIME(datas); - } - - -} diff --git a/ecg-sysem/src/main/resources/mapper/EcgDeptMapper.xml b/ecg-sysem/src/main/resources/mapper/EcgDeptMapper.xml deleted file mode 100644 index cfab4bc..0000000 --- a/ecg-sysem/src/main/resources/mapper/EcgDeptMapper.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ecg-sysem/src/main/resources/mapper/EcgTBasicMapper.xml b/ecg-sysem/src/main/resources/mapper/EcgTBasicMapper.xml deleted file mode 100644 index 8233ffb..0000000 --- a/ecg-sysem/src/main/resources/mapper/EcgTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ecg-sysem/src/main/resources/mapper/EcgUserMapper.xml b/ecg-sysem/src/main/resources/mapper/EcgUserMapper.xml deleted file mode 100644 index f2d7de3..0000000 --- a/ecg-sysem/src/main/resources/mapper/EcgUserMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/emr-sysem/pom.xml b/emr-sysem/pom.xml deleted file mode 100644 index f64b64d..0000000 --- a/emr-sysem/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - emr-sysem - Archetype - emr-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/emr-mapper - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/emr-sysem/src/main/java/com/docus/server/emr/common/DSKeyConstants.java b/emr-sysem/src/main/java/com/docus/server/emr/common/DSKeyConstants.java deleted file mode 100644 index 3a877af..0000000 --- a/emr-sysem/src/main/java/com/docus/server/emr/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.emr.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "emr"; - -} diff --git a/emr-sysem/src/main/java/com/docus/server/emr/common/annotation/CacheLayer.java b/emr-sysem/src/main/java/com/docus/server/emr/common/annotation/CacheLayer.java deleted file mode 100644 index 0c13890..0000000 --- a/emr-sysem/src/main/java/com/docus/server/emr/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.emr.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/cache/DeptCacheLayer.java b/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index 4ee2ead..0000000 --- a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.emr.infrastructure.cache; - - -public class DeptCacheLayer { -} diff --git a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/client/DownLoadAPI.java b/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index daeb567..0000000 --- a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.emr.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrDeptMapper.java b/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrDeptMapper.java deleted file mode 100644 index 931a4f4..0000000 --- a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrDeptMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.docus.server.emr.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.emr.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface EmrDeptMapper { - - List> page(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - - List> BatchForJZH(@Param("jzhs") List jzhs); - - List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForEXAMTIME(@Param("datas") List> datas); - -} 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 deleted file mode 100644 index e151250..0000000 --- a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.common.pojo.dto.TBasicDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface EmrTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrUserMapper.java b/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrUserMapper.java deleted file mode 100644 index 35383c9..0000000 --- a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.sys.common.pojo.dto.UserDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface EmrUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index 78feca3..0000000 --- a/emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.docus.server.emr.service; - -import com.docus.server.client.api.IHospitalApi; - -public interface IEmrService extends IHospitalApi { -} 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 deleted file mode 100644 index e102118..0000000 --- a/emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.docus.server.emr.service.impl; - -import com.docus.server.emr.common.DSKeyConstants; -import com.docus.server.emr.infrastructure.mapper.EmrDeptMapper; -import com.docus.server.emr.service.IEmrService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Component(DSKeyConstants.DS_KEY + "ServiceImpl") -@AllArgsConstructor -public class EmrServiceImpl implements IEmrService { - - private final EmrDeptMapper emrDeptMapper; - - @Override - public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { - return emrDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List> BatchForJZH(List jzhs) { - return emrDeptMapper.BatchForJZH(jzhs); - } - - @Override - public List> BatchForJZHAndAdmissTimes(List> datas) { - return emrDeptMapper.BatchForJZHAndAdmissTimes(datas); - } - - @Override - public List> BatchForZYHAndAdmissTimes(List> datas) { - return emrDeptMapper.BatchForZYHAndAdmissTimes(datas); - } - - @Override - public List> BatchForEXAMTIME(List> datas) { - return emrDeptMapper.BatchForEXAMTIME(datas); - } - - -} diff --git a/emr-sysem/src/main/resources/mapper/EmrDeptMapper.xml b/emr-sysem/src/main/resources/mapper/EmrDeptMapper.xml deleted file mode 100644 index 2ab3ee7..0000000 --- a/emr-sysem/src/main/resources/mapper/EmrDeptMapper.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/emr-sysem/src/main/resources/mapper/EmrTBasicMapper.xml b/emr-sysem/src/main/resources/mapper/EmrTBasicMapper.xml deleted file mode 100644 index dbca15e..0000000 --- a/emr-sysem/src/main/resources/mapper/EmrTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/emr-sysem/src/main/resources/mapper/EmrUserMapper.xml b/emr-sysem/src/main/resources/mapper/EmrUserMapper.xml deleted file mode 100644 index b820f05..0000000 --- a/emr-sysem/src/main/resources/mapper/EmrUserMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/his-sysem/pom.xml b/his-sysem/pom.xml deleted file mode 100644 index e6327aa..0000000 --- a/his-sysem/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - his-sysem - Archetype - his-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/his-mapper - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/his-sysem/src/main/java/com/docus/server/his/common/DSKeyConstants.java b/his-sysem/src/main/java/com/docus/server/his/common/DSKeyConstants.java deleted file mode 100644 index 6263b29..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.his.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "his"; - -} diff --git a/his-sysem/src/main/java/com/docus/server/his/common/annotation/CacheLayer.java b/his-sysem/src/main/java/com/docus/server/his/common/annotation/CacheLayer.java deleted file mode 100644 index 7c4fe59..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.his.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/cache/DeptCacheLayer.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index 991c5da..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.his.infrastructure.cache; - -public class DeptCacheLayer { -} diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/client/DownLoadAPI.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index ec85272..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.his.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java deleted file mode 100644 index 6ade2f4..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.sys.common.pojo.dto.DeptDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface HisDeptMapper { - - List getDeptListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index a03c581..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.common.pojo.dto.TBasicDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface HisTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java deleted file mode 100644 index 48e9597..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.sys.common.pojo.dto.UserDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface HisUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index cb38700..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.docus.server.his.service; - -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 java.util.Date; -import java.util.List; - -public interface IHisService { - List getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize); - - List getUserListView(Date startDate, Date endDate, int pageNum, int pageSize); - - List getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize); -} 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 deleted file mode 100644 index ca711f0..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/service/impl/HisServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.docus.server.his.service.impl; - -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.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; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - -@Component -@AllArgsConstructor -public class HisServiceImpl implements IHisService { - - private final HisDeptMapper hisDeptMapper; - private final HisUserMapper hisUserMapper; - private final HisTBasicMapper hisTBasicMapper; - - @Override - public List getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) { - return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - - @Override - public List getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) { - return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) { - return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - -} diff --git a/his-sysem/src/main/resources/mapper/HisDeptMapper.xml b/his-sysem/src/main/resources/mapper/HisDeptMapper.xml deleted file mode 100644 index 5e0045f..0000000 --- a/his-sysem/src/main/resources/mapper/HisDeptMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/his-sysem/src/main/resources/mapper/HisTBasicMapper.xml b/his-sysem/src/main/resources/mapper/HisTBasicMapper.xml deleted file mode 100644 index 8ec7c65..0000000 --- a/his-sysem/src/main/resources/mapper/HisTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/his-sysem/src/main/resources/mapper/HisUserMapper.xml b/his-sysem/src/main/resources/mapper/HisUserMapper.xml deleted file mode 100644 index 06f1cb4..0000000 --- a/his-sysem/src/main/resources/mapper/HisUserMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/hl-sysem/pom.xml b/hl-sysem/pom.xml deleted file mode 100644 index 5e2b9ae..0000000 --- a/hl-sysem/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - hl-sysem - Archetype - hl-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/hl-mapper - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/hl-sysem/src/main/java/com/docus/server/hl/common/DSKeyConstants.java b/hl-sysem/src/main/java/com/docus/server/hl/common/DSKeyConstants.java deleted file mode 100644 index 4f516d7..0000000 --- a/hl-sysem/src/main/java/com/docus/server/hl/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.hl.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "hl"; - -} diff --git a/hl-sysem/src/main/java/com/docus/server/hl/common/annotation/CacheLayer.java b/hl-sysem/src/main/java/com/docus/server/hl/common/annotation/CacheLayer.java deleted file mode 100644 index 83c3574..0000000 --- a/hl-sysem/src/main/java/com/docus/server/hl/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.hl.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/cache/DeptCacheLayer.java b/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index f99e87c..0000000 --- a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.hl.infrastructure.cache; - -public class DeptCacheLayer { -} diff --git a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/client/DownLoadAPI.java b/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index 6f9b836..0000000 --- a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.hl.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlDeptMapper.java b/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlDeptMapper.java deleted file mode 100644 index c450a1b..0000000 --- a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlDeptMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.docus.server.hl.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.hl.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface HlDeptMapper { - - List> page(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - - List> BatchForJZH(@Param("jzhs") List jzhs); - - List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForEXAMTIME(@Param("datas") List> datas); - - -} 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 deleted file mode 100644 index 0b4f427..0000000 --- a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.common.pojo.dto.TBasicDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface HlTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlUserMapper.java b/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlUserMapper.java deleted file mode 100644 index 8244661..0000000 --- a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.sys.common.pojo.dto.UserDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface HlUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index 39fb625..0000000 --- a/hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.docus.server.hl.service; - -import com.docus.server.client.api.IHospitalApi; - -public interface IHlService extends IHospitalApi { -} 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 deleted file mode 100644 index ca9db3d..0000000 --- a/hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.docus.server.hl.service.impl; - -import com.docus.server.hl.common.DSKeyConstants; -import com.docus.server.hl.infrastructure.mapper.HlDeptMapper; -import com.docus.server.hl.service.IHlService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Component(DSKeyConstants.DS_KEY + "ServiceImpl") -@AllArgsConstructor -public class HlServiceImpl implements IHlService { - - private final HlDeptMapper hlDeptMapper; - - - @Override - public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { - return hlDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List> BatchForJZH(List jzhs) { - return hlDeptMapper.BatchForJZH(jzhs); - } - - @Override - public List> BatchForJZHAndAdmissTimes(List> datas) { - return hlDeptMapper.BatchForJZHAndAdmissTimes(datas); - } - - @Override - public List> BatchForZYHAndAdmissTimes(List> datas) { - return hlDeptMapper.BatchForZYHAndAdmissTimes(datas); - } - - @Override - public List> BatchForEXAMTIME(List> datas) { - return hlDeptMapper.BatchForEXAMTIME(datas); - } - -} diff --git a/hl-sysem/src/main/resources/mapper/HlDeptMapper.xml b/hl-sysem/src/main/resources/mapper/HlDeptMapper.xml deleted file mode 100644 index 1ce6a3d..0000000 --- a/hl-sysem/src/main/resources/mapper/HlDeptMapper.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hl-sysem/src/main/resources/mapper/HlTBasicMapper.xml b/hl-sysem/src/main/resources/mapper/HlTBasicMapper.xml deleted file mode 100644 index 73d347a..0000000 --- a/hl-sysem/src/main/resources/mapper/HlTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/hl-sysem/src/main/resources/mapper/HlUserMapper.xml b/hl-sysem/src/main/resources/mapper/HlUserMapper.xml deleted file mode 100644 index 178fc31..0000000 --- a/hl-sysem/src/main/resources/mapper/HlUserMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/issubmit-sysem/pom.xml b/issubmit-sysem/pom.xml deleted file mode 100644 index 93b65a9..0000000 --- a/issubmit-sysem/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - issubmit-sysem - Archetype - issubmit-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/issubmit-mapper - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/common/DSKeyConstants.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/common/DSKeyConstants.java deleted file mode 100644 index 3956639..0000000 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.issubmit.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "issubmit"; - -} diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/common/annotation/CacheLayer.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/common/annotation/CacheLayer.java deleted file mode 100644 index 7339347..0000000 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.issubmit.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/cache/DeptCacheLayer.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index fff7348..0000000 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.issubmit.infrastructure.cache; - - -public class DeptCacheLayer { -} diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/client/DownLoadAPI.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index 2758faf..0000000 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.issubmit.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitDeptMapper.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitDeptMapper.java deleted file mode 100644 index f5715e8..0000000 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitDeptMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.docus.server.issubmit.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.issubmit.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface IssubmitDeptMapper { - - List> page(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - - List> BatchForJZH(@Param("jzhs") List jzhs); - - List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForEXAMTIME(@Param("datas") List> datas); - - -} 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 deleted file mode 100644 index 6b57e36..0000000 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.common.pojo.dto.TBasicDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface IssubmitTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitUserMapper.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitUserMapper.java deleted file mode 100644 index ba8c964..0000000 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.sys.common.pojo.dto.UserDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface IssubmitUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index b7baf71..0000000 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.docus.server.issubmit.service; - -import com.docus.server.client.api.IHospitalApi; - -public interface IIssubmitService extends IHospitalApi { -} 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 deleted file mode 100644 index 86232b2..0000000 --- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.docus.server.issubmit.service.impl; - -import com.docus.server.issubmit.common.DSKeyConstants; -import com.docus.server.issubmit.infrastructure.mapper.IssubmitDeptMapper; -import com.docus.server.issubmit.service.IIssubmitService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Component(DSKeyConstants.DS_KEY + "ServiceImpl") -@AllArgsConstructor -public class IssubmitServiceImpl implements IIssubmitService { - - private final IssubmitDeptMapper issubmitDeptMapper; - - @Override - public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { - return issubmitDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List> BatchForJZH(List jzhs) { - return issubmitDeptMapper.BatchForJZH(jzhs); - } - - @Override - public List> BatchForJZHAndAdmissTimes(List> datas) { - return issubmitDeptMapper.BatchForJZHAndAdmissTimes(datas); - } - - @Override - public List> BatchForZYHAndAdmissTimes(List> datas) { - return issubmitDeptMapper.BatchForZYHAndAdmissTimes(datas); - } - - @Override - public List> BatchForEXAMTIME(List> datas) { - return issubmitDeptMapper.BatchForEXAMTIME(datas); - } - -} diff --git a/issubmit-sysem/src/main/resources/mapper/IssubmitDeptMapper.xml b/issubmit-sysem/src/main/resources/mapper/IssubmitDeptMapper.xml deleted file mode 100644 index c6c0764..0000000 --- a/issubmit-sysem/src/main/resources/mapper/IssubmitDeptMapper.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/issubmit-sysem/src/main/resources/mapper/IssubmitTBasicMapper.xml b/issubmit-sysem/src/main/resources/mapper/IssubmitTBasicMapper.xml deleted file mode 100644 index e806b8f..0000000 --- a/issubmit-sysem/src/main/resources/mapper/IssubmitTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/issubmit-sysem/src/main/resources/mapper/IssubmitUserMapper.xml b/issubmit-sysem/src/main/resources/mapper/IssubmitUserMapper.xml deleted file mode 100644 index 2ef4746..0000000 --- a/issubmit-sysem/src/main/resources/mapper/IssubmitUserMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/lis-sysem/pom.xml b/lis-sysem/pom.xml deleted file mode 100644 index 2b67944..0000000 --- a/lis-sysem/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - lis-sysem - Archetype - lis-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/lis-mapper - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/lis-sysem/src/main/java/com/docus/server/lis/common/DSKeyConstants.java b/lis-sysem/src/main/java/com/docus/server/lis/common/DSKeyConstants.java deleted file mode 100644 index e87440a..0000000 --- a/lis-sysem/src/main/java/com/docus/server/lis/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.lis.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "lis"; - -} diff --git a/lis-sysem/src/main/java/com/docus/server/lis/common/annotation/CacheLayer.java b/lis-sysem/src/main/java/com/docus/server/lis/common/annotation/CacheLayer.java deleted file mode 100644 index 778f7bb..0000000 --- a/lis-sysem/src/main/java/com/docus/server/lis/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.lis.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/cache/DeptCacheLayer.java b/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index 1b26351..0000000 --- a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.lis.infrastructure.cache; - - -public class DeptCacheLayer { -} diff --git a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/client/DownLoadAPI.java b/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index afec7e2..0000000 --- a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.lis.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisDeptMapper.java b/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisDeptMapper.java deleted file mode 100644 index a9d8116..0000000 --- a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisDeptMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.docus.server.lis.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.lis.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface LisDeptMapper { - - List> page(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - - List> BatchForJZH(@Param("jzhs") List jzhs); - - List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForEXAMTIME(@Param("datas") List> datas); -} 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 deleted file mode 100644 index 1faf17d..0000000 --- a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.common.pojo.dto.TBasicDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface LisTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisUserMapper.java b/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisUserMapper.java deleted file mode 100644 index 2dfe025..0000000 --- a/lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.sys.common.pojo.dto.UserDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface LisUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index c36f702..0000000 --- a/lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.docus.server.lis.service; - -import com.docus.server.client.api.IHospitalApi; - -public interface ILisService extends IHospitalApi { - - void get(); - -} 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 deleted file mode 100644 index 3e26959..0000000 --- a/lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.docus.server.lis.service.impl; - -import com.docus.server.lis.common.DSKeyConstants; -import com.docus.server.lis.infrastructure.mapper.LisDeptMapper; -import com.docus.server.lis.service.ILisService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Component(DSKeyConstants.DS_KEY + "ServiceImpl") -@AllArgsConstructor -public class LisServiceImpl implements ILisService { - - private final LisDeptMapper hisDeptMapper; - - @Override - public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { - return hisDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List> BatchForJZH(List jzhs) { - return hisDeptMapper.BatchForJZH(jzhs); - } - - @Override - public List> BatchForJZHAndAdmissTimes(List> datas) { - return hisDeptMapper.BatchForJZHAndAdmissTimes(datas); - } - - @Override - public List> BatchForZYHAndAdmissTimes(List> datas) { - return hisDeptMapper.BatchForZYHAndAdmissTimes(datas); - } - - @Override - public List> BatchForEXAMTIME(List> datas) { - return hisDeptMapper.BatchForEXAMTIME(datas); - } - - @Override - public void get() { - - } -} diff --git a/lis-sysem/src/main/resources/mapper/LisDeptMapper.xml b/lis-sysem/src/main/resources/mapper/LisDeptMapper.xml deleted file mode 100644 index 61b658e..0000000 --- a/lis-sysem/src/main/resources/mapper/LisDeptMapper.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lis-sysem/src/main/resources/mapper/LisTBasicMapper.xml b/lis-sysem/src/main/resources/mapper/LisTBasicMapper.xml deleted file mode 100644 index 8809c6e..0000000 --- a/lis-sysem/src/main/resources/mapper/LisTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/lis-sysem/src/main/resources/mapper/LisUserMapper.xml b/lis-sysem/src/main/resources/mapper/LisUserMapper.xml deleted file mode 100644 index 00d71da..0000000 --- a/lis-sysem/src/main/resources/mapper/LisUserMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/pacs-sysem/pom.xml b/pacs-sysem/pom.xml deleted file mode 100644 index 9575f25..0000000 --- a/pacs-sysem/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - pacs-sysem - Archetype - pacs-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/pacs-mapper - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/common/DSKeyConstants.java b/pacs-sysem/src/main/java/com/docus/server/pacs/common/DSKeyConstants.java deleted file mode 100644 index 7e0d95f..0000000 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.pacs.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "pacs"; - -} diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/common/annotation/CacheLayer.java b/pacs-sysem/src/main/java/com/docus/server/pacs/common/annotation/CacheLayer.java deleted file mode 100644 index cf1589c..0000000 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.pacs.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/cache/DeptCacheLayer.java b/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index e0b2992..0000000 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.pacs.infrastructure.cache; - - -public class DeptCacheLayer { -} diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/client/DownLoadAPI.java b/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index 895a437..0000000 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.pacs.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsDeptMapper.java b/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsDeptMapper.java deleted file mode 100644 index 0268dda..0000000 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsDeptMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.docus.server.pacs.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.pacs.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface PacsDeptMapper { - - List> page(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - - List> BatchForJZH(@Param("jzhs") List jzhs); - - List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForEXAMTIME(@Param("datas") List> datas); - - -} 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 deleted file mode 100644 index 5810a43..0000000 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.common.pojo.dto.TBasicDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface PacsTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsUserMapper.java b/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsUserMapper.java deleted file mode 100644 index 0ac01a9..0000000 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -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.sys.common.pojo.dto.UserDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface PacsUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index bc999e5..0000000 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.docus.server.pacs.service; - -import com.docus.server.client.api.IHospitalApi; - -public interface IPacsService extends IHospitalApi { -} 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 deleted file mode 100644 index dd0a2f7..0000000 --- a/pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.docus.server.pacs.service.impl; - -import com.docus.server.pacs.common.DSKeyConstants; -import com.docus.server.pacs.infrastructure.mapper.PacsDeptMapper; -import com.docus.server.pacs.service.IPacsService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Component(DSKeyConstants.DS_KEY + "ServiceImpl") -@AllArgsConstructor -public class PacsServiceImpl implements IPacsService { - - private final PacsDeptMapper pacsDeptMapper; - - @Override - public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { - return pacsDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List> BatchForJZH(List jzhs) { - return pacsDeptMapper.BatchForJZH(jzhs); - } - - @Override - public List> BatchForJZHAndAdmissTimes(List> datas) { - return pacsDeptMapper.BatchForJZHAndAdmissTimes(datas); - } - - @Override - public List> BatchForZYHAndAdmissTimes(List> datas) { - return pacsDeptMapper.BatchForZYHAndAdmissTimes(datas); - } - - @Override - public List> BatchForEXAMTIME(List> datas) { - return pacsDeptMapper.BatchForEXAMTIME(datas); - } - - -} diff --git a/pacs-sysem/src/main/resources/mapper/PacsDeptMapper.xml b/pacs-sysem/src/main/resources/mapper/PacsDeptMapper.xml deleted file mode 100644 index 2e97219..0000000 --- a/pacs-sysem/src/main/resources/mapper/PacsDeptMapper.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pacs-sysem/src/main/resources/mapper/PacsTBasicMapper.xml b/pacs-sysem/src/main/resources/mapper/PacsTBasicMapper.xml deleted file mode 100644 index 6197cb5..0000000 --- a/pacs-sysem/src/main/resources/mapper/PacsTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/pacs-sysem/src/main/resources/mapper/PacsUserMapper.xml b/pacs-sysem/src/main/resources/mapper/PacsUserMapper.xml deleted file mode 100644 index bb81518..0000000 --- a/pacs-sysem/src/main/resources/mapper/PacsUserMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index a3c2379..a765a29 100644 --- a/pom.xml +++ b/pom.xml @@ -12,21 +12,10 @@ docus-collector-server pom - docus-sys - docus-medical-record - docus-archivefile - his-sysem - common-collect collect-sdry - bl-sysem - ecg-sysem - emr-sysem - hl-sysem - issubmit-sysem - lis-sysem - pacs-sysem - vte-sysem - zz-sysem + common-collect + common-docus + common-sysem docus-api-common docus-client-interface @@ -71,12 +60,6 @@ - - org.projectlombok - lombok - 1.18.16 - compile - org.projectlombok lombok diff --git a/vte-sysem/pom.xml b/vte-sysem/pom.xml deleted file mode 100644 index 887bd70..0000000 --- a/vte-sysem/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - vte-sysem - Archetype - vte-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/vte-mapper - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/vte-sysem/src/main/java/com/docus/server/vte/common/DSKeyConstants.java b/vte-sysem/src/main/java/com/docus/server/vte/common/DSKeyConstants.java deleted file mode 100644 index 80a470e..0000000 --- a/vte-sysem/src/main/java/com/docus/server/vte/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.vte.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "vte"; - -} diff --git a/vte-sysem/src/main/java/com/docus/server/vte/common/annotation/CacheLayer.java b/vte-sysem/src/main/java/com/docus/server/vte/common/annotation/CacheLayer.java deleted file mode 100644 index c88578b..0000000 --- a/vte-sysem/src/main/java/com/docus/server/vte/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.vte.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/cache/DeptCacheLayer.java b/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index aa8f95f..0000000 --- a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.server.vte.infrastructure.cache; - - -public class DeptCacheLayer { -} diff --git a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/client/DownLoadAPI.java b/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index f4c211f..0000000 --- a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.vte.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteDeptMapper.java b/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteDeptMapper.java deleted file mode 100644 index 1df8b95..0000000 --- a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteDeptMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.docus.server.vte.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.vte.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface VteDeptMapper { - - List> page(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - - List> BatchForJZH(@Param("jzhs") List jzhs); - - List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForEXAMTIME(@Param("datas") List> datas); - -} 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 deleted file mode 100644 index 5efe82b..0000000 --- a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.docus.server.vte.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -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; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface VteTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteUserMapper.java b/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteUserMapper.java deleted file mode 100644 index 4fbe296..0000000 --- a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.docus.server.vte.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.sys.common.pojo.dto.UserDTO; -import com.docus.server.vte.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface VteUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index 4ba9052..0000000 --- a/vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.docus.server.vte.service; - -import com.docus.server.client.api.IHospitalApi; - -public interface IVteService extends IHospitalApi { -} 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 deleted file mode 100644 index 5f6df8c..0000000 --- a/vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.docus.server.vte.service.impl; - -import com.docus.server.vte.infrastructure.mapper.VteDeptMapper; -import com.docus.server.vte.service.IVteService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Component -@AllArgsConstructor -public class VteServiceImpl implements IVteService { - - private final VteDeptMapper vteDeptMapper; - - @Override - public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { - return vteDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List> BatchForJZH(List jzhs) { - return vteDeptMapper.BatchForJZH(jzhs); - } - - @Override - public List> BatchForJZHAndAdmissTimes(List> datas) { - return vteDeptMapper.BatchForJZHAndAdmissTimes(datas); - } - - @Override - public List> BatchForZYHAndAdmissTimes(List> datas) { - return vteDeptMapper.BatchForZYHAndAdmissTimes(datas); - } - - @Override - public List> BatchForEXAMTIME(List> datas) { - return vteDeptMapper.BatchForEXAMTIME(datas); - } - - -} diff --git a/vte-sysem/src/main/resources/mapper/VteDeptMapper.xml b/vte-sysem/src/main/resources/mapper/VteDeptMapper.xml deleted file mode 100644 index 7a8d88f..0000000 --- a/vte-sysem/src/main/resources/mapper/VteDeptMapper.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vte-sysem/src/main/resources/mapper/VteTBasicMapper.xml b/vte-sysem/src/main/resources/mapper/VteTBasicMapper.xml deleted file mode 100644 index 18e60d0..0000000 --- a/vte-sysem/src/main/resources/mapper/VteTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/vte-sysem/src/main/resources/mapper/VteUserMapper.xml b/vte-sysem/src/main/resources/mapper/VteUserMapper.xml deleted file mode 100644 index c217422..0000000 --- a/vte-sysem/src/main/resources/mapper/VteUserMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/zz-sysem/pom.xml b/zz-sysem/pom.xml deleted file mode 100644 index c248576..0000000 --- a/zz-sysem/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - docus-collector-server - com.docus - 1.0-SNAPSHOT - - 4.0.0 - zz-sysem - Archetype - zz-sysem - http://maven.apache.org - - - com.docus - docus-sys - 1.0-SNAPSHOT - compile - - - com.docus - docus-medical-record - 1.0-SNAPSHOT - compile - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - package - - copy-resources - - - - - src/main/resources/mapper - - **/*.* - - - - ../collect-sdry/target/collect-sdry/mybatis.mapper/zz-mapper - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - **/*.xml - - - - - - diff --git a/zz-sysem/src/main/java/com/docus/server/zz/common/DSKeyConstants.java b/zz-sysem/src/main/java/com/docus/server/zz/common/DSKeyConstants.java deleted file mode 100644 index e6ade66..0000000 --- a/zz-sysem/src/main/java/com/docus/server/zz/common/DSKeyConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.docus.server.zz.common; - -/** - * @author linrf - * @date 2023/6/9 11:19 - */ -public class DSKeyConstants { - - public static final String DS_KEY = "zz"; - -} diff --git a/zz-sysem/src/main/java/com/docus/server/zz/common/annotation/CacheLayer.java b/zz-sysem/src/main/java/com/docus/server/zz/common/annotation/CacheLayer.java deleted file mode 100644 index 22f1a10..0000000 --- a/zz-sysem/src/main/java/com/docus/server/zz/common/annotation/CacheLayer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.zz.common.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Component -public @interface CacheLayer { - String value() default ""; -} diff --git a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/cache/DeptCacheLayer.java b/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/cache/DeptCacheLayer.java deleted file mode 100644 index 9723d4b..0000000 --- a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/cache/DeptCacheLayer.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.zz.infrastructure.cache; - -public class DeptCacheLayer { -} diff --git a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/client/DownLoadAPI.java b/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/client/DownLoadAPI.java deleted file mode 100644 index d7b706c..0000000 --- a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/client/DownLoadAPI.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.docus.server.zz.infrastructure.client; - -public class DownLoadAPI { -} diff --git a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzDeptMapper.java b/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzDeptMapper.java deleted file mode 100644 index 6132acb..0000000 --- a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzDeptMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.docus.server.zz.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.zz.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface ZzDeptMapper { - - List> page(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - - List> BatchForJZH(@Param("jzhs") List jzhs); - - List> BatchForJZHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForZYHAndAdmissTimes(@Param("datas") List> datas); - - List> BatchForEXAMTIME(@Param("datas") List> datas); - - -} 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 deleted file mode 100644 index 959c557..0000000 --- a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzTBasicMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.docus.server.zz.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -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; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface ZzTBasicMapper { - - List getTBasicListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} diff --git a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzUserMapper.java b/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzUserMapper.java deleted file mode 100644 index f1478c0..0000000 --- a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzUserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.docus.server.zz.infrastructure.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.sys.common.pojo.dto.UserDTO; -import com.docus.server.zz.common.DSKeyConstants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -@Mapper -@DS(DSKeyConstants.DS_KEY) -public interface ZzUserMapper { - - List getUserListView(@Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("offset") int offset, - @Param("pageSize") int pageSize); - - -} 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 deleted file mode 100644 index c820b66..0000000 --- a/zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.docus.server.zz.service; - -import com.docus.server.client.api.IHospitalApi; - -public interface IZzService extends IHospitalApi { -} 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 deleted file mode 100644 index 3b34416..0000000 --- a/zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.docus.server.zz.service.impl; - -import com.docus.server.zz.common.DSKeyConstants; -import com.docus.server.zz.infrastructure.mapper.ZzDeptMapper; -import com.docus.server.zz.service.IZzService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Component(DSKeyConstants.DS_KEY + "ServiceImpl") -@AllArgsConstructor -public class ZzServiceImpl implements IZzService { - - private final ZzDeptMapper zzDeptMapper; - - @Override - public List> page(Date startDate, Date endDate, int pageNum, int pageSize) { - return zzDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - @Override - public List> BatchForJZH(List jzhs) { - return zzDeptMapper.BatchForJZH(jzhs); - } - - @Override - public List> BatchForJZHAndAdmissTimes(List> datas) { - return zzDeptMapper.BatchForJZHAndAdmissTimes(datas); - } - - @Override - public List> BatchForZYHAndAdmissTimes(List> datas) { - return zzDeptMapper.BatchForZYHAndAdmissTimes(datas); - } - - @Override - public List> BatchForEXAMTIME(List> datas) { - return zzDeptMapper.BatchForEXAMTIME(datas); - } - - -} diff --git a/zz-sysem/src/main/resources/mapper/ZzDeptMapper.xml b/zz-sysem/src/main/resources/mapper/ZzDeptMapper.xml deleted file mode 100644 index b4f27ea..0000000 --- a/zz-sysem/src/main/resources/mapper/ZzDeptMapper.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/zz-sysem/src/main/resources/mapper/ZzTBasicMapper.xml b/zz-sysem/src/main/resources/mapper/ZzTBasicMapper.xml deleted file mode 100644 index a8e1dad..0000000 --- a/zz-sysem/src/main/resources/mapper/ZzTBasicMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/zz-sysem/src/main/resources/mapper/ZzUserMapper.xml b/zz-sysem/src/main/resources/mapper/ZzUserMapper.xml deleted file mode 100644 index 40d69f4..0000000 --- a/zz-sysem/src/main/resources/mapper/ZzUserMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - -