适配IResult，让ws和被动http自动适配不同返回值

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

@@ -1,11 +1,18 @@
 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 org.springframework.stereotype.Component;
 
 import java.util.Map;
 
+/**
+ * 被动http返回响应类型，需要和controller返回类型一致
+ *
+ * @see com.docus.server.collect.controller.BasicController#insertHttpPassiveBasic(String)
+ * @see com.docus.server.visitor.VisitorProcessor#doProcess(TrackContext)
+ */
 @Component("httpBasicResultImpl")
 public class HttpBasicResultImpl implements IHttpResult {
 

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

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

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

@@ -1,10 +1,17 @@
 package com.docus.server.collect.basic.ws;
 
 import com.docus.core.util.DateUtil;
+import com.docus.log.context.TrackContext;
 import com.docus.server.record.pojo.dto.TBasicDTO;
 import com.docus.server.ws.convert.IConverter;
 import org.springframework.stereotype.Component;
 
+/**
+ * 被动请求参数转化器
+ *
+ * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String)
+ * @see com.docus.server.visitor.VisitorProcessor#beforeProcess(TrackContext)
+ */
 @Component("tBasicConverter")
 public class TBasicConverter implements IConverter<TBasicDTO> {
 

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

@@ -2,12 +2,19 @@ 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 org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.Map;
 
+/**
+ * webservice被动请求响应类型，需要和controller返回类型保持一致
+ *
+ * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String)
+ * @see com.docus.server.visitor.VisitorProcessor#doProcess(TrackContext)
+ */
 @Component("wsBasicResultImpl")
 public class WsBasicResultImpl implements IWsResult {
 
@@ -21,35 +28,35 @@ public class WsBasicResultImpl implements IWsResult {
     public String fail(Map<String, Object> params) {
         String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI);
         return "<MCCI_IN000002UV01 xmlns=\"urn:hl7-org:v3\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ITSVersion=\"XML_1.0\" xsi:schemaLocation=\"urn:hl7-org:v3  file:///E:/hl7/HL7/v3ballot_fullsite_2011MAY/v3ballot/html/processable/multicacheschemas/MCCI_IN000002UV01.xsd\">  \n" +
-                "  <id extension=\"" + Func.randomUUID() + "\"/>  \n" +
+            "  <id extension=\"" + Func.randomUUID() + "\"/>  \n" +
-                "  <creationTime value=\"" + createTime + "\"/>  \n" +
+            "  <creationTime value=\"" + createTime + "\"/>  \n" +
-                "  <interactionId root=\"2.16.840.1.113883.1.6\" extension=\"MCCI_IN000002UV01\" displayable=\"true\"/>  \n" +
+            "  <interactionId root=\"2.16.840.1.113883.1.6\" extension=\"MCCI_IN000002UV01\" displayable=\"true\"/>  \n" +
-                "  <processingCode code=\"P\"/>  \n" +
+            "  <processingCode code=\"P\"/>  \n" +
-                "  <processingModeCode/>  \n" +
+            "  <processingModeCode/>  \n" +
-                "  <acceptAckCode code=\"AL\"/>  \n" +
+            "  <acceptAckCode code=\"AL\"/>  \n" +
-                "  <receiver typeCode=\"RCV\"> \n" +
+            "  <receiver typeCode=\"RCV\"> \n" +
-                "    <device classCode=\"DEV\" determinerCode=\"INSTANCE\"> \n" +
+            "    <device classCode=\"DEV\" determinerCode=\"INSTANCE\"> \n" +
-                "      <id> \n" +
+            "      <id> \n" +
-                "        <item extension=\"" + params.get("receive") + "\"/> \n" +
+            "        <item extension=\"" + params.get("receive") + "\"/> \n" +
-                "      </id> \n" +
+            "      </id> \n" +
-                "    </device> \n" +
+            "    </device> \n" +
-                "  </receiver>  \n" +
+            "  </receiver>  \n" +
-                "  <sender typeCode=\"SND\"> \n" +
+            "  <sender typeCode=\"SND\"> \n" +
-                "    <device classCode=\"DEV\" determinerCode=\"INSTANCE\"> \n" +
+            "    <device classCode=\"DEV\" determinerCode=\"INSTANCE\"> \n" +
-                "      <id> \n" +
+            "      <id> \n" +
-                "        <item extension=\"" + params.get("send") + "\"/> \n" +
+            "        <item extension=\"" + params.get("send") + "\"/> \n" +
-                "      </id> \n" +
+            "      </id> \n" +
-                "    </device> \n" +
+            "    </device> \n" +
-                "  </sender>  \n" +
+            "  </sender>  \n" +
-                "  <acknowledgement typeCode=\"AE\"> \n" +
+            "  <acknowledgement typeCode=\"AE\"> \n" +
-                "    <!--请求消息ID-->  \n" +
+            "    <!--请求消息ID-->  \n" +
-                "    <targetMessage> \n" +
+            "    <targetMessage> \n" +
-                "      <id extension=\"" + params.get("serialId") + "\"/> \n" +
+            "      <id extension=\"" + params.get("serialId") + "\"/> \n" +
-                "    </targetMessage>  \n" +
+            "    </targetMessage>  \n" +
-                "    <acknowledgementDetail> \n" +
+            "    <acknowledgementDetail> \n" +
-                "      <text value=\"" + params.get("msg") + "\"/> \n" +
+            "      <text value=\"" + params.get("msg") + "\"/> \n" +
-                "    </acknowledgementDetail> \n" +
+            "    </acknowledgementDetail> \n" +
-                "  </acknowledgement> \n" +
+            "  </acknowledgement> \n" +
-                "</MCCI_IN000002UV01>\n";
+            "</MCCI_IN000002UV01>\n";
     }
 }

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

@@ -36,8 +36,7 @@ public class VisitorProcessor extends AbstractProcessor {
         if (Func.isEmpty(message)) {
             throw new RuntimeException("参数为空");
         }
-        Object convert = converter.convert(message, context.getMethodName());
+        String jsonStr = JSON.toJSON(converter.convert(message, context.getMethodName()));
-        String jsonStr = JSON.toJSON(convert);
         Long taskId = messageService.insertTaskOriginalMessage(jsonStr, message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup()));
         Map<String, Object> params = context.getParams();
         params.put("taskId", taskId);