Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java

@@ -7,7 +7,7 @@ import cn.axzo.msg.center.message.domain.param.PendingMessagePushParam;
 import cn.axzo.msg.center.message.service.PendingMessageNewService;
 import cn.axzo.msg.center.service.enums.TerminalTypeEnum;
 import cn.axzo.msg.center.service.pending.client.PendingMessageClient;
-import cn.axzo.msg.center.service.pending.request.MessageGroupNodeStatisticRequest;
+import cn.axzo.msg.center.service.pending.request.PendingMessageStatisticRequest;
 import cn.axzo.msg.center.service.pending.request.PendingMessagePageRequest;
 import cn.axzo.msg.center.service.pending.request.PendingMessagePushRequest;
 import cn.axzo.msg.center.service.pending.response.PendingMessageStatisticResponse;
@@ -35,7 +35,7 @@ public class PendingMessageNewController implements PendingMessageClient {
     private final PendingMessageNewService pendingMessageNewService;
 
     @Override
-    public CommonResponse<List<PendingMessageStatisticResponse>> groupStatistic(MessageGroupNodeStatisticRequest request) {
+    public CommonResponse<List<PendingMessageStatisticResponse>> groupStatistic(PendingMessageStatisticRequest request) {
         List<PendingMessageStatisticDTO> groupNodes = pendingMessageNewService
                 .groupStatistic(MessageGroupNodeStatisticParam.from(request));
         return CommonResponse.success(groupNodes.stream()

inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java

@@ -128,7 +128,8 @@ public class PendingMessageDTO implements Serializable {
                 .identityCode(this.identityCode)
                 .title(this.title)
                 .content(this.content)
-                .cardContent(this.cardContent)
+                // TODO: [cold_blade] [P0] 待实现
+//                .cardContent(this.cardContent)
                 .promoterPersonId(Optional.ofNullable(this.promoter).map(PersonDTO::getId).orElse(null))
                 .promoterIdentity(Optional.ofNullable(this.promoter).map(PersonDTO::getIdentity).orElse(null))
                 .executorPersonId(Optional.ofNullable(this.executor).map(PersonDTO::getId).orElse(null))
@@ -141,8 +142,7 @@ public class PendingMessageDTO implements Serializable {
                 .updateTimestamp(DateFormatUtil.toTimestamp(this.updateTime))
                 // TODO:[cold_blade] [P0]
 //                .routers(this.routers)
-                .routerParams(this.routerParams)
+//                .routerParams(this.routerParams)
-                .bizExtParams("{}")
                 .build();
     }
 

inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageGroupNodeStatisticParam.java

@@ -4,7 +4,7 @@ import cn.axzo.core.utils.converter.BeanConverter;
 import cn.axzo.msg.center.service.dto.IdentityDTO;
 import cn.axzo.msg.center.service.dto.PersonDTO;
 import cn.axzo.msg.center.service.enums.AppTerminalTypeEnum;
-import cn.axzo.msg.center.service.pending.request.MessageGroupNodeStatisticRequest;
+import cn.axzo.msg.center.service.pending.request.PendingMessageStatisticRequest;
 import com.alibaba.fastjson.JSON;
 import lombok.Getter;
 import lombok.Setter;
@@ -44,7 +44,7 @@ public class MessageGroupNodeStatisticParam implements Serializable {
      */
     private Boolean withIdentify;
 
-    public static MessageGroupNodeStatisticParam from(MessageGroupNodeStatisticRequest request) {
+    public static MessageGroupNodeStatisticParam from(PendingMessageStatisticRequest request) {
         MessageGroupNodeStatisticParam param = BeanConverter.convert(request, MessageGroupNodeStatisticParam.class);
         IdentityDTO identity = IdentityDTO.builder()
                 .id(request.getIdentityId())

msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java

@@ -2,11 +2,11 @@ package cn.axzo.msg.center.service.pending.client;
 
 import cn.axzo.msg.center.service.enums.TerminalTypeEnum;
 import cn.axzo.msg.center.service.pending.client.fallback.PendingMessageClientFallback;
-import cn.axzo.msg.center.service.pending.request.MessageGroupNodeStatisticRequest;
 import cn.axzo.msg.center.service.pending.request.PendingMessagePageRequest;
 import cn.axzo.msg.center.service.pending.request.PendingMessagePushRequest;
-import cn.axzo.msg.center.service.pending.response.PendingMessageStatisticResponse;
+import cn.axzo.msg.center.service.pending.request.PendingMessageStatisticRequest;
 import cn.axzo.msg.center.service.pending.response.PendingMessageResponse;
+import cn.axzo.msg.center.service.pending.response.PendingMessageStatisticResponse;
 import cn.azxo.framework.common.model.CommonResponse;
 import cn.azxo.framework.common.model.Page;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -34,7 +34,7 @@ public interface PendingMessageClient {
 
     @PostMapping(value = "/pending-message/record/group/statistic", produces = {MediaType.APPLICATION_JSON_VALUE})
     CommonResponse<List<PendingMessageStatisticResponse>> groupStatistic(@RequestBody @Valid
-                                                                  MessageGroupNodeStatisticRequest request);
+                                                                         PendingMessageStatisticRequest request);
 
     /**
      * 代办列表分页查询

msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/fallback/PendingMessageClientFallback.java

@@ -2,7 +2,7 @@ package cn.axzo.msg.center.service.pending.client.fallback;
 
 import cn.axzo.msg.center.service.enums.TerminalTypeEnum;
 import cn.axzo.msg.center.service.pending.client.PendingMessageClient;
-import cn.axzo.msg.center.service.pending.request.MessageGroupNodeStatisticRequest;
+import cn.axzo.msg.center.service.pending.request.PendingMessageStatisticRequest;
 import cn.axzo.msg.center.service.pending.request.PendingMessagePageRequest;
 import cn.axzo.msg.center.service.pending.request.PendingMessagePushRequest;
 import cn.axzo.msg.center.service.pending.response.PendingMessageStatisticResponse;
@@ -26,7 +26,7 @@ import java.util.List;
 public class PendingMessageClientFallback implements PendingMessageClient {
 
     @Override
-    public CommonResponse<List<PendingMessageStatisticResponse>> groupStatistic(MessageGroupNodeStatisticRequest request) {
+    public CommonResponse<List<PendingMessageStatisticResponse>> groupStatistic(PendingMessageStatisticRequest request) {
         log.error("fall back while statistic pending message. req:{}", request);
         return CommonResponse.error("fall back while statistic pending message");
     }

msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java

@@ -2,6 +2,7 @@ package cn.axzo.msg.center.service.pending.request;
 
 import cn.axzo.basics.common.page.PageRequest;
 import cn.axzo.msg.center.service.dto.QueryOrderByDTO;
+import cn.axzo.msg.center.service.enums.BizFinalStateEnum;
 import cn.axzo.msg.center.service.enums.IdentityTypeEnum;
 import cn.axzo.msg.center.service.enums.PendingMessageRoleCategoryEnum;
 import cn.axzo.msg.center.service.enums.PendingMessageStateEnum;
@@ -71,6 +72,13 @@ public class PendingMessagePageRequest extends PageRequest implements Serializab
      *   DELETED: 已删除
      */
     private PendingMessageStateEnum msgState;
+    /**
+     * COMPLETED: 已处理
+     * RETRACT: 已撤销
+     * PASSED: 已通过
+     * REJECTED: 已拒绝
+     */
+    private BizFinalStateEnum bizFinalState;
     /**
      * 代办消息的分类结点编码
      */

msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessageStatisticRequest.java

@@ -19,7 +19,7 @@ import java.util.Collection;
  */
 @Setter
 @Getter
-public class MessageGroupNodeStatisticRequest implements Serializable {
+public class PendingMessageStatisticRequest implements Serializable {
 
     private static final long serialVersionUID = 9160942889637654608L;
 

msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java

@@ -1,7 +1,9 @@
 package cn.axzo.msg.center.service.pending.response;
 
+import cn.axzo.msg.center.service.dto.BizDetailShowStrategyDTO;
 import cn.axzo.msg.center.service.dto.IdentityDTO;
-import cn.axzo.msg.center.service.dto.MessageRouterDTO;
+import cn.axzo.msg.center.service.dto.MessageCardContentItemDTO;
+import cn.axzo.msg.center.service.dto.MessageRouterButtonDTO;
 import cn.axzo.msg.center.service.enums.BizCategoryEnum;
 import com.alibaba.fastjson.JSON;
 import lombok.AllArgsConstructor;
@@ -44,7 +46,7 @@ public class PendingMessageResponse implements Serializable {
     /**
      * 卡片信息
      */
-    private String cardContent;
+    private List<MessageCardContentItemDTO> cardItems;
     /**
      * 代办发起者自然人id
      */
@@ -73,6 +75,10 @@ public class PendingMessageResponse implements Serializable {
      * 业务状态描述
      */
     private String bizDesc;
+    /**
+     * 业务标签
+     */
+    private String bizFlag;
     /**
      * 业务类型
      */
@@ -86,17 +92,21 @@ public class PendingMessageResponse implements Serializable {
      */
     private Long updateTimestamp;
     /**
-     * 路由信息,可为空 TODO:[cold_blade] [P0]
+     * 待办截至时间戳
      */
-    private List<MessageRouterDTO> routers;
+    private Long deadlineTimestamp;
     /**
-     * 参数及其对应的值的JSON串
+     * 业务详情路由策略
      */
-    private String routerParams;
+    private BizDetailShowStrategyDTO detailShowStrategy;
     /**
-     * 业务扩展参数
+     * 按钮路由策略
      */
-    private String bizExtParams;
+    private List<MessageRouterButtonDTO> routeButtons;
+    /**
+     * 业务终态的印章图片地址
+     */
+    private String bizFinalStateIconUrl;
 
     @Override
     public String toString() {