From 898668a70a9e9f6934ebe059ae064d43489e0191 Mon Sep 17 00:00:00 2001 From: beeajax <1105173470@qq.com> Date: Wed, 7 Jun 2023 22:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8DIResult=EF=BC=8C=E8=AE=A9ws?= =?UTF-8?q?=E5=92=8C=E8=A2=AB=E5=8A=A8http=E8=87=AA=E5=8A=A8=E9=80=82?= =?UTF-8?q?=E9=85=8D=E4=B8=8D=E5=90=8C=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/http/HttpBasicResultImpl.java | 7 ++ .../basic/http/HttpTBasicCollectorImpl.java | 6 ++ .../collect/basic/ws/TBasicConverter.java | 7 ++ .../collect/basic/ws/WsBasicResultImpl.java | 67 ++++++++++--------- .../server/visitor/VisitorProcessor.java | 3 +- 5 files changed, 58 insertions(+), 32 deletions(-) diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpBasicResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpBasicResultImpl.java index 05ec9ef..a3441f7 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpBasicResultImpl.java +++ b/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 { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java index 95106f6..9463b4f 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java +++ b/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 { @Override diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/TBasicConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/TBasicConverter.java index 5c2ba5a..690e4ce 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/TBasicConverter.java +++ b/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 { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicResultImpl.java index e8ac195..0d89b4d 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicResultImpl.java +++ b/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 params) { String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); return " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "\n"; + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n"; } } diff --git a/common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java b/common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java index e5b6149..91549b4 100644 --- a/common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java +++ b/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(convert); + String jsonStr = JSON.toJSON(converter.convert(message, context.getMethodName())); Long taskId = messageService.insertTaskOriginalMessage(jsonStr, message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup())); Map params = context.getParams(); params.put("taskId", taskId);