整理项目

collect-sdry/src/main/java/com/docus/server/CxfConfig.java

@@ -1,6 +1,6 @@
 package com.docus.server;
 
-import com.docus.server.ws.IWebServiceServer;
+import com.docus.server.collect.IWebServiceServer;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBus;
 import org.apache.cxf.jaxws.EndpointImpl;

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

@@ -2,7 +2,8 @@ package com.docus.server.collect.basic.http;
 
 import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.log.context.TrackContext;
-import com.docus.server.ws.IHttpResult;
+import com.docus.server.collect.IHttpResult;
+import com.docus.server.collect.web.processor.VisitorProcessor;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -10,8 +11,8 @@ import java.util.Map;
 /**
  * 被动http返回响应类型，需要和controller返回类型一致
  *
- * @see com.docus.server.collect.controller.BasicController#insertHttpPassiveBasic(String)
+ * @see BasicRestController#insertHttpPassiveBasic(String)
- * @see com.docus.server.visitor.VisitorProcessor#doProcess(TrackContext)
+ * @see VisitorProcessor#doProcess(TrackContext)
  */
 @Component("httpBasicResultImpl")
 public class HttpBasicResultImpl implements IHttpResult {

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

@@ -1,6 +1,6 @@
 package com.docus.server.collect.basic.http;
 
-import com.docus.server.collect.service.IHttpCollector;
+import com.docus.server.collect.IHttpCollector;
 import com.docus.server.record.pojo.dto.TBasicDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
@@ -12,7 +12,7 @@ import java.util.List;
  * 主动http收集器,返回从客户那边获取的数据
  *
  * @see IHttpCollector
- * @see com.docus.server.collect.job.basic.TBasicHttpCollectJob#execute(Date, Date, long, long)
+ * @see TBasicHttpCollectJob#execute(Date, Date, long, long)
  */
 @Component("httpTBasicCollectorImpl")
 public class HttpTBasicCollectorImpl implements IHttpCollector<TBasicDTO> {

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

@@ -2,15 +2,17 @@ package com.docus.server.collect.basic.http;
 
 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.processor.VisitorProcessor;
 import com.docus.server.record.pojo.dto.TBasicDTO;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 
 /**
  * 被动请求参数转化器
  *
- * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String)
+ * @see BasicServerImpl#setTBasic(String)
- * @see com.docus.server.visitor.VisitorProcessor#beforeProcess(TrackContext)
+ * @see VisitorProcessor#beforeProcess(TrackContext)
  */
 @Component("httpTBasicConverter")
 public class HttpTBasicConverter implements IConverter<TBasicDTO> {

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

@@ -1,6 +1,6 @@
 package com.docus.server.collect.basic.ws;
 
-import com.docus.server.collect.service.IWsCollector;
+import com.docus.server.collect.IWsCollector;
 import com.docus.server.record.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/WsBasicResultImpl.java

@@ -3,7 +3,9 @@ package com.docus.server.collect.basic.ws;
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
 import com.docus.log.context.TrackContext;
-import com.docus.server.ws.IWsResult;
+import com.docus.server.collect.basic.ws.impl.BasicServerImpl;
+import com.docus.server.collect.IWsResult;
+import com.docus.server.collect.web.processor.VisitorProcessor;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -12,8 +14,8 @@ import java.util.Map;
 /**
  * webservice被动请求响应类型，需要和controller返回类型保持一致
  *
- * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String)
+ * @see BasicServerImpl#setTBasic(String)
- * @see com.docus.server.visitor.VisitorProcessor#doProcess(TrackContext)
+ * @see VisitorProcessor#doProcess(TrackContext)
  */
 @Component("wsBasicResultImpl")
 public class WsBasicResultImpl implements IWsResult {

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

@@ -2,15 +2,17 @@ package com.docus.server.collect.basic.ws;
 
 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.processor.VisitorProcessor;
 import com.docus.server.record.pojo.dto.TBasicDTO;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 
 /**
  * 被动请求参数转化器
  *
- * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String)
+ * @see BasicServerImpl#setTBasic(String)
- * @see com.docus.server.visitor.VisitorProcessor#beforeProcess(TrackContext)
+ * @see VisitorProcessor#beforeProcess(TrackContext)
  */
 @Component("wsTBasicConverter")
 public class WsTBasicConverter implements IConverter<TBasicDTO> {

collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.collect.dept.http;
 
-import com.docus.server.collect.service.IHttpCollector;
+import com.docus.server.collect.IHttpCollector;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptConverter.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.dept.http;
 
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 
 import java.util.UUID;

collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptResultImpl.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.dept.http;
 
 import com.docus.infrastructure.web.api.CommonResult;
-import com.docus.server.ws.IHttpResult;
+import com.docus.server.collect.IHttpResult;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;

collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmListener.java

@@ -1,7 +1,6 @@
 package com.docus.server.collect.dept.mq;
 
-import com.docus.server.collect.mq.IDeptMqCollectService;
+import com.docus.server.collect.user.mq.IUserMqCollectService;
-import com.docus.server.collect.mq.IUserMqCollectService;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptConverter.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.dept.mq;
 
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 
 import java.util.UUID;

collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptResultImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.collect.dept.mq;
 
-import com.docus.server.ws.IMqResult;
+import com.docus.server.collect.IMqResult;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;

collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.collect.dept.ws;
 
-import com.docus.server.collect.service.IWsCollector;
+import com.docus.server.collect.IWsCollector;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptConverter.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.dept.ws;
 
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 
 import java.util.UUID;

collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptResultImpl.java

@@ -2,8 +2,8 @@ package com.docus.server.collect.dept.ws;
 
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
-import com.docus.server.tool.IdUtil;
+import com.docus.server.collect.web.utils.IdUtil;
-import com.docus.server.ws.IWsResult;
+import com.docus.server.collect.IWsResult;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

collect-sdry/src/main/java/com/docus/server/collect/medical/record/ParseServiceImpl.java

@@ -1,127 +0,0 @@
-package com.docus.server.collect.medical.record;
-
-import com.docus.core.util.DateUtil;
-import com.docus.core.util.Func;
-import com.docus.core.util.XmlUtil;
-import com.docus.server.collect.service.IParseService;
-import com.docus.server.record.pojo.entity.MedicalRecord;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.tool.IdUtil;
-import org.springframework.stereotype.Service;
-import org.w3c.dom.Node;
-
-import java.util.Date;
-
-@Service
-public class ParseServiceImpl implements IParseService {
-
-    @Override
-    public MedicalRecord parseHandNumbness(String handNumbness) {
-        //TODO： 根据协议进行解析。
-        return null;
-    }
-
-
-    /**
-     * 新增/修改 科室解析 webservice 例子
-     *
-     * @param deptXml
-     * @return
-     */
-    @Override
-    public DeptDTO parseDeptXml(String deptXml) {
-        //TODO： 根据协议进行解析。
-        XmlUtil xmlParseUtil = XmlUtil.of(deptXml);
-        Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension");
-        Node receiverNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/receiver/device/id/item/@extension");
-        Node operateTypeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/@operateType");
-        Node deptCodeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_CODE/@value");
-        Node deptNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_NAME/@value");
-        Node authorIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension");
-        Node authorNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value");
-
-        DeptDTO deptDto = new DeptDTO();
-        deptDto.setMessageId(msgIdNode.getNodeValue());
-        deptDto.setReceiver(receiverNode.getNodeValue());
-        deptDto.setOperateType(operateTypeNode.getNodeValue());
-        deptDto.setDeptCode(deptCodeNode.getNodeValue());
-        deptDto.setDeptName(deptNameNode.getNodeValue());
-        deptDto.setAuthorId(authorIdNode.getNodeValue());
-        deptDto.setAuthorName(authorNameNode.getNodeValue());
-        return deptDto;
-    }
-
-    @Override
-    public String parseDeptOkXml(DeptDTO deptDTO) {
-        String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI);
-        return "<MCCI_IN000002UV01 ITSVersion=\"XML_1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:hl7-org:v3\" xsi:schemaLocation=\"urn:hl7-org:v3\n" +
-                "file:///E:/hl7/HL7/v3ballot_fullsite_2011MAY/v3ballot/html/processable/multicacheschemas/MCCI\n" +
-                "_IN000002UV01.xsd\">\n" +
-                "\t<id extension=\"" + IdUtil.standardUUID() + "\"/>\n" +
-                "\t<creationTime value=\"" + createTime + "\"/>\n" +
-                "\t<interactionId root=\"2.16.840.1.113883.1.6\" extension=\"MCCI_IN000002UV01\"/>\n" +
-                "\t<processingCode code=\"P\"/>\n" +
-                "\t<processingModeCode/>\n" +
-                "\t<acceptAckCode code=\"AL\"/>\n" +
-                "\t<receiver typeCode=\"RCV\">\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item extension=\"MDM\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</receiver>\n" +
-                "\t<sender typeCode=\"SND\">\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item extension=\"" + deptDTO.getReceiver() + "\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</sender>\n" +
-                "\t<acknowledgement typeCode=\"AA\">\n" +
-                "\t\t<targetMessage>\n" +
-                "\t\t\t<id extension=\"" + deptDTO.getMessageId() + "\"/>\n" +
-                "\t\t</targetMessage>\n" +
-                "\t\t<acknowledgementDetail>\n" +
-                "\t\t\t<text value=\"" + "操作成功！" + "\"/>\n" +
-                "\t\t</acknowledgementDetail>\n" +
-                "\t</acknowledgement>\n" +
-                "</MCCI_IN000002UV01>";
-    }
-
-    @Override
-    public String parseDeptFailXml(DeptDTO deptDto) {
-        String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI);
-        return "<RCMR_IN000030UV01 ITSVersion=\"XML_1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:hl7-org:v3\" xsi:schemaLocation=\"urn:hl7-org:v3\n" +
-                "file:///E:/hl7/HL7/v3ballot_fullsite_2011MAY/v3ballot/html/processable/multicacheschemas/RCMR\n" +
-                "_IN000030UV01.xsd\">\n" +
-                "\t<id extension=\"" + IdUtil.standardUUID() + "\"/>\n" +
-                "\t<creationTime value=\"" + createTime + "\"/>\n" +
-                "\t<interactionId root=\"2.16.840.1.113883.1.6\" extension=\"RCMR_IN000030UV01\"/>\n" +
-                "\t<processingCode code=\"P\"/>\n" +
-                "\t<processingModeCode/>\n" +
-                "\t<acceptAckCode code=\"AL\"/>\n" +
-                "\t<receiver typeCode=\"RCV\">\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item extension=\"MDM\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</receiver>\n" +
-                "\t<sender typeCode=\"SND\">\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item extension=\"" + deptDto.getReceiver() + "\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</sender>\n" +
-                "\t<acknowledgement typeCode=\"AE\">\n" +
-                "\t\t<targetMessage>\n" +
-                "\t\t\t<id extension=\"" + deptDto.getMessageId() + "\"/>\n" +
-                "\t\t</targetMessage>\n" +
-                "\t\t<acknowledgementDetail>\n" +
-                "\t\t\t<text value=\"" + deptDto.getParams() + "\"/>\n" +
-                "\t\t</acknowledgementDetail>\n" +
-                "\t</acknowledgement>\n" +
-                "</RCMR_IN000030UV01>\n";
-    }
-}

collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java

@@ -5,9 +5,9 @@ import com.docus.core.util.Func;
 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.tool.ParamsUtils;
+import com.docus.server.collect.web.utils.ParamsUtils;
-import com.docus.server.tool.TableJsonRead;
+import com.docus.server.collect.web.utils.TableJsonRead;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 import org.w3c.dom.Node;
 

collect-sdry/src/main/java/com/docus/server/collect/report/WsReportResultImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.collect.report;
 
-import com.docus.server.ws.IWsResult;
+import com.docus.server.collect.IWsResult;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;

collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.collect.user.http;
 
-import com.docus.server.collect.service.IHttpCollector;
+import com.docus.server.collect.IHttpCollector;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserConverter.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.user.http;
 
 import com.docus.server.sys.common.pojo.dto.UserDTO;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 
 import java.util.UUID;

collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserResultImpl.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.user.http;
 
 import com.docus.infrastructure.web.api.CommonResult;
-import com.docus.server.ws.IHttpResult;
+import com.docus.server.collect.IHttpResult;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;

collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserConverter.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.user.mq;
 
 import com.docus.server.sys.common.pojo.dto.UserDTO;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 
 import java.util.UUID;

collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserResultImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.collect.user.mq;
 
-import com.docus.server.ws.IMqResult;
+import com.docus.server.collect.IMqResult;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;

collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java

@@ -1,6 +1,6 @@
 package com.docus.server.collect.user.ws;
 
-import com.docus.server.collect.service.IWsCollector;
+import com.docus.server.collect.IWsCollector;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserConverter.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.user.ws;
 
 import com.docus.server.sys.common.pojo.dto.UserDTO;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import org.springframework.stereotype.Component;
 
 import java.util.UUID;

collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserResultImpl.java

@@ -2,8 +2,8 @@ package com.docus.server.collect.user.ws;
 
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
-import com.docus.server.tool.IdUtil;
+import com.docus.server.collect.web.utils.IdUtil;
-import com.docus.server.ws.IWsResult;
+import com.docus.server.collect.IWsResult;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

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

@@ -12,21 +12,21 @@ spring:
       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: root
+          username: docus
-          password: root
+          password: docus702
           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: root
+          username: docus
-          password: root
+          password: docus702
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           type: com.alibaba.druid.pool.DruidDataSource
 
 
   redis:
     host: redis.docus.cn
-  #    password: JSdocus@702
+    password: JSdocus@702
   cloud:
     nacos:
       discovery:
@@ -39,12 +39,12 @@ spring:
         shared-configs:
           - comm.${spring.cloud.nacos.config.file-extension}
 
-
 docus:
   dbtype: mysql
   user:
     # 用户默认密码
     defpwd: fd29cd53ec12616e5f36b77d4afffbff
+
 mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
@@ -54,7 +54,7 @@ mybatis-plus:
     db-config:
       field-strategy: NOT_EMPTY
       db-type: MYSQL
-  type-enums-package: com.docus.server.collect.infrastructure.enums,com.docus.server.collect.infrastructure.dao
+  type-enums-package: com.docus.server.collect.web.enums
 xxl:
   job:
     accessToken:

collect-sdry/src/main/resources/logback.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="true" scanPeriod="1 seconds">
-    <contextName>docus-server-fistpage</contextName>
+    <contextName>docus-collector</contextName>
     <property name="log.path" value="logs/logback"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
@@ -44,7 +44,7 @@
         </rollingPolicy>
     </appender>
     <logger name="com.docus.services.system.service.ClientGetBasicServiceImpl" level="DEBUG" additivity="false">
-        <appender-ref ref="external-interface" />
+        <appender-ref ref="external-interface"/>
     </logger>
 
 
@@ -62,7 +62,7 @@
         </root>
     </springProfile>
 
-	    <!--    监控sql日志输出-->
+    <!--    监控sql日志输出-->
     <!--  如想看到表格数据，将OFF改为INFO  -->
     <logger name="jdbc.resultsettable" level="debug" additivity="false">
         <appender-ref ref="console"/>

common-collect/src/main/java/com/docus/server/collect/ICollector.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.service;
+package com.docus.server.collect;
 
 import java.util.Date;
 import java.util.List;

common-collect/src/main/java/com/docus/server/collect/IConverter.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws.convert;
+package com.docus.server.collect;
 
 public interface IConverter<T> {
 

common-collect/src/main/java/com/docus/server/collect/IHttpCollector.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.service;
+package com.docus.server.collect;
 
 public interface IHttpCollector<T> extends ICollector<T> {
 }

common-collect/src/main/java/com/docus/server/collect/IHttpResult.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws;
+package com.docus.server.collect;
 
 import com.docus.infrastructure.web.api.CommonResult;
 

common-collect/src/main/java/com/docus/server/collect/IJob.java

@@ -1,7 +1,7 @@
-package com.docus.server.collect.job;
+package com.docus.server.collect;
 
-import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig;
+import com.docus.server.collect.web.domain.TaskConfig;
-import com.docus.server.tool.PeriodTime;
+import com.docus.server.collect.web.utils.PeriodTime;
 
 public interface IJob<T> {
 

common-collect/src/main/java/com/docus/server/collect/IMqResult.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws;
+package com.docus.server.collect;
 
 public interface IMqResult extends IResult<Void> {
 

common-collect/src/main/java/com/docus/server/collect/IResult.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws;
+package com.docus.server.collect;
 
 import java.util.Map;
 

common-collect/src/main/java/com/docus/server/collect/IWebServiceServer.java

@@ -1,24 +1,10 @@
-package com.docus.server.ws;
+package com.docus.server.collect;
 
 import javax.jws.WebService;
 
 @WebService
 public interface IWebServiceServer {
 
-    /**
-     * 接收xml。并且下载病案。
-     */
-    String receiveHandNumbness(String handNumbness);
-
-    /**
-     * 接收部门xml
-     *
-     * @param deptXml
-     * @return
-     */
-    String receiveDept(String deptXml);
-
-
     /**
      * 科室信息接收，进行操作
      *

common-collect/src/main/java/com/docus/server/collect/IWsCollector.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.service;
+package com.docus.server.collect;
 
 public interface IWsCollector<T> extends ICollector<T> {
 

common-collect/src/main/java/com/docus/server/collect/IWsResult.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws;
+package com.docus.server.collect;
 
 public interface IWsResult extends IResult<String> {
 

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

@@ -1,12 +1,15 @@
-package com.docus.server.collect.controller;
+package com.docus.server.collect.basic.http;
 
 import com.docus.core.util.json.JSON;
 import com.docus.infrastructure.web.api.CommonResult;
 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.record.pojo.dto.TBasicDTO;
 import com.docus.server.record.service.ITBasicService;
-import com.docus.server.visitor.VisitorProcessor;
+import com.docus.server.collect.web.processor.VisitorProcessor;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -21,9 +24,9 @@ import javax.annotation.Resource;
 /**
  * @author wen yongbin
  * @date 2023年2月25日21:56:33
- * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举
+ * @see CollectTypeEnum 枚举
- * @see com.docus.server.ws.convert.IConverter 通用转化器
+ * @see IConverter 通用转化器
- * @see com.docus.server.ws.IHttpResult 通用返回结果
+ * @see IHttpResult 通用返回结果
  * @see VisitorProcessor 通用处理器
  */
 
@@ -31,7 +34,7 @@ import javax.annotation.Resource;
 @Slf4j
 @RestController
 @RequestMapping("/api/rest/basic")
-public class BasicController {
+public class BasicRestController {
     @Resource
     private ITBasicService tBasicService;
 

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

@@ -1,7 +1,8 @@
-package com.docus.server.collect.job.basic;
+package com.docus.server.collect.basic.http;
 
-import com.docus.server.collect.job.AbstractCollectJob;
+import com.docus.server.collect.ICollector;
-import com.docus.server.collect.service.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.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
@@ -13,9 +14,9 @@ import java.util.List;
 /**
  * 主动http请求基础数据job
  *
- * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see AbstractCollectJob
- * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.IJob
- * @see com.docus.server.collect.service.IHttpCollector
+ * @see IHttpCollector
  */
 @Component
 public class TBasicHttpCollectJob extends AbstractCollectJob<TBasicDTO> {

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

@@ -1,4 +1,4 @@
-package com.docus.server.collect.controller;
+package com.docus.server.collect.basic.mq;
 
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;

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

@@ -1,6 +1,7 @@
-package com.docus.server.collect.job.basic;
+package com.docus.server.collect.basic.view;
 
-import com.docus.server.collect.job.AbstractCollectJob;
+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.xxl.job.core.handler.annotation.XxlJob;
@@ -13,9 +14,9 @@ import java.util.List;
 /**
  * 主动view请求基础数据job
  *
- * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see AbstractCollectJob
- * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.IJob
- * @see com.docus.server.collect.service.ICollector
+ * @see ICollector
  */
 @Component
 public class TBasicViewCollectJob extends AbstractCollectJob<TBasicDTO> {

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

@@ -1,4 +1,4 @@
-package com.docus.server.ws;
+package com.docus.server.collect.basic.ws;
 
 import javax.jws.WebService;
 

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

@@ -1,7 +1,8 @@
-package com.docus.server.collect.job.basic;
+package com.docus.server.collect.basic.ws;
 
-import com.docus.server.collect.job.AbstractCollectJob;
+import com.docus.server.collect.ICollector;
-import com.docus.server.collect.service.ICollector;
+import com.docus.server.collect.IWsCollector;
+import com.docus.server.collect.web.job.AbstractCollectJob;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
@@ -13,9 +14,9 @@ import java.util.List;
 /**
  * 主动webservice请求基础数据
  *
- * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see AbstractCollectJob
- * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.IJob
- * @see com.docus.server.collect.service.IWsCollector
+ * @see IWsCollector
  */
 @Component
 public class TBasicWsCollectJob extends AbstractCollectJob<UserDTO> {
@@ -25,16 +26,16 @@ public class TBasicWsCollectJob extends AbstractCollectJob<UserDTO> {
     /**
      * xxl jobhandler 手工执行
      */
-    @XxlJob("startAllUserWsCollect")
+    @XxlJob("startAllTBasicWsCollect")
-    public void startAllUserWsCollect() {
+    public void startAllTBasicWsCollect() {
         super.startCollectAll(getJobParam());
     }
 
     /**
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。
      */
-    @XxlJob("startIncUserWsCollect")
+    @XxlJob("startIncTBasicWsCollect")
-    public void startIncUserWsCollect() {
+    public void startIncTBasicWsCollect() {
         super.startCollectIncrement(getJobParam());
     }
 

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

@@ -1,12 +1,15 @@
-package com.docus.server.ws.impl;
+package com.docus.server.collect.basic.ws.impl;
 
 import com.docus.core.util.json.JSON;
 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.record.pojo.dto.TBasicDTO;
 import com.docus.server.record.service.ITBasicService;
-import com.docus.server.visitor.VisitorProcessor;
+import com.docus.server.collect.web.processor.VisitorProcessor;
-import com.docus.server.ws.IBasicServer;
+import com.docus.server.collect.basic.ws.IBasicServer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -15,9 +18,9 @@ import javax.annotation.Resource;
 /**
  * @author wen yongbin
  * @date 2023年2月25日21:56:33
- * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举
+ * @see CollectTypeEnum 枚举
- * @see com.docus.server.ws.convert.IConverter 通用转化器
+ * @see IConverter 通用转化器
- * @see com.docus.server.ws.IWsResult 通用返回结果
+ * @see IWsResult 通用返回结果
  * @see VisitorProcessor 通用处理器
  */
 @Service

common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java

@@ -1,7 +1,8 @@
-package com.docus.server.collect.job.dept;
+package com.docus.server.collect.dept.http;
 
-import com.docus.server.collect.job.AbstractCollectJob;
+import com.docus.server.collect.ICollector;
-import com.docus.server.collect.service.ICollector;
+import com.docus.server.collect.IHttpCollector;
+import com.docus.server.collect.web.job.AbstractCollectJob;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
@@ -13,9 +14,9 @@ import java.util.List;
 /**
  * 主动http请求科室数据job
  *
- * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see AbstractCollectJob
- * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.IJob
- * @see com.docus.server.collect.service.IHttpCollector
+ * @see IHttpCollector
  */
 @Component
 public class DeptHttpCollectJob extends AbstractCollectJob<DeptDTO> {

common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java

@@ -1,12 +1,15 @@
-package com.docus.server.collect.controller;
+package com.docus.server.collect.dept.http;
 
 import com.docus.core.util.json.JSON;
 import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.log.annotation.TrackGroup;
 import com.docus.log.context.TrackHelper;
-import com.docus.server.collect.service.CollectService;
+import com.docus.server.collect.IConverter;
+import com.docus.server.collect.IHttpResult;
+import com.docus.server.collect.web.enums.CollectTypeEnum;
+import com.docus.server.collect.web.service.CollectService;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.visitor.VisitorProcessor;
+import com.docus.server.collect.web.processor.VisitorProcessor;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -21,9 +24,9 @@ import javax.annotation.Resource;
 /**
  * @author wen yongbin
  * @date 2023年2月25日21:56:33
- * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举
+ * @see CollectTypeEnum 枚举
- * @see com.docus.server.ws.convert.IConverter 通用转化器
+ * @see IConverter 通用转化器
- * @see com.docus.server.ws.IHttpResult 通用返回结果
+ * @see IHttpResult 通用返回结果
  * @see VisitorProcessor 通用处理器
  */
 
@@ -31,7 +34,7 @@ import javax.annotation.Resource;
 @Slf4j
 @RestController
 @RequestMapping("/api/rest/dept")
-public class DeptController {
+public class DeptRestController {
     @Resource
     private CollectService collectService;
 

common-collect/src/main/java/com/docus/server/collect/dept/mq/IDeptMqCollectService.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.mq;
+package com.docus.server.collect.dept.mq;
 
 public interface IDeptMqCollectService {
 

common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptMqCollectServiceImpl.java

@@ -1,12 +1,12 @@
-package com.docus.server.collect.mq.dept;
+package com.docus.server.collect.dept.mq.impl;
 
 import com.docus.core.util.json.JSON;
 import com.docus.log.annotation.TrackGroup;
 import com.docus.log.context.TrackHelper;
-import com.docus.server.collect.mq.IDeptMqCollectService;
+import com.docus.server.collect.dept.mq.IDeptMqCollectService;
-import com.docus.server.collect.service.CollectService;
+import com.docus.server.collect.web.service.CollectService;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.visitor.VisitorProcessor;
+import com.docus.server.collect.web.processor.VisitorProcessor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -1,6 +1,7 @@
-package com.docus.server.collect.job.dept;
+package com.docus.server.collect.dept.view;
 
-import com.docus.server.collect.job.AbstractCollectJob;
+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.sys.common.pojo.dto.DeptDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -13,9 +14,9 @@ import java.util.List;
 /**
  * 主动view请求科室数据job
  *
- * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see AbstractCollectJob
- * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.IJob
- * @see com.docus.server.collect.service.ICollector
+ * @see ICollector
  */
 @Component
 public class DeptViewCollectJob extends AbstractCollectJob<DeptDTO> {

common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java

@@ -1,7 +1,8 @@
-package com.docus.server.collect.job.dept;
+package com.docus.server.collect.dept.ws;
 
-import com.docus.server.collect.job.AbstractCollectJob;
+import com.docus.server.collect.ICollector;
-import com.docus.server.collect.service.ICollector;
+import com.docus.server.collect.IWsCollector;
+import com.docus.server.collect.web.job.AbstractCollectJob;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
@@ -13,9 +14,9 @@ import java.util.List;
 /**
  * 主动webservice请求科室数据job
  *
- * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see AbstractCollectJob
- * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.IJob
- * @see com.docus.server.collect.service.IWsCollector
+ * @see IWsCollector
  */
 @Component
 public class DeptWsCollectJob extends AbstractCollectJob<UserDTO> {
@@ -25,16 +26,16 @@ public class DeptWsCollectJob extends AbstractCollectJob<UserDTO> {
     /**
      * xxl jobhandler 手工执行
      */
-    @XxlJob("startAllUserWsCollect")
+    @XxlJob("startAllDeptWsCollect")
-    public void startAllUserWsCollect() {
+    public void startAllDeptWsCollect() {
         super.startCollectAll(getJobParam());
     }
 
     /**
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。
      */
-    @XxlJob("startIncUserWsCollect")
+    @XxlJob("startIncDeptWsCollect")
-    public void startIncUserWsCollect() {
+    public void startIncDeptWsCollect() {
         super.startCollectIncrement(getJobParam());
     }
 

common-collect/src/main/java/com/docus/server/collect/dept/ws/IDeptServer.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws;
+package com.docus.server.collect.dept.ws;
 
 import javax.jws.WebService;
 

common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java

@@ -1,12 +1,15 @@
-package com.docus.server.ws.impl;
+package com.docus.server.collect.dept.ws.impl;
 
 import com.docus.core.util.json.JSON;
 import com.docus.log.annotation.TrackGroup;
 import com.docus.log.context.TrackHelper;
-import com.docus.server.collect.service.CollectService;
+import com.docus.server.collect.IConverter;
+import com.docus.server.collect.IWsResult;
+import com.docus.server.collect.web.enums.CollectTypeEnum;
+import com.docus.server.collect.web.service.CollectService;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.visitor.VisitorProcessor;
+import com.docus.server.collect.web.processor.VisitorProcessor;
-import com.docus.server.ws.IDeptServer;
+import com.docus.server.collect.dept.ws.IDeptServer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -15,9 +18,9 @@ import javax.annotation.Resource;
 /**
  * @author wen yongbin
  * @date 2023年2月25日21:56:33
- * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举
+ * @see CollectTypeEnum 枚举
- * @see com.docus.server.ws.convert.IConverter 通用转化器
+ * @see IConverter 通用转化器
- * @see com.docus.server.ws.IWsResult 通用返回结果
+ * @see IWsResult 通用返回结果
  * @see VisitorProcessor 通用处理器
  */
 @Service

common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws.event;
+package com.docus.server.collect.report.event;
 
 import com.docus.server.archivefile.pojo.dto.ReportDTO;
 import lombok.Getter;

common-collect/src/main/java/com/docus/server/collect/report/event/ThreePartyPushReportDownEvent.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws.event;
+package com.docus.server.collect.report.event;
 
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;

common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws.listener;
+package com.docus.server.collect.report.listener;
 
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
@@ -12,8 +12,8 @@ import com.docus.server.archivefile.pojo.dto.ReportDownDTO;
 import com.docus.server.archivefile.pojo.dto.ReportDownPatientDTO;
 import com.docus.server.archivefile.pojo.dto.ReportDownScanFileDTO;
 import com.docus.server.archivefile.pojo.entity.AfReportRecord;
-import com.docus.server.ws.event.TaskConsumptionReportDownEvent;
+import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent;
-import com.docus.server.ws.event.ThreePartyPushReportDownEvent;
+import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;

common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws;
+package com.docus.server.collect.report.service;
 
 
 import com.docus.server.archivefile.pojo.dto.ReportDTO;

common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws.impl;
+package com.docus.server.collect.report.service.impl;
 
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
@@ -7,10 +7,10 @@ import com.docus.server.archivefile.mapper.AfReportRecordMapper;
 import com.docus.server.archivefile.pojo.dto.ReportDTO;
 import com.docus.server.archivefile.pojo.entity.AfCollectTask;
 import com.docus.server.archivefile.pojo.entity.AfReportRecord;
+import com.docus.server.collect.report.service.IReportService;
 import com.docus.server.record.mapper.TBasicMapper;
-import com.docus.server.ws.IReportService;
+import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent;
-import com.docus.server.ws.event.TaskConsumptionReportDownEvent;
+import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent;
-import com.docus.server.ws.event.ThreePartyPushReportDownEvent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;

common-collect/src/main/java/com/docus/server/collect/report/ws/IReportServer.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws;
+package com.docus.server.collect.report.ws;
 
 import javax.jws.WebService;
 

common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java

@@ -1,12 +1,15 @@
-package com.docus.server.ws.impl;
+package com.docus.server.collect.report.ws.impl;
 
 import com.docus.core.util.json.JSON;
 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.archivefile.pojo.dto.ReportDTO;
-import com.docus.server.visitor.VisitorProcessor;
+import com.docus.server.collect.web.enums.CollectTypeEnum;
-import com.docus.server.ws.IReportServer;
+import com.docus.server.collect.web.processor.VisitorProcessor;
-import com.docus.server.ws.IReportService;
+import com.docus.server.collect.report.ws.IReportServer;
+import com.docus.server.collect.report.service.IReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -15,9 +18,9 @@ import javax.annotation.Resource;
 /**
  * @author wyb
  * @date 2023年3月3日13:42:36
- * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举
+ * @see CollectTypeEnum 枚举
- * @see com.docus.server.ws.convert.IConverter 通用转化器
+ * @see IConverter 通用转化器
- * @see com.docus.server.ws.IWsResult 通用返回结果
+ * @see IWsResult 通用返回结果
  * @see VisitorProcessor 通用处理器
  */
 @Service

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

@@ -1,14 +0,0 @@
-package com.docus.server.collect.service;
-
-import com.docus.server.record.pojo.entity.MedicalRecord;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-
-public interface IParseService {
-    MedicalRecord parseHandNumbness(String handNumbness);
-
-    DeptDTO parseDeptXml(String deptXml);
-
-    String parseDeptOkXml(DeptDTO receiveUser);
-
-    String parseDeptFailXml(DeptDTO deptDto);
-}

common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java

@@ -1,7 +1,8 @@
-package com.docus.server.collect.job.user;
+package com.docus.server.collect.user.http;
 
-import com.docus.server.collect.job.AbstractCollectJob;
+import com.docus.server.collect.ICollector;
-import com.docus.server.collect.service.ICollector;
+import com.docus.server.collect.IHttpCollector;
+import com.docus.server.collect.web.job.AbstractCollectJob;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
@@ -13,9 +14,9 @@ import java.util.List;
 /**
  * 主动http请求用户数据job
  *
- * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see AbstractCollectJob
- * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.IJob
- * @see com.docus.server.collect.service.IHttpCollector
+ * @see IHttpCollector
  */
 @Component
 public class UserHttpCollectJob extends AbstractCollectJob<UserDTO> {

common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java

@@ -1,12 +1,15 @@
-package com.docus.server.collect.controller;
+package com.docus.server.collect.user.http;
 
 import com.docus.core.util.json.JSON;
 import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.log.annotation.TrackGroup;
 import com.docus.log.context.TrackHelper;
-import com.docus.server.collect.service.CollectService;
+import com.docus.server.collect.IConverter;
+import com.docus.server.collect.IHttpResult;
+import com.docus.server.collect.web.enums.CollectTypeEnum;
+import com.docus.server.collect.web.service.CollectService;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
-import com.docus.server.visitor.VisitorProcessor;
+import com.docus.server.collect.web.processor.VisitorProcessor;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -21,9 +24,9 @@ import javax.annotation.Resource;
 /**
  * @author wen yongbin
  * @date 2023年2月25日21:56:33
- * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举
+ * @see CollectTypeEnum 枚举
- * @see com.docus.server.ws.convert.IConverter 通用转化器
+ * @see IConverter 通用转化器
- * @see com.docus.server.ws.IHttpResult 通用返回结果
+ * @see IHttpResult 通用返回结果
  * @see VisitorProcessor 通用处理器
  */
 
@@ -31,7 +34,7 @@ import javax.annotation.Resource;
 @Slf4j
 @RestController
 @RequestMapping("/api/rest/user")
-public class UserController {
+public class UserRestController {
     @Resource
     private CollectService collectService;
 

common-collect/src/main/java/com/docus/server/collect/user/mq/IUserMqCollectService.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.mq;
+package com.docus.server.collect.user.mq;
 
 public interface IUserMqCollectService {
 

common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserMqCollectServiceImpl.java

@@ -1,12 +1,12 @@
-package com.docus.server.collect.mq.user;
+package com.docus.server.collect.user.mq.impl;
 
 import com.docus.core.util.json.JSON;
 import com.docus.log.annotation.TrackGroup;
 import com.docus.log.context.TrackHelper;
-import com.docus.server.collect.mq.IUserMqCollectService;
+import com.docus.server.collect.user.mq.IUserMqCollectService;
-import com.docus.server.collect.service.CollectService;
+import com.docus.server.collect.web.service.CollectService;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
-import com.docus.server.visitor.VisitorProcessor;
+import com.docus.server.collect.web.processor.VisitorProcessor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -1,6 +1,7 @@
-package com.docus.server.collect.job.user;
+package com.docus.server.collect.user.view;
 
-import com.docus.server.collect.job.AbstractCollectJob;
+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.sys.common.pojo.dto.UserDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -13,9 +14,9 @@ import java.util.List;
 /**
  * 主动view请求用户数据job
  *
- * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see AbstractCollectJob
- * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.IJob
- * @see com.docus.server.collect.service.ICollector
+ * @see ICollector
  */
 @Component
 public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {

common-collect/src/main/java/com/docus/server/collect/user/ws/IUserServer.java

@@ -1,4 +1,4 @@
-package com.docus.server.ws;
+package com.docus.server.collect.user.ws;
 
 import javax.jws.WebService;
 

common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java

@@ -1,7 +1,8 @@
-package com.docus.server.collect.job.user;
+package com.docus.server.collect.user.ws;
 
-import com.docus.server.collect.job.AbstractCollectJob;
+import com.docus.server.collect.ICollector;
-import com.docus.server.collect.service.ICollector;
+import com.docus.server.collect.IWsCollector;
+import com.docus.server.collect.web.job.AbstractCollectJob;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
@@ -13,9 +14,9 @@ import java.util.List;
 /**
  * 主动webservice请求用户数据job
  *
- * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see AbstractCollectJob
- * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.IJob
- * @see com.docus.server.collect.service.IWsCollector
+ * @see IWsCollector
  */
 @Component
 public class UserWsCollectJob extends AbstractCollectJob<UserDTO> {

common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java

@@ -1,12 +1,15 @@
-package com.docus.server.ws.impl;
+package com.docus.server.collect.user.ws.impl;
 
 import com.docus.core.util.json.JSON;
 import com.docus.log.annotation.TrackGroup;
 import com.docus.log.context.TrackHelper;
-import com.docus.server.collect.service.CollectService;
+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.collect.web.processor.VisitorProcessor;
+import com.docus.server.collect.web.service.CollectService;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
-import com.docus.server.visitor.VisitorProcessor;
-import com.docus.server.ws.IUserServer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -15,10 +18,10 @@ import javax.annotation.Resource;
 /**
  * @author wen yongbin
  * @date 2023年2月25日21:56:33
- * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举
+ * @see CollectTypeEnum 枚举
- * @see com.docus.server.ws.convert.IConverter 通用转化器
+ * @see IConverter 通用转化器
- * @see com.docus.server.ws.IWsResult 通用返回结果
+ * @see IWsResult 通用返回结果
- * @see com.docus.server.visitor.VisitorProcessor 通用处理器
+ * @see VisitorProcessor 通用处理器
  */
 @Service
 @Slf4j
@@ -38,7 +41,7 @@ public class UserServerImpl implements IUserServer {
         beanNames = {"wsUserConverter", "wsUserResultImpl"},
         processor = VisitorProcessor.class)
     public String userModify(String message) {
-        log.debug("新增/修改用户数据：{}", message);
+        log.info("新增/修改用户数据：{}", message);
         collectService.insertOrUpdateUser(JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), UserDTO.class));
         return null;
     }

common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java

@@ -1,10 +1,10 @@
-package com.docus.server.ws.convert;
+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.infrastructure.dao.CollectTypeEnum;
+import com.docus.server.collect.web.enums.CollectTypeEnum;
-import com.docus.server.collect.infrastructure.dao.StateEnum;
+import com.docus.server.collect.web.enums.StateEnum;
-import com.docus.server.collect.infrastructure.dao.TaskOriginalMessage;
+import com.docus.server.collect.web.enums.TaskOriginalMessage;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java

@@ -1,7 +1,7 @@
-package com.docus.server.collect.infrastructure.pojo.domain;
+package com.docus.server.collect.web.domain;
 
-import com.docus.server.tool.DateSpiltUtil;
+import com.docus.server.collect.web.utils.DateSpiltUtil;
-import com.docus.server.tool.PeriodTime;
+import com.docus.server.collect.web.utils.PeriodTime;
 import lombok.Data;
 
 import java.util.Date;

common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java

@@ -1,6 +1,4 @@
-package com.docus.server.collect.infrastructure.dao;
+package com.docus.server.collect.web.enums;
-
-import com.docus.server.collect.infrastructure.enums.IIntegerEnum;
 
 public enum CollectTypeEnum implements IIntegerEnum {
 

common-collect/src/main/java/com/docus/server/collect/web/enums/EnumItemView.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.enums;
+package com.docus.server.collect.web.enums;
 
 public class EnumItemView {
 

common-collect/src/main/java/com/docus/server/collect/web/enums/EnumTypeHandlerDispatch.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.enums;
+package com.docus.server.collect.web.enums;
 
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.EnumTypeHandler;

common-collect/src/main/java/com/docus/server/collect/web/enums/FlagEnum.java

@@ -1,6 +1,4 @@
-package com.docus.server.collect.infrastructure.dao;
+package com.docus.server.collect.web.enums;
-
-import com.docus.server.collect.infrastructure.enums.IIntegerEnum;
 
 public enum FlagEnum implements IIntegerEnum {
     INSERT(1, "新增"),

common-collect/src/main/java/com/docus/server/collect/web/enums/IIntegerEnum.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.enums;
+package com.docus.server.collect.web.enums;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 

common-collect/src/main/java/com/docus/server/collect/web/enums/IntegerEnumHandler.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.enums;
+package com.docus.server.collect.web.enums;
 
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;

common-collect/src/main/java/com/docus/server/collect/web/enums/ReceiveDeptInfoEntity.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.dao;
+package com.docus.server.collect.web.enums;
 
 import lombok.Data;
 

common-collect/src/main/java/com/docus/server/collect/web/enums/StateEnum.java

@@ -1,6 +1,6 @@
-package com.docus.server.collect.infrastructure.dao;
+package com.docus.server.collect.web.enums;
 
-import com.docus.server.collect.infrastructure.enums.IIntegerEnum;
+import com.docus.server.collect.web.enums.IIntegerEnum;
 
 public enum StateEnum implements IIntegerEnum {
     OK(0, "成功"),

common-collect/src/main/java/com/docus/server/collect/web/enums/TaskOriginalMessage.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.dao;
+package com.docus.server.collect.web.enums;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

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

@@ -1,12 +1,13 @@
-package com.docus.server.collect.job;
+package com.docus.server.collect.web.job;
 
 import com.docus.core.util.Func;
-import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig;
+import com.docus.server.collect.IJob;
-import com.docus.server.collect.service.ITaskConfigService;
+import com.docus.server.collect.web.domain.TaskConfig;
+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.service.IPowerDeptService;
 import com.docus.server.sys.service.IPowerUserService;
-import com.docus.server.tool.PeriodTime;
 import com.xxl.job.core.context.XxlJobHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 

common-collect/src/main/java/com/docus/server/collect/web/mapper/ReceiveDeptInfoMapper.java

@@ -1,7 +1,7 @@
-package com.docus.server.collect.infrastructure.mapper;
+package com.docus.server.collect.web.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.docus.server.collect.infrastructure.dao.ReceiveDeptInfoEntity;
+import com.docus.server.collect.web.enums.ReceiveDeptInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskConfigMapper.java

@@ -1,7 +1,7 @@
-package com.docus.server.collect.infrastructure.mapper;
+package com.docus.server.collect.web.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig;
+import com.docus.server.collect.web.domain.TaskConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskOriginalMessageMapper.java

@@ -1,7 +1,7 @@
-package com.docus.server.collect.infrastructure.mapper;
+package com.docus.server.collect.web.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.docus.server.collect.infrastructure.dao.TaskOriginalMessage;
+import com.docus.server.collect.web.enums.TaskOriginalMessage;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

common-collect/src/main/java/com/docus/server/collect/web/processor/VisitorProcessor.java

@@ -1,16 +1,16 @@
-package com.docus.server.visitor;
+package com.docus.server.collect.web.processor;
 
 import com.docus.core.util.Func;
 import com.docus.core.util.json.JSON;
 import com.docus.log.context.TrackContext;
 import com.docus.log.processor.AbstractProcessor;
-import com.docus.server.collect.infrastructure.dao.CollectTypeEnum;
+import com.docus.server.collect.web.enums.CollectTypeEnum;
-import com.docus.server.collect.infrastructure.dao.StateEnum;
+import com.docus.server.collect.web.enums.StateEnum;
-import com.docus.server.collect.infrastructure.enums.IIntegerEnum;
+import com.docus.server.collect.web.enums.IIntegerEnum;
-import com.docus.server.tool.SpringUtils;
+import com.docus.server.collect.web.utils.SpringUtils;
-import com.docus.server.ws.IResult;
+import com.docus.server.collect.IResult;
-import com.docus.server.ws.ITaskOriginalMessageService;
+import com.docus.server.collect.web.service.ITaskOriginalMessageService;
-import com.docus.server.ws.convert.IConverter;
+import com.docus.server.collect.IConverter;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -1,4 +1,4 @@
-package com.docus.server.collect.service;
+package com.docus.server.collect.web.service;
 
 import com.docus.core.util.Func;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;

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

@@ -1,13 +1,12 @@
-package com.docus.server.collect.service;
+package com.docus.server.collect.web.service;
 
-import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig;
+import com.docus.server.collect.web.domain.TaskConfig;
 
 import java.util.Date;
 
 public interface ITaskConfigService {
     void updateAllPointerDate(String id, Date date);
 
-
     void updateIncPointerDate(String id, Date date);
 
     TaskConfig getTaskConfig(String id);

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

@@ -1,7 +1,7 @@
-package com.docus.server.ws;
+package com.docus.server.collect.web.service;
 
-import com.docus.server.collect.infrastructure.dao.CollectTypeEnum;
+import com.docus.server.collect.web.enums.CollectTypeEnum;
-import com.docus.server.collect.infrastructure.dao.StateEnum;
+import com.docus.server.collect.web.enums.StateEnum;
 
 public interface ITaskOriginalMessageService {
 

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

@@ -1,11 +1,10 @@
-package com.docus.server.ws.impl;
+package com.docus.server.collect.web.service;
-
+
-import com.docus.server.ws.IBasicServer;
+import com.docus.server.collect.IWebServiceServer;
-import com.docus.server.ws.IDeptServer;
+import com.docus.server.collect.basic.ws.IBasicServer;
-import com.docus.server.ws.IReportServer;
+import com.docus.server.collect.dept.ws.IDeptServer;
-import com.docus.server.ws.IUserServer;
+import com.docus.server.collect.report.ws.IReportServer;
-import com.docus.server.ws.IWebServiceServer;
+import com.docus.server.collect.user.ws.IUserServer;
-import com.docus.server.ws.WsCollect;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -23,29 +22,6 @@ public class WebServiceServer implements IWebServiceServer {
     private IBasicServer basicService;
     @Resource
     private IReportServer reportServer;
-    @Resource
-    private WsCollect wsCollect;
-
-//    @Override
-//    public String receiveHandNumbness(String handNumbness) {
-//        return wsCollect.receiveHandNumbness(handNumbness);
-//    }
-//
-//
-//    @Override
-//    public String receiveDept(String deptXml) {
-//        return wsCollect.receiveDept(deptXml);
-//    }
-
-    @Override
-    public String receiveHandNumbness(String handNumbness) {
-        return null;
-    }
-
-    @Override
-    public String receiveDept(String deptXml) {
-        return null;
-    }
 
     @Override
     public String deptModify(String receiveDept) {

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

@@ -1,9 +1,9 @@
-package com.docus.server.collect.service.impl;
+package com.docus.server.collect.web.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig;
+import com.docus.server.collect.web.domain.TaskConfig;
-import com.docus.server.collect.infrastructure.mapper.TaskConfigMapper;
+import com.docus.server.collect.web.mapper.TaskConfigMapper;
-import com.docus.server.collect.service.ITaskConfigService;
+import com.docus.server.collect.web.service.ITaskConfigService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -1,14 +1,14 @@
-package com.docus.server.ws.impl;
+package com.docus.server.collect.web.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
-import com.docus.server.collect.infrastructure.dao.CollectTypeEnum;
+import com.docus.server.collect.web.enums.CollectTypeEnum;
-import com.docus.server.collect.infrastructure.dao.StateEnum;
+import com.docus.server.collect.web.enums.StateEnum;
-import com.docus.server.collect.infrastructure.dao.TaskOriginalMessage;
+import com.docus.server.collect.web.enums.TaskOriginalMessage;
-import com.docus.server.collect.infrastructure.mapper.TaskOriginalMessageMapper;
+import com.docus.server.collect.web.mapper.TaskOriginalMessageMapper;
-import com.docus.server.ws.ITaskOriginalMessageService;
+import com.docus.server.collect.web.service.ITaskOriginalMessageService;
-import com.docus.server.ws.convert.TaskOriginalMessageConverter;
+import com.docus.server.collect.web.convert.TaskOriginalMessageConverter;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

common-collect/src/main/java/com/docus/server/collect/web/utils/DateSpiltUtil.java

@@ -1,4 +1,4 @@
-package com.docus.server.tool;
+package com.docus.server.collect.web.utils;
 
 import java.util.ArrayList;
 import java.util.Date;

common-collect/src/main/java/com/docus/server/collect/web/utils/IdUtil.java

@@ -1,4 +1,4 @@
-package com.docus.server.tool;
+package com.docus.server.collect.web.utils;
 
 import lombok.Data;
 

common-collect/src/main/java/com/docus/server/collect/web/utils/ParamsUtils.java

@@ -1,4 +1,4 @@
-package com.docus.server.tool;
+package com.docus.server.collect.web.utils;
 
 import java.util.HashMap;
 import java.util.Map;

common-collect/src/main/java/com/docus/server/collect/web/utils/PeriodTime.java

@@ -1,4 +1,4 @@
-package com.docus.server.tool;
+package com.docus.server.collect.web.utils;
 
 import com.docus.core.util.Func;
 import lombok.AllArgsConstructor;

common-collect/src/main/java/com/docus/server/collect/web/utils/SpringUtils.java

@@ -1,4 +1,4 @@
-package com.docus.server.tool;
+package com.docus.server.collect.web.utils;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;

common-collect/src/main/java/com/docus/server/collect/web/utils/TableJsonRead.java

@@ -1,4 +1,4 @@
-package com.docus.server.tool;
+package com.docus.server.collect.web.utils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.util.StringUtils;

common-collect/src/main/java/com/docus/server/ws/WsCollect.java

@@ -1,45 +0,0 @@
-package com.docus.server.ws;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class WsCollect {
-//    @Autowired
-//    private IMedicalRecordService medicalRecordService;
-//    @Autowired
-//    private IParseService parseService;
-//    @Autowired
-//    private CollectService collectService;
-//    @Autowired
-//    private IWsResult wsResult;
-//    @Autowired
-//    private IPowerDeptService powerDeptService;
-//
-//    //接收xml。并且下载病案。
-//    public String receiveHandNumbness(String handNumbness) {
-//        log.info("收到手麻消息：{}", handNumbness);
-//        try {
-//            MedicalRecord medicalRecord = parseService.parseHandNumbness(handNumbness);
-//            medicalRecordService.receive(medicalRecord);
-//            return wsResult.ok(medicalRecord.getParams());
-//        } catch (Exception e) {
-//            return wsResult.fail(e.getMessage());
-//        }
-//    }
-//
-//    public String receiveDept(String deptXml) {
-//        log.info("收到科室消息：{}", deptXml);
-//        try {
-//            DeptDTO dept = parseService.parseDeptXml(deptXml);
-//
-//            //此处需要存储原xml内容。
-//            collectService.receiveDept(dept);
-//            return wsResult.ok(dept.getParams());
-//        } catch (Exception e) {
-//            return wsResult.fail(e.getMessage(), dept.getParams());
-//        }
-//    }
-
-}

pom.xml

@@ -14,6 +14,7 @@
     <modules>
         <module>docus-sys</module>
         <module>docus-medical-record</module>
+        <module>docus-archivefile</module>
         <module>his-sysem</module>
         <module>common-collect</module>
         <module>collect-sdry</module>