message-service 的 UserMessage#msgType 字段必须有非 null 值

message/message-api/src/main/java/cn/reghao/tnb/message/api/dto/MediaProgress.java

@@ -21,8 +21,8 @@ public class MediaProgress implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private String mediaId;
-    private Integer mediaType;
-    private Double currentTime;
-    private Boolean ended;
-    private Long userId;
+    private int mediaType;
+    private double currentTime;
+    private boolean ended;
+    private long userId;
 }

message/message-api/src/main/java/cn/reghao/tnb/message/api/dto/UserMessageDto.java

@@ -16,7 +16,8 @@ import java.io.Serializable;
 public class UserMessageDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private int msgType;
     private String title;
     private String content;
-    private Long receiver;
+    private long receiver;
 }

message/message-service/src/main/java/cn/reghao/tnb/message/app/model/po/UserMessage.java

@@ -1,6 +1,7 @@
 package cn.reghao.tnb.message.app.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
+import cn.reghao.tnb.message.api.constant.MsgType;
 import cn.reghao.tnb.message.api.dto.UserMessageDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -39,6 +40,7 @@ public class UserMessage extends BaseObject<Integer> {
     private LocalDateTime createAt;
 
     public UserMessage(Long messageId, UserMessageDto userMessageDto) {
+        this.msgType = userMessageDto.getMsgType();
         this.messageId = messageId;
         this.title = userMessageDto.getTitle();
         this.content = userMessageDto.getContent();

message/message-service/src/main/java/cn/reghao/tnb/message/app/service/MessageConsumer.java

@@ -69,9 +69,10 @@ public class MessageConsumer {
             notifyService.notify(webhookName, dingMsg);
         }
 
+        int msgTypeCode = msgType.getValue();
         String title = "webhook 通知";
         String content = String.format("发送 %s 消息, 消息内容: %s", msgType.name(), jsonPayload);
-        UserMessageDto userMessageDto = new UserMessageDto(title, content, ConstantId.ANONYMOUS_USER_ID);
+        UserMessageDto userMessageDto = new UserMessageDto(msgTypeCode, title, content, ConstantId.ANONYMOUS_USER_ID);
         userMessageService.addMessage(userMessageDto);
     }
 }

message/message-service/src/main/java/cn/reghao/tnb/message/app/service/NotifyService.java

@@ -2,6 +2,7 @@ package cn.reghao.tnb.message.app.service;
 
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import cn.reghao.tnb.common.util.ConstantId;
+import cn.reghao.tnb.message.api.constant.MsgType;
 import cn.reghao.tnb.message.api.dto.UserMessageDto;
 import cn.reghao.tnb.message.app.service.notifier.Notify;
 import cn.reghao.tnb.message.app.service.notifier.ding.DingMsg;
@@ -66,9 +67,10 @@ public class NotifyService {
             try {
                 notify.send(receiver, msg);
             } catch (Exception e) {
+                int msgType = MsgType.sysMsg.getValue();
                 String title = "发送通知失败";
                 String content = String.format("发送给 %s 的通知失败 -> %s", receiver, e.getMessage());
-                UserMessageDto userMessageDto = new UserMessageDto(title, content, ConstantId.ANONYMOUS_USER_ID);
+                UserMessageDto userMessageDto = new UserMessageDto(msgType, title, content, ConstantId.ANONYMOUS_USER_ID);
                 userMessageService.addMessage(userMessageDto);
             }
         }

message/message-service/src/main/java/cn/reghao/tnb/message/app/ws/media/MediaService.java

@@ -199,7 +199,7 @@ public class MediaService {
 
     public void putMediaProgress(String sessionId, MediaProgress mediaProgress) {
         map.put(sessionId, mediaProgress);
-        if (mediaProgress.getEnded()) {
+        if (mediaProgress.isEnded()) {
             persistProgress(sessionId, mediaProgress);
         }
     }