diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index 3ac23a3..b74c0b3 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/collect-sdry/src/main/resources/bootstrap.yml @@ -10,16 +10,81 @@ spring: primary: master #设置默认的数据源，默认值为master strict: false #是否弃用严格模式，如果启用在味匹配到指定数据源时抛出异常 datasource: + #公司病案的数据库 master: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + username: root + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource + #医院的用户/科室/基础数据的数据库 his: - url: jdbc:log4jdbc:mysql://db.docus.cn:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + 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 + 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 + 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 + 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 + 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 + 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 + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + type: com.alibaba.druid.pool.DruidDataSource + #lis系统数据 + lis: + url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai + username: root + password: root + 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 + 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 + 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 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource # rabbitmq: @@ -27,10 +92,9 @@ spring: # port: 5672 # username: guest # password: guest - redis: host: redis.docus.cn - password: JSdocus@702 + # password: JSdocus@702 cloud: nacos: discovery: @@ -45,9 +109,6 @@ spring: docus: dbtype: mysql - user: - # 用户默认密码 - defpwd: fd29cd53ec12616e5f36b77d4afffbff mybatis-plus: configuration: @@ -57,10 +118,12 @@ mybatis-plus: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: + update-strategy: ignored field-strategy: NOT_EMPTY db-type: MYSQL - mapper-locations: classpath*:/mapper/*Mapper.xml,file:/his-mapper/*Mapper.xml + mapper-locations: classpath*:/mapper/*Mapper.xml,file:mybatis.mapper/**/*Mapper.xml type-enums-package: com.docus.server.collect.web.enums + xxl: job: accessToken: @@ -74,6 +137,14 @@ xxl: logretentiondays: 30 logpath: D:/xxl-job/inspection +api: + soft-delete-column-name=state + soft-delete-column-value=1 +logging: + level: + com: + baomidou: + mybatisplus: DEBUG # #ibm: # mq: @@ -91,4 +162,4 @@ xxl: #rocketmq: # name-server: 127.0.01:9876 # producer: -# group: ta-cipher-encode \ No newline at end of file +# group: ta-cipher-encode diff --git a/common-collect/pom.xml b/common-collect/pom.xml index 104df68..7da6b57 100644 --- a/common-collect/pom.xml +++ b/common-collect/pom.xml @@ -31,7 +31,51 @@ his-sysem 1.0-SNAPSHOT - + + com.docus + bl-sysem + 1.0-SNAPSHOT + + + com.docus + ecg-sysem + 1.0-SNAPSHOT + + + com.docus + emr-sysem + 1.0-SNAPSHOT + + + com.docus + hl-sysem + 1.0-SNAPSHOT + + + com.docus + issubmit-sysem + 1.0-SNAPSHOT + + + com.docus + lis-sysem + 1.0-SNAPSHOT + + + com.docus + pacs-sysem + 1.0-SNAPSHOT + + + com.docus + vte-sysem + 1.0-SNAPSHOT + + + com.docus + zz-sysem + 1.0-SNAPSHOT + org.springframework.retry spring-retry diff --git a/his-sysem/pom.xml b/his-sysem/pom.xml index 670db89..e6327aa 100644 --- a/his-sysem/pom.xml +++ b/his-sysem/pom.xml @@ -59,7 +59,7 @@ - ../collect-sdry/target/collect-sdry/his-mapper + ../collect-sdry/target/collect-sdry/mybatis.mapper/his-mapper 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 new file mode 100644 index 0000000..7c4fe59 --- /dev/null +++ b/his-sysem/src/main/java/com/docus/server/his/common/annotation/CacheLayer.java @@ -0,0 +1,13 @@ +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/HisSysDao.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java deleted file mode 100644 index aa4e7f9..0000000 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.docus.server.his.infrastructure; - -import com.docus.core.util.json.JSON; -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.record.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 HisSysDao { - - private final HisDeptMapper hisDeptMapper; - private final HisUserMapper hisUserMapper; - private final HisTBasicMapper hisTBasicMapper; - - - public List getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) { - System.out.println("getDeptListView" + startDate + endDate + pageNum + pageSize); - System.out.println("hisDeptMapper" + hisDeptMapper); - List deptListView = hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - System.out.println(JSON.toJSON(deptListView)); - return deptListView; - } - - - public List getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) { - return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); - } - - public void getMedicalRecordListView() { - - } - - 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/java/com/docus/server/his/infrastructure/cache/DeptCacheLayer.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/cache/DeptCacheLayer.java new file mode 100644 index 0000000..991c5da --- /dev/null +++ b/his-sysem/src/main/java/com/docus/server/his/infrastructure/cache/DeptCacheLayer.java @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000..ec85272 --- /dev/null +++ b/his-sysem/src/main/java/com/docus/server/his/infrastructure/client/DownLoadAPI.java @@ -0,0 +1,4 @@ +package com.docus.server.his.infrastructure.client; + +public class DownLoadAPI { +} diff --git a/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java b/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java index ceadf74..664f1b2 100644 --- a/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java +++ b/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java @@ -1,6 +1,8 @@ package com.docus.server.his.service.impl; -import com.docus.server.his.infrastructure.HisSysDao; +import com.docus.server.his.infrastructure.mapper.HisDeptMapper; +import com.docus.server.his.infrastructure.mapper.HisTBasicMapper; +import com.docus.server.his.infrastructure.mapper.HisUserMapper; import com.docus.server.his.service.IHisService; import com.docus.server.record.pojo.dto.TBasicDTO; import com.docus.server.sys.common.pojo.dto.DeptDTO; @@ -15,21 +17,24 @@ import java.util.List; @AllArgsConstructor public class HisService implements IHisService { - private final HisSysDao hisSysDao; + 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 hisSysDao.getDeptListView(startDate, endDate, pageNum, pageSize); + return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); } + @Override public List getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) { - return hisSysDao.getUserListView(startDate, endDate, pageNum, pageSize); + return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); } @Override public List getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) { - return hisSysDao.getTBasicListView(startDate, endDate, pageNum, pageSize); + return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); } } diff --git a/pom.xml b/pom.xml index 98d30f0..1f71e72 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,15 @@ his-sysem common-collect collect-sdry + bl-sysem + ecg-sysem + emr-sysem + hl-sysem + issubmit-sysem + lis-sysem + pacs-sysem + vte-sysem + zz-sysem