update:更改audioPath返回到实体中自动映射

Author: joey-zhou

src/main/java/com/xiaozhi/controller/MessageController.java

@@ -5,7 +5,6 @@
 import com.xiaozhi.common.web.PageFilter;
 import com.xiaozhi.dialogue.llm.ChatService;
 import com.xiaozhi.entity.SysMessage;
-import com.xiaozhi.service.SysDeviceService;
 import com.xiaozhi.service.SysMessageService;
 import com.xiaozhi.utils.CmsUtils;
 import jakarta.annotation.Resource;
@@ -28,9 +27,6 @@ public class MessageController extends BaseController {
     @Resource
     private SysMessageService sysMessageService;
 
-    @Resource
-    private SysDeviceService deviceService;
-
     @Resource
     private ChatService chatService;
 

src/main/java/com/xiaozhi/entity/Base.java

@@ -17,7 +17,7 @@ public class Base implements java.io.Serializable {
      * 创建日期
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    protected Date createTime;
 
     /**
      * 用户ID

src/main/java/com/xiaozhi/entity/SysMessage.java

@@ -1,5 +1,10 @@
 package com.xiaozhi.entity;
 
+import com.xiaozhi.utils.AudioUtils;
+
+import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
+
 /**
  * 聊天记录表
  * 
@@ -36,9 +41,7 @@ public class SysMessage extends Base {
 
     /**
      * 语音文件路径
-     * @deprecated 改为路径约定，而非实际存储音频文件的路径字符串。后续版本不再支持此字段。
      */
-    @Deprecated
     private String audioPath;
 
     /**
@@ -97,7 +100,20 @@ public SysMessage setMessage(String message) {
     }
 
     public String getAudioPath() {
-        return audioPath;
+        if (this.deviceId == null) {
+            return audioPath; // 分页会先进行一次处理，但是获取的为count(0)，没有实际字段会报错，这里直接返回
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HHmmss");
+        String formattedTime = sdf.format(createTime);
+
+        String fileName = formattedTime + "-" + sender + ".wav";
+
+        return Paths.get(
+                AudioUtils.AUDIO_PATH,
+                deviceId.replace(":", "-"),
+                String.valueOf(roleId),
+                fileName
+        ).toString();
     }
 
     public SysMessage setAudioPath(String audioPath) {

src/main/java/com/xiaozhi/mapper/MessageMapper.xml

@@ -3,11 +3,11 @@
 <mapper namespace="com.xiaozhi.dao.MessageMapper">
 
     <sql id="messageSql">
-        sys_message.messageId, sys_message.message, sys_message.sender, sys_message.roleId, sys_message.state, sys_message.createTime, sys_message.messageType
+        sys_message.messageId, sys_message.deviceId, sys_message.message, sys_message.sender, sys_message.roleId, sys_message.state, sys_message.createTime, sys_message.messageType
     </sql>
 
     <sql id="deviceSql">
-        sys_device.deviceId, sys_device.deviceName, sys_device.userId
+        sys_device.deviceName, sys_device.userId
     </sql>
 
     <sql id="roleSql">
@@ -18,18 +18,7 @@
         SELECT
         <include refid="messageSql"></include>,
         <include refid="deviceSql"></include>,
-        <include refid="roleSql"></include>,
-        CONCAT(
-            'audio/',
-            REPLACE(sys_device.deviceId, ':', '-'), 
-            '/', 
-            sys_message.roleId, 
-            '/', 
-            DATE_FORMAT(sys_message.createTime, '%Y-%m-%dT%H%i%s'), 
-            '-', 
-            sys_message.sender,
-            '.wav'
-        ) AS audioPath
+        <include refid="roleSql"></include>
         FROM
             sys_message
             LEFT JOIN sys_device ON sys_message.deviceId = sys_device.deviceId
@@ -56,8 +45,8 @@
     </select>
 
     <insert id="add" parameterType="com.xiaozhi.entity.SysMessage">
-        INSERT INTO sys_message ( deviceId, sessionId, sender, roleId, message, audioPath, messageType ,createTime)
-        SELECT #{deviceId}, #{sessionId}, #{sender}, #{roleId}, #{message}, #{audioPath}, #{messageType},#{createTime,jdbcType=TIMESTAMP}
+        INSERT INTO sys_message ( deviceId, sessionId, sender, roleId, message, messageType ,createTime)
+        SELECT #{deviceId}, #{sessionId}, #{sender}, #{roleId}, #{message}, #{messageType},#{createTime,jdbcType=TIMESTAMP}
     </insert>
 
     <update id="delete" parameterType="com.xiaozhi.entity.SysMessage">