测试userviewjob，编写user view的逻辑

bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlTBasicMapper.java

@@ -2,7 +2,7 @@ package com.docus.server.bl.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.bl.common.DSKeyConstants;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java

@@ -1,6 +1,6 @@
 package com.docus.server.bl.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java

@@ -4,7 +4,7 @@ import com.docus.server.bl.infrastructure.mapper.BlDeptMapper;
 import com.docus.server.bl.infrastructure.mapper.BlTBasicMapper;
 import com.docus.server.bl.infrastructure.mapper.BlUserMapper;
 import com.docus.server.bl.service.IBlService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;

bl-sysem/src/main/resources/mapper/BlTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.bl.infrastructure.mapper.BlTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc

collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.basic.http;
 
 import com.docus.server.collect.IHttpCollector;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
 

collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java

@@ -4,7 +4,7 @@ import com.docus.core.util.DateUtil;
 import com.docus.log.context.TrackContext;
 import com.docus.server.collect.basic.ws.impl.BasicServerImpl;
 import com.docus.server.collect.web.process.VisitorProcessor;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 

collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.basic.ws;
 
 import com.docus.server.collect.IWsCollector;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
 

collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java

@@ -4,7 +4,7 @@ import com.docus.core.util.DateUtil;
 import com.docus.log.context.TrackContext;
 import com.docus.server.collect.basic.ws.impl.BasicServerImpl;
 import com.docus.server.collect.web.process.VisitorProcessor;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 

collect-sdry/src/main/resources/bootstrap.yml

@@ -13,85 +13,92 @@ spring:
         #公司病案的文件服务数据库
         master:
           url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-          username: docus
+          username: root
-          password: docus702
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #公司病案的系统服务数据库
         system:
           url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_system?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-          username: docus
+          username: root
-          password: docus702
+          password: root
+          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+          type: com.alibaba.druid.pool.DruidDataSource
+        #公司病案的基础服务数据库
+        record:
+          url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_medicalrecord?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+          username: root
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #医院的用户/科室/基础数据的数据库
         his:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #病理数据
         bl:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #电生理系统数据
         ecg:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #电子病历系统数据
         emr:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #护理文书系统数据
         hl:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #手麻系统数据
         issubmit:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #lis系统数据
         lis:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #Pacs系统数据视图
         pacs:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #vte静脉血栓栓塞症
         vte:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
         #重症系统数据
         zz:
           url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
           username: root
-          password: root@123456
+          password: root
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
   #  rabbitmq:
@@ -101,7 +108,7 @@ spring:
   #    password: guest
   redis:
     host: redis.docus.cn
-    password: JSdocus@702
+  #    password: JSdocus@702
   cloud:
     nacos:
       discovery:

common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java

@@ -9,7 +9,7 @@ import com.docus.server.collect.IHttpResult;
 import com.docus.server.collect.web.enums.CollectTypeEnum;
 import com.docus.server.collect.web.process.VisitorProcessor;
 import com.docus.server.collect.web.service.CollectService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java

@@ -3,7 +3,7 @@ package com.docus.server.collect.basic.http;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IHttpCollector;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
 

common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java

@@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper;
 import com.docus.server.collect.basic.mq.IBasicMqCollectService;
 import com.docus.server.collect.web.process.VisitorProcessor;
 import com.docus.server.collect.web.service.CollectService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java

@@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper;
 import com.docus.server.collect.basic.mq.IBasicMqCollectService;
 import com.docus.server.collect.web.process.VisitorProcessor;
 import com.docus.server.collect.web.service.CollectService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java

@@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper;
 import com.docus.server.collect.basic.mq.IBasicMqCollectService;
 import com.docus.server.collect.web.process.VisitorProcessor;
 import com.docus.server.collect.web.service.CollectService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java

@@ -3,7 +3,7 @@ package com.docus.server.collect.basic.view;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.web.job.AbstractCollectJob;
 import com.docus.server.his.service.IHisService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
 

common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java

