封装成实体对象

inside-notices/pom.xml

@@ -109,6 +109,12 @@
             <artifactId>alibaba-dingtalk-service-sdk</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.notices.service.api</groupId>
+            <artifactId>msg-notices-service-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

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.*;
-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.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<MessageTotalRes> msgTotal(Long personId, Long identityId, Integer userType) {
+    public Result<MessageTotalRes> msgTotal(MessageTotalReq req) {
-        if(personId ==null || identityId == null || userType == null){
+        if(req== null || req.getIdentityId() ==null || req.getPersonId() == null || req.getUserType() == null){
             throw new IllegalArgumentException("personId、identityId、userType不能为空");
         }
-        UserTypeEnum userTypeEnum = UserTypeEnum.valueOf(userType);
+        UserTypeEnum userTypeEnum = UserTypeEnum.valueOf(req.getUserType());
-        MessageTotalRes messageTotalRes = messageCoreService.statisticsMsg(personId, identityId, userTypeEnum);
+        MessageTotalRes messageTotalRes = messageCoreService.statisticsMsg(req.getPersonId(), req.getIdentityId(), userTypeEnum);
         return Results.ok(messageTotalRes);
     }
 

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.*;
-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.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<MessageTotalRes> msgTotal(Long personId, Long identityId, Integer userType);
+  Result<MessageTotalRes> msgTotal(MessageTotalReq req);
 
   /**
    * 消息列表搜索、待办列表

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 {
 

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 {
 

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.*;
-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.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<MessageTotalRes> msgTotal(Long personId, Long identityId, Integer userType) {
+  public Result<MessageTotalRes> msgTotal(MessageTotalReq req) {
-    log.info("消息待办数量总数超时");
+    log.info("消息待办数量总数超时,req={}", JSONUtil.toJsonStr(req));
     return Results.fail("消息待办数量总数超时");
   }
 

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;
+}

msg-center-domain/pom.xml

@@ -28,6 +28,14 @@
             <artifactId>msg-notices-common</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
+        <!--<dependency>
+            <groupId>cn.axzo.trade</groupId>
+            <artifactId>trade-data-security-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>-->
     </dependencies>
 
     <properties>

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);
+  }
+}