消息相关代码提交

nightFragrance-massage/src/main/java/com/ylx/message/controller/MessageController.java

@@ -3,6 +3,7 @@ package com.ylx.message.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.domain.R;
 import com.ylx.message.domain.dto.MessageDetailDTO;
+import com.ylx.message.domain.dto.SendMessageDto;
 import com.ylx.message.domain.vo.MessageCategoryVO;
 import com.ylx.message.domain.vo.MessageDetailVO;
 import com.ylx.message.service.IMessageService;
@@ -46,4 +47,12 @@ public class MessageController {
         Page<MessageDetailVO> data = this.messageService.getCategoryMessages(dto);
         return R.ok(data);
     }
+
+    @Deprecated
+    @PostMapping("/sendMessage")
+    @ApiOperation("发送消息，用来添加数据的")
+    public R<Page<MessageDetailVO>> sendMessage(@Validated @RequestBody SendMessageDto dto) {
+        this.messageService.sendMessage(dto.getUserId(), dto.getTriggerEvent(), dto.getVariables());
+        return R.ok();
+    }
 }

nightFragrance-massage/src/main/java/com/ylx/message/domain/dto/SendMessageDto.java

@@ -0,0 +1,12 @@
+package com.ylx.message.domain.dto;
+
+import lombok.Data;
+
+import java.util.Map;
+@Data
+public class SendMessageDto {
+
+    private Long userId;
+    private String triggerEvent;
+    private Map<String, Object> variables;
+}

nightFragrance-massage/src/main/java/com/ylx/message/domain/vo/MessageDetailVO.java

@@ -2,21 +2,16 @@ package com.ylx.message.domain.vo;
 
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @Data
 public class MessageDetailVO {
     /** 消息ID */
     private Long id;
 
-    /** 消息标题 (来自 message_content.title) */
-    private String title;
-
     /** 消息具体内容 (来自 user_message.personalized_content) */
     private String content;
 
     /** 创建时间 */
-    private LocalDateTime createTime;
+    private String createTime;
 
     /** 是否已读 (0:未读, 1:已读) - 用于控制右上角红点 */
     private Integer isRead;

nightFragrance-massage/src/main/resources/mapper/message/UserMessageMapper.xml

@@ -47,9 +47,8 @@
     <select id="selectMessageListByCategory" resultType="com.ylx.message.domain.vo.MessageDetailVO">
         SELECT
             um.id,
-            mc.title AS title,           <!-- 从配置表获取标题 -->
             um.personalized_content AS content, <!-- 渲染后的内容 -->
-            um.create_time AS createTime,
+            DATE_FORMAT(um.create_time, '%H:%i') AS create_time,
             um.is_read AS isRead,
             mc.jump_page AS jumpUrl      <!-- 点击跳转地址 -->
         FROM user_message um