@@ -9,7 +9,7 @@ import com.docus.server.collect.basic.ws.IBasicServer;
 import com.docus.server.collect.web.enums.CollectTypeEnum;
 import com.docus.server.collect.web.process.VisitorProcessor;
 import com.docus.server.collect.web.service.CollectService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java

@@ -14,6 +14,7 @@ import java.util.List;
 /**
  * 主动view请求科室数据job
  *
+ * @author linruifeng
  * @see AbstractCollectJob
  * @see com.docus.server.collect.IJob
  * @see ICollector

common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java

@@ -17,6 +17,7 @@ import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 主动view请求用户数据job
@@ -48,33 +49,18 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
 
     @Override
     public void batchInsertOrUpdate(List<UserDTO> t) {
+        //docus-BasicDataReceive同步user逻辑
         Collection<Object> userNames = ListUtils.distinctSelect(t, UserDTO::getUserName);
         List<PowerUser> powerUsers = userService.findByList("userName", userNames);
         List<String> existUserNames = ListUtils.distinctSelect(powerUsers, PowerUser::getUserName);
 
         t.forEach(p -> {
             String userName = p.getUserName();
+            String pwd = p.getPwd();
             if (existUserNames.contains(userName)) {
-                PowerThirdLogin user = thirdLoginService.findOneBy("user", userName);
+                updateThirdLogin(pwd, userName);
-                user.setPwd(p.getPwd());
-                thirdLoginService.updateById(user);
             } else {
-                p.setPwd(userProperties.getPassword());
+                insertUserAndThirdLogin(p, userName);
-                if (Func.isNotBlank(p.getDeptId())) {
-                    PowerDept powerDept = deptService.findOneBy("deptCode", p.getDeptId());
-                    p.setDeptId(powerDept.getDeptId().toString());
-                }
-                userService.insertOrUpdatePowerUser(p);
-                PowerUser powerUser = userService.findOneBy("userName", userName);
-
-                PowerThirdLogin powerThirdLogin = new PowerThirdLogin();
-                powerThirdLogin.setId(idService.getDateSeq());
-                powerThirdLogin.setPowerUserId(powerUser.getUserId().toString());
-                powerThirdLogin.setUser(userName);
-                powerThirdLogin.setPwd(p.getPwd());
-                powerThirdLogin.setSource(0);
-                powerThirdLogin.setCreateTime(DateUtil.now());
-                thirdLoginService.save(powerThirdLogin);
             }
         });
     }
@@ -84,4 +70,40 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
         //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
         return hisService.getUserListView(startDate, endDate, pageNum, pageSize);
     }
+
+    private void insertUserAndThirdLogin(UserDTO p, String userName) {
+        p.setPwd(userProperties.getPassword());
+
+        if (Func.isEmpty(p.getAuthorId())) {
+            p.setAuthorId("admin");
+        }
+        if (Func.isEmpty(p.getAuthorName())) {
+            p.setAuthorName("admin");
+        }
+
+        if (Func.isNotBlank(p.getDeptId())) {
+            PowerDept powerDept = deptService.findOneBy("deptCode", p.getDeptId());
+            if (!Objects.isNull(powerDept)) {
+                p.setDeptId(String.valueOf(powerDept.getDeptId()));
+            }
+        }
+        userService.insertOrUpdatePowerUser(p);
+        PowerUser powerUser = userService.findOneBy("userName", userName);
+
+        PowerThirdLogin powerThirdLogin = new PowerThirdLogin();
+        powerThirdLogin.setId(idService.getDateSeq());
+        powerThirdLogin.setPowerUserId(String.valueOf(powerUser.getUserId()));
+        powerThirdLogin.setUser(userName);
+        powerThirdLogin.setPwd(p.getPwd());
+        powerThirdLogin.setSource(0);
+        powerThirdLogin.setCreateTime(DateUtil.now());
+        thirdLoginService.save(powerThirdLogin);
+    }
+
+    private void updateThirdLogin(String pwd, String userName) {
+        PowerThirdLogin user = thirdLoginService.findOneBy("user", userName);
+        user.setPwd(pwd);
+        thirdLoginService.updateById(user);
+    }
+
 }

common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java

@@ -8,7 +8,6 @@ import com.docus.server.collect.web.enums.StateEnum;
 import com.docus.server.collect.web.service.ITaskConfigService;
 import com.docus.server.collect.web.utils.PeriodTime;
 import com.docus.server.record.service.ITBasicService;
-import com.docus.server.sys.common.UserProperties;
 import com.docus.server.sys.service.IPowerDeptService;
 import com.docus.server.sys.service.IPowerThirdLoginService;
 import com.docus.server.sys.service.IPowerUserService;

common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.web.service;
 
 import com.docus.core.util.Func;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.record.service.ITBasicService;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;

docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/IdType.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.pojo.dto;
+package com.docus.server.record.common.pojo.dto;
 
 public enum IdType {
     /**

docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/InpatientNo.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.pojo.dto;
+package com.docus.server.record.common.pojo.dto;
 
 import com.docus.infrastructure.core.exception.BaseException;
 import com.docus.server.record.RecordExceptionEnum;

docus-common/pom.xml

@@ -0,0 +1,26 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>docus-collector-server</artifactId>
+        <groupId>com.docus</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>docus-common</artifactId>
+    <name>Archetype - docus-common</name>
+    <url>http://maven.apache.org</url>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>

docus-common/src/main/java/com/docus/server/common/Sort.java

@@ -1,4 +1,4 @@
-package com.docus.server.sys.common;
+package com.docus.server.common;
 
 import java.util.ArrayList;
 import java.util.Collections;

docus-common/src/main/java/com/docus/server/common/UserProperties.java

@@ -1,4 +1,4 @@
-package com.docus.server.sys.common;
+package com.docus.server.common;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

docus-common/src/main/java/com/docus/server/common/service/IBaseService.java

@@ -1,7 +1,8 @@
-package com.docus.server.sys.common;
+package com.docus.server.common.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.docus.server.common.Sort;
 
 import java.util.Collection;
 import java.util.List;
@@ -12,9 +13,9 @@ public interface IBaseService<T> extends IService<T> {
 
     List<T> findByIds(Collection<String> ids);
 
-    public List<T> findBy(String propertyName, Object propertyValue);
+    List<T> findBy(String propertyName, Object propertyValue);
 
-    public List<T> findByList(String propertyName, Collection<Object> propertyValue);
+    List<T> findByList(String propertyName, Collection<Object> propertyValue);
 
     List<T> findActiveBy(String propertyName, Object propertyValue);
 

docus-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java

@@ -1,4 +1,4 @@
-package com.docus.server.sys.common;
+package com.docus.server.common.service.impl;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -8,20 +8,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.slf4j.Logger;
+import com.docus.server.common.Sort;
-import org.slf4j.LoggerFactory;
+import com.docus.server.common.service.IBaseService;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements IBaseService<T> {
 
-    private static final Logger logger = LoggerFactory.getLogger(BaseServiceImpl.class);
-
     @Override
     public T findById(String id) {
         if (id == null) {
@@ -53,7 +47,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> extends Servic
     @Override
     public List<T> findByList(String propertyName, Collection<Object> propertyValue) {
         String columnName = getColumnName(propertyName);
-        return baseMapper.selectList(new QueryWrapper<T>().in(!Objects.isNull(propertyName), columnName, propertyValue));
+        return baseMapper.selectList(new QueryWrapper<T>().in(!Objects.isNull(propertyValue), columnName, propertyValue));
     }
 
     @Override
@@ -95,7 +89,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> extends Servic
     @Override
     public T findOneByList(String propertyName, Collection<Object> propertyValue) {
         String columnName = getColumnName(propertyName);
-        List<T> list = baseMapper.selectList(new QueryWrapper<T>().eq(!Objects.isNull(propertyName), columnName, propertyValue));
+        List<T> list = baseMapper.selectList(new QueryWrapper<T>().eq(!Objects.isNull(propertyValue), columnName, propertyValue));
         return (list == null || list.size() == 0) ? null : list.get(0);
     }
 

docus-medical-record/pom.xml

@@ -10,6 +10,15 @@
     <name>Archetype - docus-medical-record</name>
     <url>http://maven.apache.org</url>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.docus</groupId>
+            <artifactId>docus-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <resources>
             <resource>
@@ -23,4 +32,6 @@
             </resource>
         </resources>
     </build>
+
+
 </project>

docus-medical-record/src/main/java/com/docus/server/record/common/DSKeyConstants.java

@@ -0,0 +1,11 @@
+package com.docus.server.record.common;
+
+/**
+ * @author linrf
+ * @date 2023/6/9 11:19
+ */
+public class DSKeyConstants {
+
+    public static final String DS_KEY = "record";
+
+}

docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/IdType.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.pojo.dto;
+package com.docus.server.record.common.pojo.dto;
 
 public enum IdType {
     /**

docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/InpatientNo.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.pojo.dto;
+package com.docus.server.record.common.pojo.dto;
 
 import com.docus.infrastructure.core.exception.BaseException;
 import com.docus.server.record.RecordExceptionEnum;

docus-medical-record/src/main/java/com/docus/server/record/common/pojo/dto/TBasicDTO.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.pojo.dto;
+package com.docus.server.record.common.pojo.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecord.java

@@ -1,10 +1,10 @@
-package com.docus.server.record.pojo.entity;
+package com.docus.server.record.common.pojo.entity;
 
 import com.docus.core.util.Func;
 import com.docus.infrastructure.core.exception.BaseException;
 import com.docus.server.record.RecordExceptionEnum;
-import com.docus.server.record.pojo.dto.IdType;
+import com.docus.server.record.common.pojo.dto.IdType;
-import com.docus.server.record.pojo.dto.InpatientNo;
+import com.docus.server.record.common.pojo.dto.InpatientNo;
 import lombok.Getter;
 
 import java.util.Map;

docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/MedicalRecordEntity.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.pojo.entity;
+package com.docus.server.record.common.pojo.entity;
 
 public class MedicalRecordEntity {
 

docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.pojo.entity;
+package com.docus.server.record.common.pojo.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasicExtend.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.pojo.entity;
+package com.docus.server.record.common.pojo.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java

@@ -1,8 +1,10 @@
 package com.docus.server.record.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.docus.server.record.pojo.entity.TBasic;
+import com.docus.server.record.common.DSKeyConstants;
-import com.docus.server.record.pojo.entity.TBasicExtend;
+import com.docus.server.record.common.pojo.entity.TBasic;
+import com.docus.server.record.common.pojo.entity.TBasicExtend;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,6 +19,7 @@ import java.util.List;
  * @since 2021-04-14
  */
 @Mapper
+@DS(DSKeyConstants.DS_KEY)
 public interface TBasicMapper extends BaseMapper<TBasic> {
     /**
      * 根据住院号和住院次数查询业务系统中病案主键

docus-medical-record/src/main/java/com/docus/server/record/service/IMedicalRecordService.java

@@ -1,6 +1,6 @@
 package com.docus.server.record.service;
 
-import com.docus.server.record.pojo.entity.MedicalRecord;
+import com.docus.server.record.common.pojo.entity.MedicalRecord;
 
 public interface IMedicalRecordService {
     void receive(MedicalRecord medicalRecord);

docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java

@@ -1,12 +1,12 @@
 package com.docus.server.record.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.docus.server.common.service.IBaseService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.record.pojo.entity.TBasic;
+import com.docus.server.record.common.pojo.entity.TBasic;
 
 import java.util.List;
 
-public interface ITBasicService extends IService<TBasic> {
+public interface ITBasicService extends IBaseService<TBasic> {
 
     /**
      * 新增

docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordServiceImpl.java

@@ -1,7 +1,7 @@
 package com.docus.server.record.service.impl;
 
-import com.docus.server.record.pojo.dto.IdType;
+import com.docus.server.record.common.pojo.dto.IdType;
-import com.docus.server.record.pojo.entity.MedicalRecord;
+import com.docus.server.record.common.pojo.entity.MedicalRecord;
 import com.docus.server.record.service.IMedicalRecordService;
 import org.springframework.stereotype.Service;
 

docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java

@@ -1,14 +1,14 @@
 package com.docus.server.record.service.impl;
 
 import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
+import com.docus.server.common.service.impl.BaseServiceImpl;
 import com.docus.server.record.mapper.TBasicMapper;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.record.pojo.entity.TBasic;
+import com.docus.server.record.common.pojo.entity.TBasic;
-import com.docus.server.record.pojo.entity.TBasicExtend;
+import com.docus.server.record.common.pojo.entity.TBasicExtend;
 import com.docus.server.record.service.ITBasicService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +18,7 @@ import java.util.Date;
 import java.util.List;
 
 @Service
-public class TBasicServiceImpl extends ServiceImpl<TBasicMapper, TBasic> implements ITBasicService {
+public class TBasicServiceImpl extends BaseServiceImpl<TBasicMapper, TBasic> implements ITBasicService {
 
     @Resource
     private TBasicMapper tBasicMapper;

docus-medical-record/src/main/resources/mapper/TBasicMapper.xml

@@ -102,7 +102,7 @@
     <select id="getPatientId" resultType="java.lang.String">
         select patient_id from `docus_medicalrecord`.`t_basic` where jzh=#{jzh}
     </select>
-    <select id="selectBasicListByAdmissDate" resultType="com.docus.server.record.pojo.entity.TBasic">
+    <select id="selectBasicListByAdmissDate" resultType="com.docus.server.record.common.pojo.entity.TBasic">
         select *
         from `docus_medicalrecord`.`t_basic`
         where admiss_date between #{admissStartDate} AND #{admissEndDate}
@@ -114,7 +114,7 @@
         from `docus_medicalrecord`.`t_basic_extend`
         where patient_id=#{patientId}
     </select>
-    <select id="selectBasicListByCreateOrUpdateTime" resultType="com.docus.server.record.pojo.entity.TBasic">
+    <select id="selectBasicListByCreateOrUpdateTime" resultType="com.docus.server.record.common.pojo.entity.TBasic">
         select `patient_id`,
                `admiss_times`,
                `inpatient_no`,
@@ -137,7 +137,7 @@
             limit #{offset}
             , #{size}
     </select>
-    <select id="selectBasicListByPatientIds" resultType="com.docus.server.record.pojo.entity.TBasic">
+    <select id="selectBasicListByPatientIds" resultType="com.docus.server.record.common.pojo.entity.TBasic">
         select `patient_id`,
         `admiss_times`,
         `inpatient_no`,

docus-sys/pom.xml

@@ -23,4 +23,12 @@
             </resource>
         </resources>
     </build>
+    <dependencies>
+        <dependency>
+            <groupId>com.docus</groupId>
+            <artifactId>docus-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 </project>

docus-sys/src/main/java/com/docus/server/sys/common/OperatorType.java

@@ -1,9 +0,0 @@
-package com.docus.server.sys.common;
-
-/**
- * @author linrf
- * @date 2023/6/12 15:27
- */
-public enum OperatorType {
-    IN, EQ
-}

docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java

@@ -1,6 +1,6 @@
 package com.docus.server.sys.service;
 
-import com.docus.server.sys.common.IBaseService;
+import com.docus.server.common.service.IBaseService;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.entity.PowerDept;
 

docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java

@@ -1,6 +1,6 @@
 package com.docus.server.sys.service;
 
-import com.docus.server.sys.common.IBaseService;
+import com.docus.server.common.service.IBaseService;
 import com.docus.server.sys.common.pojo.entity.PowerThirdLogin;
 
 /**

docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java

@@ -1,6 +1,6 @@
 package com.docus.server.sys.service;
 
-import com.docus.server.sys.common.IBaseService;
+import com.docus.server.common.service.IBaseService;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.docus.server.sys.common.pojo.entity.PowerUser;
 

docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java

@@ -2,7 +2,7 @@ package com.docus.server.sys.service.impl;
 
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
-import com.docus.server.sys.common.BaseServiceImpl;
+import com.docus.server.common.service.impl.BaseServiceImpl;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.DeptModifyParam;
 import com.docus.server.sys.common.pojo.entity.PowerDept;

docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.sys.service.impl;
 
-import com.docus.server.sys.common.BaseServiceImpl;
+import com.docus.server.common.service.impl.BaseServiceImpl;
 import com.docus.server.sys.common.pojo.entity.PowerThirdLogin;
 import com.docus.server.sys.mapper.PowerThirdLoginMapper;
 import com.docus.server.sys.service.IPowerThirdLoginService;

docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java

@@ -2,8 +2,8 @@ package com.docus.server.sys.service.impl;
 
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
-import com.docus.server.sys.common.BaseServiceImpl;
+import com.docus.server.common.UserProperties;
-import com.docus.server.sys.common.UserProperties;
+import com.docus.server.common.service.impl.BaseServiceImpl;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.docus.server.sys.common.pojo.dto.UserModifyParam;
 import com.docus.server.sys.common.pojo.entity.PowerUser;

ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgTBasicMapper.java

@@ -2,7 +2,7 @@ package com.docus.server.ecg.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.ecg.common.DSKeyConstants;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java

@@ -1,6 +1,6 @@
 package com.docus.server.ecg.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java

@@ -4,7 +4,7 @@ import com.docus.server.ecg.infrastructure.mapper.EcgDeptMapper;
 import com.docus.server.ecg.infrastructure.mapper.EcgTBasicMapper;
 import com.docus.server.ecg.infrastructure.mapper.EcgUserMapper;
 import com.docus.server.ecg.service.IEcgService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;

ecg-sysem/src/main/resources/mapper/EcgTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.ecg.infrastructure.mapper.EcgTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc

emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrTBasicMapper.java

@@ -2,7 +2,7 @@ package com.docus.server.emr.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.emr.common.DSKeyConstants;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java

@@ -1,6 +1,6 @@
 package com.docus.server.emr.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java

@@ -4,7 +4,7 @@ import com.docus.server.emr.infrastructure.mapper.EmrDeptMapper;
 import com.docus.server.emr.infrastructure.mapper.EmrTBasicMapper;
 import com.docus.server.emr.infrastructure.mapper.EmrUserMapper;
 import com.docus.server.emr.service.IEmrService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;

emr-sysem/src/main/resources/mapper/EmrTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.emr.infrastructure.mapper.EmrTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc

his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java

@@ -2,7 +2,7 @@ package com.docus.server.his.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.his.common.DSKeyConstants;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

his-sysem/src/main/java/com/docus/server/his/service/IHisService.java

@@ -1,6 +1,6 @@
 package com.docus.server.his.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

his-sysem/src/main/java/com/docus/server/his/service/impl/HisServiceImpl.java

@@ -4,7 +4,7 @@ import com.docus.server.his.infrastructure.mapper.HisDeptMapper;
 import com.docus.server.his.infrastructure.mapper.HisTBasicMapper;
 import com.docus.server.his.infrastructure.mapper.HisUserMapper;
 import com.docus.server.his.service.IHisService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;

his-sysem/src/main/resources/mapper/HisTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.his.infrastructure.mapper.HisTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc

hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlTBasicMapper.java

@@ -2,7 +2,7 @@ package com.docus.server.hl.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.hl.common.DSKeyConstants;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java

@@ -1,6 +1,6 @@
 package com.docus.server.hl.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java

@@ -4,7 +4,7 @@ import com.docus.server.hl.infrastructure.mapper.HlDeptMapper;
 import com.docus.server.hl.infrastructure.mapper.HlTBasicMapper;
 import com.docus.server.hl.infrastructure.mapper.HlUserMapper;
 import com.docus.server.hl.service.IHlService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;

hl-sysem/src/main/resources/mapper/HlTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.hl.infrastructure.mapper.HlTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc

issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitTBasicMapper.java

@@ -2,7 +2,7 @@ package com.docus.server.issubmit.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.issubmit.common.DSKeyConstants;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java

@@ -1,6 +1,6 @@
 package com.docus.server.issubmit.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java

@@ -4,7 +4,7 @@ import com.docus.server.issubmit.infrastructure.mapper.IssubmitDeptMapper;
 import com.docus.server.issubmit.infrastructure.mapper.IssubmitTBasicMapper;
 import com.docus.server.issubmit.infrastructure.mapper.IssubmitUserMapper;
 import com.docus.server.issubmit.service.IIssubmitService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;

issubmit-sysem/src/main/resources/mapper/IssubmitTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.issubmit.infrastructure.mapper.IssubmitTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc

lis-sysem/src/main/java/com/docus/server/lis/infrastructure/mapper/LisTBasicMapper.java

@@ -2,7 +2,7 @@ package com.docus.server.lis.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.lis.common.DSKeyConstants;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java

@@ -1,6 +1,6 @@
 package com.docus.server.lis.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java

@@ -4,7 +4,7 @@ import com.docus.server.lis.infrastructure.mapper.LisDeptMapper;
 import com.docus.server.lis.infrastructure.mapper.LisTBasicMapper;
 import com.docus.server.lis.infrastructure.mapper.LisUserMapper;
 import com.docus.server.lis.service.ILisService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;

lis-sysem/src/main/resources/mapper/LisTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.lis.infrastructure.mapper.LisTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc

pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsTBasicMapper.java

@@ -2,7 +2,7 @@ package com.docus.server.pacs.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.pacs.common.DSKeyConstants;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java

@@ -1,6 +1,6 @@
 package com.docus.server.pacs.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java

@@ -4,7 +4,7 @@ import com.docus.server.pacs.infrastructure.mapper.PacsDeptMapper;
 import com.docus.server.pacs.infrastructure.mapper.PacsTBasicMapper;
 import com.docus.server.pacs.infrastructure.mapper.PacsUserMapper;
 import com.docus.server.pacs.service.IPacsService;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;

pacs-sysem/src/main/resources/mapper/PacsTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.pacs.infrastructure.mapper.PacsTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc

pom.xml

@@ -27,6 +27,7 @@
         <module>pacs-sysem</module>
         <module>vte-sysem</module>
         <module>zz-sysem</module>
+        <module>docus-common</module>
     </modules>
     <dependencies>
 

vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteTBasicMapper.java

@@ -1,7 +1,7 @@
 package com.docus.server.vte.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.vte.common.DSKeyConstants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java

@@ -1,6 +1,6 @@
 package com.docus.server.vte.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.vte.service.impl;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.docus.server.vte.infrastructure.mapper.VteDeptMapper;

vte-sysem/src/main/resources/mapper/VteTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.vte.infrastructure.mapper.VteTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc

zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzTBasicMapper.java

@@ -1,7 +1,7 @@
 package com.docus.server.zz.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.zz.common.DSKeyConstants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java

@@ -1,6 +1,6 @@
 package com.docus.server.zz.service;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 

zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.zz.service.impl;
 
-import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.docus.server.zz.infrastructure.mapper.ZzDeptMapper;

zz-sysem/src/main/resources/mapper/ZzTBasicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.zz.infrastructure.mapper.ZzTBasicMapper">
 
-    <select id="getTBasicListView" resultType="com.docus.server.record.pojo.dto.TBasicDTO">
+    <select id="getTBasicListView" resultType="com.docus.server.record.common.pojo.dto.TBasicDTO">
         SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_basic`
         WHERE  update_time between #{startDate}  and  #{endDate}
         order by update_time asc