update:优化最近对话时间

main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java

@@ -1,12 +1,15 @@
 package xiaozhi.modules.agent.service.biz.impl;
 
 import java.util.Base64;
+import java.util.Date;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.modules.agent.dto.AgentChatHistoryReportDTO;
 import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
 import xiaozhi.modules.agent.entity.AgentEntity;
@@ -29,6 +32,7 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic
     private final AgentService agentService;
     private final AgentChatHistoryService agentChatHistoryService;
     private final AgentChatAudioService agentChatAudioService;
+    private final RedisUtils redisUtils;
 
     /**
      * 处理聊天记录上报，包括文件上传和相关信息记录
@@ -77,6 +81,8 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic
 
         // 3. 保存数据
         agentChatHistoryService.save(entity);
+        // 4. 更新设备最后对话时间
+        redisUtils.set(RedisKeys.getAgentDeviceLastConnectedAtById(agentId), new Date(), 60 * 2);
         return Boolean.TRUE;
     }
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java

@@ -34,6 +34,7 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
     private final TimbreService timbreModelService;
     private final ModelConfigService modelConfigService;
     private final RedisUtils redisUtils;
+    private final DeviceService deviceService;
 
     @Override
     public PageData<AgentEntity> adminAgentList(Map<String, Object> params) {

main/manager-api/src/test/java/xiaozhi/modules/device/DeviceTest.java

@@ -1,5 +1,8 @@
 package xiaozhi.modules.device;
 
+import java.util.HashMap;
+import java.util.UUID;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -8,13 +11,10 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 
 import lombok.extern.slf4j.Slf4j;
-import xiaozhi.common.redis.RedisKeys;
 import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.modules.sys.dto.SysUserDTO;
 import xiaozhi.modules.sys.service.SysUserService;
 
-import java.util.HashMap;
-
 @Slf4j
 @SpringBootTest
 @ActiveProfiles("dev")
@@ -29,8 +29,8 @@ public class DeviceTest {
     @Test
     public void testSaveUser() {
         SysUserDTO userDTO = new SysUserDTO();
-        userDTO.setUsername("13536468486");
-        userDTO.setPassword("0218jianyuQ!");
+        userDTO.setUsername("test");
+        userDTO.setPassword(UUID.randomUUID().toString());
         sysUserService.save(userDTO);
     }
 
@@ -43,18 +43,17 @@ public class DeviceTest {
         // 模拟设备验证码
         String deviceCode = "123456";
 
-        HashMap<String,Object> map = new HashMap<>();
-        map.put("mac_address",macAddress);
-        map.put("activation_code",deviceCode);
-        map.put("board","硬件型号");
-        map.put("app_version","0.3.13");
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("mac_address", macAddress);
+        map.put("activation_code", deviceCode);
+        map.put("board", "硬件型号");
+        map.put("app_version", "0.3.13");
 
         String safeDeviceId = macAddress.replace(":", "_").toLowerCase();
         String cacheDeviceKey = String.format("ota:activation:data:%s", safeDeviceId);
         redisUtils.set(cacheDeviceKey, map, 300);
 
-
-        String redisKey = "ota:activation:code:"+deviceCode;
+        String redisKey = "ota:activation:code:" + deviceCode;
         log.info("Redis Key: {}", redisKey);
 
         // 将设备信息写入Redis

main/manager-web/src/components/DeviceItem.vue

@@ -31,7 +31,7 @@
       </div>
     </div>
     <div class="version-info">
-      <div>最近对话：{{ device.lastConnectedAt }}</div>
+      <div>最近对话：{{ formattedLastConnectedTime }}</div>
     </div>
   </div>
 </template>
@@ -45,6 +45,25 @@ export default {
   data() {
     return { switchValue: false }
   },
+  computed: {
+    formattedLastConnectedTime() {
+      if (!this.device.lastConnectedAt) return '暂未对话';
+
+      const lastTime = new Date(this.device.lastConnectedAt);
+      const now = new Date();
+      const diffMinutes = Math.floor((now - lastTime) / (1000 * 60));
+
+      if (diffMinutes < 60) {
+        return `${diffMinutes}分钟前`;
+      } else if (diffMinutes < 24 * 60) {
+        const hours = Math.floor(diffMinutes / 60);
+        const minutes = diffMinutes % 60;
+        return `${hours}小时${minutes > 0 ? minutes + '分钟' : ''}前`;
+      } else {
+        return this.device.lastConnectedAt;
+      }
+    }
+  },
   methods: {
     handleDelete() {
       this.$emit('delete', this.device.agentId)