主动ws封装

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

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

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

@@ -0,0 +1,29 @@
+package com.docus.server.collect.basic.ws;
+
+import com.docus.server.collect.service.IWsCollector;
+import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.google.common.collect.Lists;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 主动ws
+ */
+@Component("wsBasicCollectorImpl")
+public class WsBasicCollectorImpl implements IWsCollector<TBasicDTO> {
+    @Override
+    public List<TBasicDTO> get(Date startDate, Date endDate, long pageNum, long pageSize) {
+        TBasicDTO deptDTO = new TBasicDTO();
+        deptDTO.setAdmissDate("1");
+        deptDTO.setAdmissDays("admin");
+        deptDTO.setAttendingName("1");
+
+        TBasicDTO deptDTO1 = new TBasicDTO();
+        deptDTO1.setAdmissDate("2");
+        deptDTO1.setAdmissDays("admin2");
+        deptDTO1.setAttendingName("2");
+        return Lists.newArrayList(deptDTO, deptDTO1);
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.docus.server.collect.dept.mq;
+
+import com.docus.server.sys.common.pojo.dto.DeptDTO;
+import com.docus.server.ws.convert.IConverter;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component("powerDeptConverter")
+public class PowerDeptConverter implements IConverter {
+
+    @Override
+    public DeptDTO convert(String message, String methodName) {
+        //TODO： 根据协议进行解析。
+//        XmlUtil xmlParseUtil = XmlUtil.of(message);
+//        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());
+//        deptDto.setSource(message);//原始xml报文
+//
+//        deptDto.setParams(ParamsUtils.addParam("msg", "操作成功！")
+//            .addParam("msgId", deptDto.getMessageId())
+//            .addParam("receiver", deptDto.getReceiver())
+//            .param());
+
+
+        DeptDTO deptDto = new DeptDTO();
+        deptDto.setMessageId(UUID.randomUUID().toString());
+        deptDto.setReceiver("1");
+        deptDto.setOperateType("2");
+        deptDto.setDeptCode("3");
+        deptDto.setDeptName("4");
+        deptDto.setAuthorId("5");
+        deptDto.setAuthorName("6");
+        deptDto.setSource(message);//原始xml报文
+
+        return deptDto;
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.docus.server.collect.dept.ws;
+
+import com.docus.server.collect.service.IWsCollector;
+import com.docus.server.sys.common.pojo.dto.DeptDTO;
+import com.google.common.collect.Lists;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 主动ws
+ */
+@Component("wsDeptCollectorImpl")
+public class WsDeptCollectorImpl implements IWsCollector<DeptDTO> {
+    @Override
+    public List<DeptDTO> get(Date startDate, Date endDate, long pageNum, long pageSize) {
+        DeptDTO deptDTO = new DeptDTO();
+        deptDTO.setAuthorId("1");
+        deptDTO.setAuthorName("admin");
+        deptDTO.setMessageId("1");
+        deptDTO.setOperateType("save");
+        deptDTO.setReceiver("admin");
+
+        DeptDTO deptDTO1 = new DeptDTO();
+        deptDTO1.setAuthorId("2");
+        deptDTO1.setAuthorName("admin2");
+        deptDTO1.setMessageId("2");
+        deptDTO1.setOperateType("save2");
+        deptDTO1.setReceiver("admin2");
+        return Lists.newArrayList(deptDTO, deptDTO1);
+    }
+}

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

@@ -8,6 +8,9 @@ import org.springframework.stereotype.Component;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 主动http
+ */
 @Component("httpUserCollectorImpl")
 public class HttpUserCollectorImpl implements IHttpCollector<UserDTO> {
     @Override

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

@@ -6,6 +6,9 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
+/**
+ * 被动http结果
+ */
 @Component("httpUserResultImpl")
 public class HttpUserResultImpl implements IHttpResult {
 

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

@@ -0,0 +1,66 @@
+package com.docus.server.collect.user.mq;
+
+import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.ws.convert.IConverter;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+/**
+ * 被动ws和http转化器
+ */
+@Component("powerUserConverter")
+public class PowerUserConverter implements IConverter<UserDTO> {
+
+    @Override
+    public UserDTO convert(String message, String methodName) {
+//        XmlUtil xmlParseUtil = XmlUtil.of(message);
+//        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 employeeCodeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/EMPL_CODE/@value");
+//        Node employeeNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/EMPL_NAME/@value");
+//        Node deptCodeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_CODE/@value");
+//        Node positionNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/POSI_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");
+//        UserDTO userDTO = new UserDTO();
+//        userDTO.setDeptId(deptCodeNode.getNodeValue());
+//        userDTO.setReceiver(receiverNode.getNodeValue());
+//        userDTO.setOperateType(operateTypeNode.getNodeValue());
+//        userDTO.setUserName(employeeCodeNode.getNodeValue());
+//        userDTO.setName(employeeNameNode.getNodeValue());
+//        userDTO.setPosition(positionNode.getNodeValue());
+//        userDTO.setAuthorId(authorIdNode.getNodeValue());
+//        userDTO.setMessageId(msgIdNode.getNodeValue());
+//        userDTO.setAuthorName(authorNameNode.getNodeValue());
+//        userDTO.setRoleId(0L);
+//
+//        userDTO.setParams(ParamsUtils.addParam("msg", "操作成功！")
+//            .addParam("msgId", userDTO.getMessageId())
+//            .addParam("receiver", userDTO.getReceiver())
+//            .param());
+
+
+        UserDTO userDTO = new UserDTO();
+        userDTO.setDeptId("1");
+        userDTO.setReceiver("2");
+        userDTO.setOperateType("3");
+        userDTO.setUserName("4");
+        userDTO.setName("5");
+        userDTO.setPosition("6");
+        userDTO.setAuthorId("7");
+        userDTO.setMessageId(UUID.randomUUID().toString());
+        userDTO.setAuthorName("9");
+        userDTO.setRoleId(0L);
+
+//        userDTO.setParams(ParamsUtils.addParam("msg", "操作成功！")
+//                .addParam("msgId", userDTO.getMessageId())
+//                .addParam("receiver", userDTO.getReceiver())
+//                .param());
+
+
+        return userDTO;
+    }
+
+}

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

@@ -6,6 +6,9 @@ import org.springframework.stereotype.Component;
 
 import java.util.UUID;
 
+/**
+ * 被动ws和http转化器
+ */
 @Component("powerUserConverter")
 public class PowerUserConverter implements IConverter<UserDTO> {
 

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

@@ -0,0 +1,33 @@
+package com.docus.server.collect.user.ws;
+
+import com.docus.server.collect.service.IWsCollector;
+import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.google.common.collect.Lists;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 主动ws
+ */
+@Component("wsUserCollectorImpl")
+public class WsUserCollectorImpl implements IWsCollector<UserDTO> {
+    @Override
+    public List<UserDTO> get(Date startDate, Date endDate, long pageNum, long pageSize) {
+        UserDTO deptDTO = new UserDTO();
+        deptDTO.setAuthorId("1");
+        deptDTO.setAuthorName("admin");
+        deptDTO.setMessageId("1");
+        deptDTO.setOperateType("save");
+        deptDTO.setReceiver("admin");
+
+        UserDTO deptDTO1 = new UserDTO();
+        deptDTO1.setAuthorId("2");
+        deptDTO1.setAuthorName("admin2");
+        deptDTO1.setMessageId("2");
+        deptDTO1.setOperateType("save2");
+        deptDTO1.setReceiver("admin2");
+        return Lists.newArrayList(deptDTO, deptDTO1);
+    }
+}

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

@@ -9,6 +9,9 @@ import org.springframework.stereotype.Component;
 import java.util.Date;
 import java.util.Map;
 
+/**
+ * 被动ws结果
+ */
 @Component("wsUserResultImpl")
 public class WsUserResultImpl implements IWsResult {
 

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

@@ -71,7 +71,7 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
         return XxlJobHelper.getJobParam();
     }
 
-    protected abstract void batchInsertOrUpdate(List<T> t);
+    public abstract void batchInsertOrUpdate(List<T> t);
 
-    protected abstract List<T> execute(Date startDate, Date endDate, long pageNum, long pageSize);
+    public abstract List<T> execute(Date startDate, Date endDate, long pageNum, long pageSize);
 }

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

@@ -1,7 +1,7 @@
 package com.docus.server.collect.job.basic;
 
 import com.docus.server.collect.job.AbstractCollectJob;
-import com.docus.server.collect.service.IHttpCollector;
+import com.docus.server.collect.service.ICollector;
 import com.docus.server.record.pojo.dto.TBasicDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
@@ -10,18 +10,24 @@ import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
-
+/**
+ * 主动http请求基础数据job
+ *
+ * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.service.IHttpCollector
+ */
 @Component
 public class TBasicHttpCollectJob extends AbstractCollectJob<TBasicDTO> {
 
     @Resource(name = "httpTBasicCollectorImpl")
-    private IHttpCollector collector;
+    private ICollector collector;
 
     /**
      * xxl jobhandler 手工执行
      */
     @XxlJob("startAllTBasicHttpCollect")
-    public void startAllDeptHttpCollect() {
+    public void startAllTBasicHttpCollect() {
         super.startCollectAll(getJobParam());
     }
 
@@ -29,21 +35,20 @@ public class TBasicHttpCollectJob extends AbstractCollectJob<TBasicDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。
      */
     @XxlJob("startIncTBasicHttpCollect")
-    public void startIncDeptHttpCollect() {
+    public void startIncTBasicHttpCollect() {
         super.startCollectIncrement(getJobParam());
     }
 
 
     @Override
-    protected void batchInsertOrUpdate(List<TBasicDTO> t) {
+    public void batchInsertOrUpdate(List<TBasicDTO> t) {
         basicService.batchSaveBasics(t);
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    protected List<TBasicDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
+    public List<TBasicDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
         //需要根据不同医院去解析不同的内容。使用接口实现的方式。
-
         return collector.get(startDate, endDate, pageNum, pageSize);
     }
 }

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

@@ -10,6 +10,13 @@ import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 主动view请求基础数据job
+ *
+ * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.service.ICollector
+ */
 @Component
 public class TBasicViewCollectJob extends AbstractCollectJob<TBasicDTO> {
     @Resource
@@ -19,7 +26,7 @@ public class TBasicViewCollectJob extends AbstractCollectJob<TBasicDTO> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllTBasicViewCollect")
-    public void startAllDeptViewCollect() {
+    public void startAllTBasicViewCollect() {
         super.startCollectAll(getJobParam());
     }
 
@@ -27,18 +34,18 @@ public class TBasicViewCollectJob extends AbstractCollectJob<TBasicDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncTBasicViewCollect")
-    public void startIncDeptViewCollect() {
+    public void startIncTBasicViewCollect() {
         super.startCollectIncrement(getJobParam());
     }
 
     @Override
-    protected void batchInsertOrUpdate(List<TBasicDTO> t) {
+    public void batchInsertOrUpdate(List<TBasicDTO> t) {
         basicService.batchSaveBasics(t);
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    protected List<TBasicDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
+    public List<TBasicDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
         //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
         return hisService.getTBasicListView(startDate, endDate, pageNum, pageSize);
     }

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

@@ -0,0 +1,52 @@
+package com.docus.server.collect.job.basic;
+
+import com.docus.server.collect.job.AbstractCollectJob;
+import com.docus.server.collect.service.ICollector;
+import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 主动webservice请求基础数据
+ *
+ * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.service.IWsCollector
+ */
+@Component
+public class TBasicWsCollectJob extends AbstractCollectJob<UserDTO> {
+    @Resource(name = "wsBasicCollectorImpl")
+    private ICollector collector;
+
+    /**
+     * xxl jobhandler 手工执行
+     */
+    @XxlJob("startAllUserWsCollect")
+    public void startAllUserWsCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。
+     */
+    @XxlJob("startIncUserWsCollect")
+    public void startIncUserWsCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @Override
+    public void batchInsertOrUpdate(List<UserDTO> t) {
+        userService.batchSaveOrUpdatePowerUser(t);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<UserDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
+        //需要根据不同医院去解析不同的内容。使用接口实现的方式。
+        return collector.get(startDate, endDate, pageNum, pageSize);
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.docus.server.collect.job.dept;
 
 import com.docus.server.collect.job.AbstractCollectJob;
-import com.docus.server.collect.service.IHttpCollector;
+import com.docus.server.collect.service.ICollector;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
@@ -10,12 +10,18 @@ import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
-
+/**
+ * 主动http请求科室数据job
+ *
+ * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.service.IHttpCollector
+ */
 @Component
 public class DeptHttpCollectJob extends AbstractCollectJob<DeptDTO> {
 
     @Resource(name = "httpDeptCollectorImpl")
-    private IHttpCollector collector;
+    private ICollector collector;
 
     /**
      * xxl jobhandler 手工执行
@@ -34,13 +40,13 @@ public class DeptHttpCollectJob extends AbstractCollectJob<DeptDTO> {
     }
 
     @Override
-    protected void batchInsertOrUpdate(List<DeptDTO> t) {
+    public void batchInsertOrUpdate(List<DeptDTO> t) {
         deptService.batchSaveOrUpdatePowerDept(t);
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    protected List<DeptDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
+    public List<DeptDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
         return collector.get(startDate, endDate, pageNum, pageSize);
     }
 }

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

@@ -10,6 +10,13 @@ import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 主动view请求科室数据job
+ *
+ * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.service.ICollector
+ */
 @Component
 public class DeptViewCollectJob extends AbstractCollectJob<DeptDTO> {
     @Resource
@@ -23,7 +30,6 @@ public class DeptViewCollectJob extends AbstractCollectJob<DeptDTO> {
         super.startCollectAll(getJobParam());
     }
 
-
     /**
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
@@ -33,13 +39,13 @@ public class DeptViewCollectJob extends AbstractCollectJob<DeptDTO> {
     }
 
     @Override
-    protected void batchInsertOrUpdate(List<DeptDTO> t) {
+    public void batchInsertOrUpdate(List<DeptDTO> t) {
         deptService.batchSaveOrUpdatePowerDept(t);
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    protected List<DeptDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
+    public List<DeptDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
         //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
         return hisService.getDeptListView(startDate, endDate, pageNum, pageSize);
     }

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

@@ -0,0 +1,52 @@
+package com.docus.server.collect.job.dept;
+
+import com.docus.server.collect.job.AbstractCollectJob;
+import com.docus.server.collect.service.ICollector;
+import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 主动webservice请求科室数据job
+ *
+ * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.service.IWsCollector
+ */
+@Component
+public class DeptWsCollectJob extends AbstractCollectJob<UserDTO> {
+    @Resource(name = "wsDeptCollectorImpl")
+    private ICollector collector;
+
+    /**
+     * xxl jobhandler 手工执行
+     */
+    @XxlJob("startAllUserWsCollect")
+    public void startAllUserWsCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。
+     */
+    @XxlJob("startIncUserWsCollect")
+    public void startIncUserWsCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @Override
+    public void batchInsertOrUpdate(List<UserDTO> t) {
+        userService.batchSaveOrUpdatePowerUser(t);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<UserDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
+        //需要根据不同医院去解析不同的内容。使用接口实现的方式。
+        return collector.get(startDate, endDate, pageNum, pageSize);
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.docus.server.collect.job.user;
 
 import com.docus.server.collect.job.AbstractCollectJob;
-import com.docus.server.collect.service.IHttpCollector;
+import com.docus.server.collect.service.ICollector;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
@@ -10,17 +10,23 @@ import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
-
+/**
+ * 主动http请求用户数据job
+ *
+ * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.service.IHttpCollector
+ */
 @Component
 public class UserHttpCollectJob extends AbstractCollectJob<UserDTO> {
     @Resource(name = "httpUserCollectorImpl")
-    private IHttpCollector collector;
+    private ICollector collector;
 
     /**
      * xxl jobhandler 手工执行
      */
     @XxlJob("startAllUserHttpCollect")
-    public void startAllDeptHttpCollect() {
+    public void startAllUserHttpCollect() {
         super.startCollectAll(getJobParam());
     }
 
@@ -28,18 +34,18 @@ public class UserHttpCollectJob extends AbstractCollectJob<UserDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。
      */
     @XxlJob("startIncUserHttpCollect")
-    public void startIncDeptHttpCollect() {
+    public void startIncUserHttpCollect() {
         super.startCollectIncrement(getJobParam());
     }
 
     @Override
-    protected void batchInsertOrUpdate(List<UserDTO> t) {
+    public void batchInsertOrUpdate(List<UserDTO> t) {
         userService.batchSaveOrUpdatePowerUser(t);
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    protected List<UserDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
+    public List<UserDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
         //需要根据不同医院去解析不同的内容。使用接口实现的方式。
         return collector.get(startDate, endDate, pageNum, pageSize);
     }

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

@@ -10,6 +10,13 @@ import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 主动view请求用户数据job
+ *
+ * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.service.ICollector
+ */
 @Component
 public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
     @Resource
@@ -19,7 +26,7 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllUserViewCollect")
-    public void startAllDeptViewCollect() {
+    public void startAllUserViewCollect() {
         super.startCollectAll(getJobParam());
     }
 
@@ -28,17 +35,17 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncUserViewCollect")
-    public void startIncDeptViewCollect() {
+    public void startIncUserViewCollect() {
         super.startCollectIncrement(getJobParam());
     }
 
     @Override
-    protected void batchInsertOrUpdate(List<UserDTO> t) {
+    public void batchInsertOrUpdate(List<UserDTO> t) {
         userService.batchSaveOrUpdatePowerUser(t);
     }
 
     @Override
-    protected List<UserDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
+    public List<UserDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
         //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
         return hisService.getUserListView(startDate, endDate, pageNum, pageSize);
     }

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

@@ -0,0 +1,52 @@
+package com.docus.server.collect.job.user;
+
+import com.docus.server.collect.job.AbstractCollectJob;
+import com.docus.server.collect.service.ICollector;
+import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 主动webservice请求用户数据job
+ *
+ * @see com.docus.server.collect.job.AbstractCollectJob
+ * @see com.docus.server.collect.job.IJob
+ * @see com.docus.server.collect.service.IWsCollector
+ */
+@Component
+public class UserWsCollectJob extends AbstractCollectJob<UserDTO> {
+    @Resource(name = "wsUserCollectorImpl")
+    private ICollector collector;
+
+    /**
+     * xxl jobhandler 手工执行
+     */
+    @XxlJob("startAllUserWsCollect")
+    public void startAllUserWsCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。
+     */
+    @XxlJob("startIncUserWsCollect")
+    public void startIncUserWsCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @Override
+    public void batchInsertOrUpdate(List<UserDTO> t) {
+        userService.batchSaveOrUpdatePowerUser(t);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<UserDTO> execute(Date startDate, Date endDate, long pageNum, long pageSize) {
+        //需要根据不同医院去解析不同的内容。使用接口实现的方式。
+        return collector.get(startDate, endDate, pageNum, pageSize);
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.docus.server.collect.service;
+
+import java.util.Date;
+import java.util.List;
+
+public interface ICollector<T> {
+    /**
+     * 根据配置获取多态的收集器
+     */
+    List<T> get(Date startDate, Date endDate, long pageNum, long pageSize);
+}

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

@@ -1,11 +1,4 @@
 package com.docus.server.collect.service;
 
-import java.util.Date;
+public interface IHttpCollector<T> extends ICollector<T> {
-import java.util.List;
-
-public interface IHttpCollector<T> {
-    /**
-     * 根据配置获取多态的收集器
-     */
-    List<T> get(Date startDate, Date endDate, long pageNum, long pageSize);
 }

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

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

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

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
  * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举
  * @see com.docus.server.ws.convert.IConverter 通用转化器
  * @see com.docus.server.ws.IWsResult 通用返回结果
- * @see VisitorProcessor 通用处理器
+ * @see com.docus.server.visitor.VisitorProcessor 通用处理器
  */
 @Service
 @Slf4j

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

@@ -24,6 +24,7 @@ public class PowerDeptServiceImpl extends ServiceImpl<PowerDeptMapper, PowerDept
     @Resource
     private IdService idService;
 
+    @Transactional
     @Override
     public void batchSaveOrUpdatePowerDept(List<DeptDTO> deptDTOList) {
         deptDTOList.forEach(this::saveOrUpdatePowerDept);

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

@@ -50,6 +50,7 @@ public class PowerUserServiceImpl extends ServiceImpl<PowerUserMapper, PowerUser
         return true;
     }
 
+    @Transactional
     @Override
     public boolean delUserByUserName(String userName) {
         PowerUser powerUser = baseMapper.getUserByUserName(userName);