From 1f7187696ca10872a31e1316610ab138481336c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=89=8D=E7=A6=8F?= Date: Fri, 16 Jun 2023 13:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85=E6=88=90=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inside-notices/pom.xml | 6 +++ .../service/impl/InsideNoticesApiImpl.java | 13 ++--- .../axzo/msg/center/api/InsideNoticesApi.java | 11 ++-- .../cn/axzo/msg/center/api/MNSNoticesApi.java | 2 +- .../axzo/msg/center/api/MessagePushApi.java | 2 +- .../fallback/InsideNoticesApiFallBack.java | 10 ++-- .../center/api/request/MessageTotalReq.java | 18 +++++++ msg-center-domain/pom.xml | 8 +++ .../domain/enums/InsideReceiveTypeEnum.java | 52 +++++++++++++++++++ 9 files changed, 99 insertions(+), 23 deletions(-) create mode 100644 msg-center-api/src/main/java/cn/axzo/msg/center/api/request/MessageTotalReq.java create mode 100644 msg-center-domain/src/main/java/cn/axzo/msg/center/domain/enums/InsideReceiveTypeEnum.java diff --git a/inside-notices/pom.xml b/inside-notices/pom.xml index 7ac31bd0..95fc1d2f 100644 --- a/inside-notices/pom.xml +++ b/inside-notices/pom.xml @@ -109,6 +109,12 @@ alibaba-dingtalk-service-sdk 2.0.0 + + cn.axzo.msg.notices.service.api + msg-notices-service-api + 1.0.0-SNAPSHOT + compile + \ No newline at end of file diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java index f1e0efc9..e7fc3082 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideNoticesApiImpl.java @@ -5,10 +5,7 @@ import cn.axzo.core.web.Result; import cn.axzo.core.web.Results; import cn.axzo.msg.center.api.InsideNoticesApi; import cn.axzo.msg.center.api.enums.MsgStateEnum; -import cn.axzo.msg.center.api.request.CmsMsgQueryReq; -import cn.axzo.msg.center.api.request.GeneralMessage; -import cn.axzo.msg.center.api.request.MessageNewRes; -import cn.axzo.msg.center.api.request.MsgReturnParamRes; +import cn.axzo.msg.center.api.request.*; import cn.axzo.msg.center.api.response.MessageTotalRes; import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.api.response.Relation; @@ -63,12 +60,12 @@ public class InsideNoticesApiImpl implements InsideNoticesApi { } @Override - public Result msgTotal(Long personId, Long identityId, Integer userType) { - if(personId ==null || identityId == null || userType == null){ + public Result msgTotal(MessageTotalReq req) { + if(req== null || req.getIdentityId() ==null || req.getPersonId() == null || req.getUserType() == null){ throw new IllegalArgumentException("personId、identityId、userType不能为空"); } - UserTypeEnum userTypeEnum = UserTypeEnum.valueOf(userType); - MessageTotalRes messageTotalRes = messageCoreService.statisticsMsg(personId, identityId, userTypeEnum); + UserTypeEnum userTypeEnum = UserTypeEnum.valueOf(req.getUserType()); + MessageTotalRes messageTotalRes = messageCoreService.statisticsMsg(req.getPersonId(), req.getIdentityId(), userTypeEnum); return Results.ok(messageTotalRes); } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java index 549a6fda..d1155ba5 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideNoticesApi.java @@ -4,10 +4,7 @@ package cn.axzo.msg.center.api; import cn.axzo.core.web.Result; import cn.axzo.msg.center.api.enums.MsgStateEnum; import cn.axzo.msg.center.api.fallback.InsideNoticesApiFallBack; -import cn.axzo.msg.center.api.request.CmsMsgQueryReq; -import cn.axzo.msg.center.api.request.GeneralMessage; -import cn.axzo.msg.center.api.request.MessageNewRes; -import cn.axzo.msg.center.api.request.MsgReturnParamRes; +import cn.axzo.msg.center.api.request.*; import cn.axzo.msg.center.api.response.MessageTotalRes; import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.api.response.Relation; @@ -22,7 +19,7 @@ import java.util.List; /** * 站内消息相关接口 */ -@FeignClient(name = "msg-center", url = "http://msg-center:10086", fallback = InsideNoticesApiFallBack.class) +@FeignClient(name = "msg-center", url = "http://127.0.0.1:10086", fallback = InsideNoticesApiFallBack.class) @Component public interface InsideNoticesApi { @@ -40,9 +37,9 @@ public interface InsideNoticesApi { * * @return */ - @GetMapping("msg/total") + @PostMapping("msg/total") //@PreBuildContext - Result msgTotal(Long personId, Long identityId, Integer userType); + Result msgTotal(MessageTotalReq req); /** * 消息列表搜索、待办列表 diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java index 06f6e35f..0ea3e116 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping; /** * 短信消息相关接口 */ -@FeignClient(name = "msg-center", url = "http://msg-center:10086",fallback = MNSNoticesApiFallBack.class) +@FeignClient(name = "msg-center", url = "http://127.0.0.1:10086",fallback = MNSNoticesApiFallBack.class) @Component public interface MNSNoticesApi { diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/MessagePushApi.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/MessagePushApi.java index d444bd1d..fe2ceb20 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/MessagePushApi.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/MessagePushApi.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody; /** * 发送app push消息，底层使用友盟 */ -@FeignClient(value = "msg-center", url = "http://msg-center:10086", fallbackFactory = MessagePushFallbackFactory.class) +@FeignClient(value = "msg-center", url = "http://127.0.0.1:10086", fallbackFactory = MessagePushFallbackFactory.class) @Component public interface MessagePushApi { diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java index bdea4a94..d8c53efc 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideNoticesApiFallBack.java @@ -4,14 +4,12 @@ import cn.axzo.core.web.Result; import cn.axzo.core.web.Results; import cn.axzo.msg.center.api.InsideNoticesApi; import cn.axzo.msg.center.api.enums.MsgStateEnum; -import cn.axzo.msg.center.api.request.CmsMsgQueryReq; -import cn.axzo.msg.center.api.request.GeneralMessage; -import cn.axzo.msg.center.api.request.MessageNewRes; -import cn.axzo.msg.center.api.request.MsgReturnParamRes; +import cn.axzo.msg.center.api.request.*; import cn.axzo.msg.center.api.response.MessageTotalRes; import cn.axzo.msg.center.api.response.PageResult; import cn.axzo.msg.center.api.response.Relation; import cn.axzo.msg.center.api.response.Template; +import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -34,8 +32,8 @@ public class InsideNoticesApiFallBack implements InsideNoticesApi { } @Override - public Result msgTotal(Long personId, Long identityId, Integer userType) { - log.info("消息待办数量总数超时"); + public Result msgTotal(MessageTotalReq req) { + log.info("消息待办数量总数超时,req={}", JSONUtil.toJsonStr(req)); return Results.fail("消息待办数量总数超时"); } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/MessageTotalReq.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/MessageTotalReq.java new file mode 100644 index 00000000..30779eac --- /dev/null +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/MessageTotalReq.java @@ -0,0 +1,18 @@ +package cn.axzo.msg.center.api.request; + +import lombok.Data; + +@Data +public class MessageTotalReq { + + /** + * 自然人id + */ + private Long personId; + + private Long identityId; + /** + * 用户类型 + */ + private Integer userType; +} diff --git a/msg-center-domain/pom.xml b/msg-center-domain/pom.xml index 7f2d1c4c..d0cd1885 100644 --- a/msg-center-domain/pom.xml +++ b/msg-center-domain/pom.xml @@ -28,6 +28,14 @@ msg-notices-common 1.0.0-SNAPSHOT + diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/enums/InsideReceiveTypeEnum.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/enums/InsideReceiveTypeEnum.java new file mode 100644 index 00000000..055c01c8 --- /dev/null +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/enums/InsideReceiveTypeEnum.java @@ -0,0 +1,52 @@ +package cn.axzo.msg.center.domain.enums; + + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; + +import java.util.Arrays; + +/** + * 1 cm_leader; 2 cm_worker; 3 cmp; 9 not_identity + * + * @author wangli + * @date 2022/3/21 21:01 + */ +@Getter +public enum InsideReceiveTypeEnum { + CM_LEADER(1, "cm_leader"), + CM_WORKER(2, "cm_worker"), + CMP_USER(3, "cmp"), + // 主要用于交易侧无身份的情况 + NOT_IDENTITY(9, "not_identity"), + ; + + @EnumValue + private final Integer code; + @JsonValue + private final String message; + + InsideReceiveTypeEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return this.code; + } + + public String getMessage() { + return this.message; + } + + public static InsideReceiveTypeEnum getByMessage(String message) { + return Arrays.stream(values()).filter(it -> it.message.equals(message)).findFirst() + .orElse(null); + } + + public static InsideReceiveTypeEnum valueOf(Integer code) { + return Arrays.stream(values()).filter(it -> it.code.equals(code)).findFirst() + .orElse(null); + } +}