From 35082f74b80643efc5e96b1031d80f119682f7d7 Mon Sep 17 00:00:00 2001 From: linrf Date: Wed, 7 Jun 2023 18:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=86=99http=E8=A2=AB=E5=8A=A8?= =?UTF-8?q?=E6=8E=A5=E6=94=B6user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/user/http/HttpUserResultImpl.java | 22 ++++++++ .../controller/PowerUserController.java | 54 +++++++++++++++++++ .../infrastructure/dao/CollectTypeEnum.java | 4 +- .../server/visitor/VisitorProcessor.java | 5 ++ .../java/com/docus/server/ws/IHttpResult.java | 6 +++ .../java/com/docus/server/ws/IResult.java | 11 ++++ .../java/com/docus/server/ws/IWsResult.java | 7 +-- .../docus/server/ws/impl/UserServerImpl.java | 2 +- 8 files changed, 103 insertions(+), 8 deletions(-) create mode 100644 collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserResultImpl.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/controller/PowerUserController.java create mode 100644 common-collect/src/main/java/com/docus/server/ws/IHttpResult.java create mode 100644 common-collect/src/main/java/com/docus/server/ws/IResult.java diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserResultImpl.java new file mode 100644 index 0000000..6e81777 --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserResultImpl.java @@ -0,0 +1,22 @@ +package com.docus.server.collect.user.http; + +import com.docus.core.util.json.JSON; +import com.docus.infrastructure.web.api.CommonResult; +import com.docus.server.ws.IHttpResult; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component("httpUserResultImpl") +public class HttpUserResultImpl implements IHttpResult { + + @Override + public String ok(Map params) { + return JSON.toJSON(CommonResult.success("ok")); + } + + @Override + public String fail(Map params) { + return JSON.toJSON(CommonResult.failed("fail")); + } +} diff --git a/common-collect/src/main/java/com/docus/server/collect/controller/PowerUserController.java b/common-collect/src/main/java/com/docus/server/collect/controller/PowerUserController.java new file mode 100644 index 0000000..b29d226 --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/controller/PowerUserController.java @@ -0,0 +1,54 @@ +package com.docus.server.collect.controller; + +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.sys.common.pojo.dto.UserDTO; +import com.docus.server.visitor.VisitorProcessor; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author wen yongbin + * @date 2023年2月25日21:56:33 + * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举 + * @see com.docus.server.ws.convert.IConverter 通用转化器 + * @see com.docus.server.ws.IWsResult 通用返回结果 + * @see VisitorProcessor 通用处理器 + */ +@Slf4j +@RestController +@Api(value = "用户管理接口", tags = "用户管理接口") +@RequestMapping("/api/http/user") +public class PowerUserController { + protected final static String DEL_TYPE = "D"; + @Resource + private CollectService collectService; + + /** + * 被动http 用户信息接收，进行操作 + * + * @param message 接收到的用户参数 + * @return 返回结果 + */ + @ApiOperation("新增/编辑用户(根据id)") + @PostMapping("/update") + @TrackGroup( + group = "HTTP_PASSIVE_USER", + beanNames = {"powerUserConverter", "httpResultAdapter"}, + processor = VisitorProcessor.class) + public String httpPassiveUser(String message) { + log.debug("新增/修改用户数据：{}", message); + collectService.insertOrUpdateUser(JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), UserDTO.class)); + return null; + } + + +} diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java b/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java index 283d9fd..c0d1db4 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java +++ b/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java @@ -11,7 +11,9 @@ public enum CollectTypeEnum implements IIntegerEnum { WEBSERVICE_XML_ICU_REPORT(4, "WEBSERVICE_XML_ICU_REPORT", "新增-重症报告信息"), WEBSERVICE_XML_EXAMINATION_REPORT(5, "WEBSERVICE_XML_EXAMINATION_REPORT", "新增-检验报告信息"), WEBSERVICE_XML_INSERT_INSPECTION_REPORT(6, "WEBSERVICE_XML_INSERT_INSPECTION_REPORT", "新增-检查报告的信息"), - WEBSERVICE_XML_UPDATE_INSPECTION_REPORT(7, "WEBSERVICE_XML_UPDATE_INSPECTION_REPORT", "更新-检查报告的信息"); + WEBSERVICE_XML_UPDATE_INSPECTION_REPORT(7, "WEBSERVICE_XML_UPDATE_INSPECTION_REPORT", "更新-检查报告的信息"), + + HTTP_PASSIVE_USER(8, "HTTP_PASSIVE_USER", "新增/修改-用户信息"); private Integer value; private String display; 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 32a3983..17ca7e2 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 @@ -8,6 +8,8 @@ import com.docus.server.collect.infrastructure.dao.CollectTypeEnum; import com.docus.server.collect.infrastructure.dao.StateEnum; import com.docus.server.collect.infrastructure.enums.IIntegerEnum; import com.docus.server.tool.SpringUtils; +import com.docus.server.ws.HttpResultAdapter; +import com.docus.server.ws.IHttpResult; import com.docus.server.ws.ITaskOriginalMessageService; import com.docus.server.ws.IWsResult; import com.docus.server.ws.convert.IConverter; @@ -41,6 +43,7 @@ public class VisitorProcessor extends AbstractProcessor { Map params = context.getParams(); params.put("taskId", taskId); params.put("jsonStr", jsonStr); + params.put("methodName", context.getMethodName()); return null; } @@ -79,6 +82,8 @@ public class VisitorProcessor extends AbstractProcessor { * 初始化bean */ private void initBeans(String[] beanNames) { + HttpResultAdapter httpResultAdapter = new HttpResultAdapter((IHttpResult) SpringUtils.getBean(beanNames[0])); + SpringUtils.initializeBean(httpResultAdapter); this.converter = (IConverter) SpringUtils.getBean(beanNames[0]); this.wsResult = (IWsResult) SpringUtils.getBean(beanNames[1]); this.messageService = SpringUtils.getBean(ITaskOriginalMessageService.class); diff --git a/common-collect/src/main/java/com/docus/server/ws/IHttpResult.java b/common-collect/src/main/java/com/docus/server/ws/IHttpResult.java new file mode 100644 index 0000000..8f28f24 --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/ws/IHttpResult.java @@ -0,0 +1,6 @@ +package com.docus.server.ws; + +public interface IHttpResult extends IResult { + + +} diff --git a/common-collect/src/main/java/com/docus/server/ws/IResult.java b/common-collect/src/main/java/com/docus/server/ws/IResult.java new file mode 100644 index 0000000..7cb6941 --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/ws/IResult.java @@ -0,0 +1,11 @@ +package com.docus.server.ws; + +import java.util.Map; + +public interface IResult { + + String ok(Map params); + + String fail(Map params); + +} diff --git a/common-collect/src/main/java/com/docus/server/ws/IWsResult.java b/common-collect/src/main/java/com/docus/server/ws/IWsResult.java index cc8997a..500bb7a 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IWsResult.java +++ b/common-collect/src/main/java/com/docus/server/ws/IWsResult.java @@ -1,11 +1,6 @@ package com.docus.server.ws; -import java.util.Map; +public interface IWsResult extends IResult { -public interface IWsResult { - - String ok(Map params); - - String fail(Map params); } diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java b/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java index a557860..96fe79c 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java @@ -27,7 +27,7 @@ public class UserServerImpl implements IUserServer { private CollectService collectService; /** - * 用户信息接收，进行操作 + * ws 用户信息接收，进行操作 * * @param message 接收到的用户参数 * @return 返回结果