update:首页智能体面板显示优化

* update:更新版本号

* update:允许actions编译手动触发

* fix:如果获取不到版本号，actions编译失败

* add:增加docker部署redis步骤

* update:增加启用/关闭模型配置api

* update：完成角色配色功能

* update:编译文档优化

* update:优化编译文档

* update:首页智能体面板显示优化

main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java

@@ -34,5 +34,24 @@ public class RedisKeys {
         return "sys:username:id:" + userid;
     }
 
+    /**
+     * 模型名称的Key
+     */
+    public static String getModelNameById(String id) {
+        return "sys:model:name:" + id;
+    }
 
+    /**
+     * 获取音色名称缓存key
+     */
+    public static String getTimbreNameById(String id) {
+        return "timbre:name:" + id;
+    }
+
+    /**
+     * 获取设备数量缓存key
+     */
+    public static String getAgentDeviceCountById(String id) {
+        return "agent:device:count:" + id;
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java

@@ -29,6 +29,7 @@ import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.agent.dto.AgentCreateDTO;
+import xiaozhi.modules.agent.dto.AgentDTO;
 import xiaozhi.modules.agent.dto.AgentUpdateDTO;
 import xiaozhi.modules.agent.entity.AgentEntity;
 import xiaozhi.modules.agent.entity.AgentTemplateEntity;
@@ -47,10 +48,10 @@ public class AgentController {
     @GetMapping("/list")
     @Operation(summary = "获取用户智能体列表")
     @RequiresPermissions("sys:role:normal")
-    public Result<List<AgentEntity>> getUserAgents() {
+    public Result<List<AgentDTO>> getUserAgents() {
         UserDetail user = SecurityUser.getUser();
-        List<AgentEntity> agents = agentService.getUserAgents(user.getId());
-        return new Result<List<AgentEntity>>().ok(agents);
+        List<AgentDTO> agents = agentService.getUserAgents(user.getId());
+        return new Result<List<AgentDTO>>().ok(agents);
     }
 
     @GetMapping("/all")

main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentDao.java

@@ -1,11 +1,18 @@
 package xiaozhi.modules.agent.dao;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.agent.entity.AgentEntity;
 
 @Mapper
 public interface AgentDao extends BaseDao<AgentEntity> {
-
+    /**
+     * 获取智能体的设备数量
+     * 
+     * @param agentId 智能体ID
+     * @return 设备数量
+     */
+    Integer getDeviceCountByAgentId(@Param("agentId") String agentId);
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentDTO.java

@@ -0,0 +1,38 @@
+package xiaozhi.modules.agent.dto;
+
+import java.util.Date;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 智能体数据传输对象
+ * 用于在服务层和控制器层之间传递智能体相关的数据
+ */
+@Data
+@Schema(description = "智能体对象")
+public class AgentDTO {
+    @Schema(description = "智能体编码", example = "AGT_1234567890")
+    private String id;
+
+    @Schema(description = "智能体名称", example = "客服助手")
+    private String agentName;
+
+    @Schema(description = "语音合成模型名称", example = "tts_model_01")
+    private String ttsModelName;
+
+    @Schema(description = "音色名称", example = "voice_01")
+    private String ttsVoiceName;
+
+    @Schema(description = "大语言模型名称", example = "llm_model_01")
+    private String llmModelName;
+
+    @Schema(description = "角色设定参数", example = "你是一个专业的客服助手，负责回答用户问题并提供帮助")
+    private String systemPrompt;
+
+    @Schema(description = "最后连接时间", example = "2024-03-20 10:00:00")
+    private Date lastConnectedAt;
+
+    @Schema(description = "设备数量", example = "10")
+    private Integer deviceCount;
+}

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

@@ -5,13 +5,10 @@ import java.util.Map;
 
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
+import xiaozhi.modules.agent.dto.AgentDTO;
 import xiaozhi.modules.agent.entity.AgentEntity;
 
 public interface AgentService extends BaseService<AgentEntity> {
-    /**
-     * 根据用户ID获取智能体列表
-     */
-    List<AgentEntity> getUserAgents(Long userId);
 
     /**
      * 管理员获取所有智能体列表（分页）
@@ -29,4 +26,20 @@ public interface AgentService extends BaseService<AgentEntity> {
      * @param userId
      */
     void deleteAgentByUserId(Long userId);
+
+    /**
+     * 获取用户智能体列表
+     * 
+     * @param userId
+     * @return
+     */
+    List<AgentDTO> getUserAgents(Long userId);
+
+    /**
+     * 获取智能体的设备数量
+     * 
+     * @param agentId 智能体ID
+     * @return 设备数量
+     */
+    Integer getDeviceCountByAgentId(String agentId);
 }

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

@@ -3,7 +3,10 @@ package xiaozhi.modules.agent.service.impl;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,26 +14,33 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import xiaozhi.common.page.PageData;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.modules.agent.dao.AgentDao;
+import xiaozhi.modules.agent.dto.AgentDTO;
 import xiaozhi.modules.agent.entity.AgentEntity;
 import xiaozhi.modules.agent.service.AgentService;
+import xiaozhi.modules.model.service.ModelConfigService;
+import xiaozhi.modules.timbre.service.TimbreService;
 
 @Service
 public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> implements AgentService {
     private final AgentDao agentDao;
 
+    @Autowired
+    private TimbreService timbreModelService;
+
+    @Autowired
+    private ModelConfigService modelConfigService;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
     public AgentServiceImpl(AgentDao agentDao) {
         this.agentDao = agentDao;
     }
 
-    @Override
-    public List<AgentEntity> getUserAgents(Long userId) {
-        QueryWrapper<AgentEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("user_id", userId);
-        return agentDao.selectList(wrapper);
-    }
-
     @Override
     public PageData<AgentEntity> adminAgentList(Map<String, Object> params) {
         IPage<AgentEntity> page = agentDao.selectPage(
@@ -70,4 +80,54 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
         wrapper.eq("user_id", userId);
         baseDao.delete(wrapper);
     }
+
+    @Override
+    public List<AgentDTO> getUserAgents(Long userId) {
+        QueryWrapper<AgentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", userId);
+        List<AgentEntity> agents = agentDao.selectList(wrapper);
+        return agents.stream().map(agent -> {
+            AgentDTO dto = new AgentDTO();
+            dto.setId(agent.getId());
+            dto.setAgentName(agent.getAgentName());
+            dto.setSystemPrompt(agent.getSystemPrompt());
+
+            // 获取 TTS 模型名称
+            dto.setTtsModelName(modelConfigService.getModelNameById(agent.getTtsModelId()));
+
+            // 获取 LLM 模型名称
+            dto.setLlmModelName(modelConfigService.getModelNameById(agent.getLlmModelId()));
+
+            // 获取 TTS 音色名称
+            dto.setTtsVoiceName(timbreModelService.getTimbreNameById(agent.getTtsVoiceId()));
+
+            // 获取设备数量
+            dto.setDeviceCount(getDeviceCountByAgentId(agent.getId()));
+
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    @Override
+    public Integer getDeviceCountByAgentId(String agentId) {
+        if (StringUtils.isBlank(agentId)) {
+            return 0;
+        }
+
+        // 先从Redis中获取
+        Integer cachedCount = (Integer) redisUtils.get(RedisKeys.getAgentDeviceCountById(agentId));
+        if (cachedCount != null) {
+            return cachedCount;
+        }
+
+        // 如果Redis中没有，则从数据库查询
+        Integer deviceCount = agentDao.getDeviceCountByAgentId(agentId);
+
+        // 将结果存入Redis
+        if (deviceCount != null) {
+            redisUtils.set(RedisKeys.getAgentDeviceCountById(agentId), deviceCount, 60);
+        }
+
+        return deviceCount != null ? deviceCount : 0;
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/model/service/ModelConfigService.java

@@ -20,4 +20,12 @@ public interface ModelConfigService extends BaseService<ModelConfigEntity> {
     ModelConfigDTO edit(String modelType, String provideCode, String id, ModelConfigBodyDTO modelConfigBodyDTO);
 
     void delete(String id);
+
+    /**
+     * 根据ID获取模型名称
+     * 
+     * @param id 模型ID
+     * @return 模型名称
+     */
+    String getModelNameById(String id);
 }

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java

@@ -15,6 +15,8 @@ import lombok.AllArgsConstructor;
 import xiaozhi.common.constant.Constant;
 import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.modules.model.dao.ModelConfigDao;
@@ -25,7 +27,6 @@ import xiaozhi.modules.model.dto.ModelProviderDTO;
 import xiaozhi.modules.model.entity.ModelConfigEntity;
 import xiaozhi.modules.model.service.ModelConfigService;
 import xiaozhi.modules.model.service.ModelProviderService;
-import xiaozhi.modules.timbre.service.TimbreService;
 
 @Service
 @AllArgsConstructor
@@ -34,7 +35,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
 
     private final ModelConfigDao modelConfigDao;
     private final ModelProviderService modelProviderService;
-    private final TimbreService timbreService;
+    private final RedisUtils redisUtils;
 
     @Override
     public List<ModelBasicInfoDTO> getModelCodeList(String modelType, String modelName) {
@@ -100,4 +101,28 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
     public void delete(String id) {
         modelConfigDao.deleteById(id);
     }
+
+    @Override
+    public String getModelNameById(String id) {
+        if (StringUtils.isBlank(id)) {
+            return null;
+        }
+
+        String cachedName = (String) redisUtils.get(RedisKeys.getModelNameById(id));
+
+        if (StringUtils.isNotBlank(cachedName)) {
+            return cachedName;
+        }
+
+        ModelConfigEntity entity = modelConfigDao.selectById(id);
+        if (entity != null) {
+            String modelName = entity.getModelName();
+            if (StringUtils.isNotBlank(modelName)) {
+                redisUtils.set(RedisKeys.getModelNameById(id), modelName);
+            }
+            return modelName;
+        }
+
+        return null;
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/timbre/service/TimbreService.java

@@ -56,4 +56,12 @@ public interface TimbreService extends BaseService<TimbreEntity> {
     void delete(String[] ids);
 
     List<VoiceDTO> getVoiceNames(String ttsModelId, String voiceName);
+
+    /**
+     * 根据ID获取音色名称
+     * 
+     * @param id 音色ID
+     * @return 音色名称
+     */
+    String getTimbreNameById(String id);
 }

main/manager-api/src/main/java/xiaozhi/modules/timbre/service/impl/TimbreServiceImpl.java

@@ -16,6 +16,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import lombok.AllArgsConstructor;
 import xiaozhi.common.constant.Constant;
 import xiaozhi.common.page.PageData;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.modules.model.dto.VoiceDTO;
@@ -37,6 +39,7 @@ import xiaozhi.modules.timbre.vo.TimbreDetailsVO;
 public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity> implements TimbreService {
 
     private final TimbreDao timbreDao;
+    private final RedisUtils redisUtils;
 
     @Override
     public PageData<TimbreDetailsVO> page(TimbrePageDTO dto) {
@@ -105,4 +108,28 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
     private void isTtsModelId(String ttsModelId) {
         // 等模型配置那边写好调用方法判断
     }
+
+    @Override
+    public String getTimbreNameById(String id) {
+        if (StringUtils.isBlank(id)) {
+            return null;
+        }
+
+        String cachedName = (String) redisUtils.get(RedisKeys.getTimbreNameById(id));
+
+        if (StringUtils.isNotBlank(cachedName)) {
+            return cachedName;
+        }
+
+        TimbreEntity entity = timbreDao.selectById(id);
+        if (entity != null) {
+            String name = entity.getName();
+            if (StringUtils.isNotBlank(name)) {
+                redisUtils.set(RedisKeys.getTimbreNameById(id), name);
+            }
+            return name;
+        }
+
+        return null;
+    }
 }

main/manager-api/src/main/resources/mapper/agent/AgentDao.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="xiaozhi.modules.agent.dao.AgentDao">
+    <!-- 获取智能体的设备数量 -->
+    <select id="getDeviceCountByAgentId" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM ai_device WHERE agent_id = #{agentId}
+    </select>
+</mapper>