Merge pull request #2794 from xinnan-tech/20260104SSL

拓展首页的搜索栏-支持同时搜索设备mac和智能体名字
2026-07-23 23:53:55 +08:00 · 2026-01-05 16:54:20 +08:00
parent 815af687ea 4c550245db
commit 4b6b3082c7
14 changed files with 140 additions and 61 deletions
@@ -73,9 +73,13 @@ public class AgentController {
    @GetMapping("/list")
    @Operation(summary = "获取用户智能体列表")
    @RequiresPermissions("sys:role:normal")
-    public Result<List<AgentDTO>> getUserAgents() {
+    public Result<List<AgentDTO>> getUserAgents(
+            @RequestParam(value = "keyword", required = false) String keyword,
+            @RequestParam(value = "searchType", defaultValue = "name") String searchType) {
        UserDetail user = SecurityUser.getUser();
-        List<AgentDTO> agents = agentService.getUserAgents(user.getId());
+        
+        // 直接调用整合后的getUserAgents方法，无需再区分搜索和普通查询
+        List<AgentDTO> agents = agentService.getUserAgents(user.getId(), keyword, searchType);
        return new Result<List<AgentDTO>>().ok(agents);
    }

@@ -271,4 +275,6 @@ public class AgentController {
                .body(audioData);
    }

+
+
 }
@@ -1,6 +1,7 @@
 package xiaozhi.modules.agent.dto;

 import java.util.Date;
+import java.util.List;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -54,9 +54,11 @@ public interface AgentService extends BaseService<AgentEntity> {
     * 获取用户智能体列表
     *
     * @param userId 用户ID
+     * @param keyword 搜索关键词
+     * @param searchType 搜索类型（name - 按名称搜索，mac - 按MAC地址搜索）
     * @return 智能体列表
     */
-    List<AgentDTO> getUserAgents(Long userId);
+    List<AgentDTO> getUserAgents(Long userId, String keyword, String searchType);

    /**
     * 根据智能体ID获取设备数量
@@ -98,4 +100,6 @@ public interface AgentService extends BaseService<AgentEntity> {
     * @return 创建的智能体ID
     */
    String createAgent(AgentCreateDTO dto);
+
+
 }
@@ -42,6 +42,7 @@ import xiaozhi.modules.agent.service.AgentPluginMappingService;
 import xiaozhi.modules.agent.service.AgentService;
 import xiaozhi.modules.agent.service.AgentTemplateService;
 import xiaozhi.modules.agent.vo.AgentInfoVO;
+import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.model.dto.ModelProviderDTO;
 import xiaozhi.modules.model.dto.VoiceDTO;
@@ -88,13 +89,13 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
                agent.setChatHistoryConf(Constant.ChatHistoryConfEnum.RECORD_TEXT_AUDIO.getCode());
            }
        }
-        
+
        // 查询上下文源配置
        AgentContextProviderEntity contextProviderEntity = agentContextProviderService.getByAgentId(id);
        if (contextProviderEntity != null) {
            agent.setContextProviders(contextProviderEntity.getContextProviders());
        }
-        
+
        // 无需额外查询插件列表，已通过SQL查询出来
        return agent;
    }
@@ -127,38 +128,75 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
    }

    @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());
+    public List<AgentDTO> getUserAgents(Long userId, String keyword, String searchType) {
+        QueryWrapper<AgentEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId);

-            // 获取 TTS 模型名称
-            dto.setTtsModelName(modelConfigService.getModelNameById(agent.getTtsModelId()));
+        // 如果有搜索关键词，根据搜索类型添加相应的查询条件
+        if (StringUtils.isNotBlank(keyword)) {
+            if ("mac".equals(searchType)) {
+                // 按MAC地址搜索：先搜索设备，再获取对应的智能体
+                List<DeviceEntity> devices = deviceService.searchDevicesByMacAddress(keyword, userId);

-            // 获取 LLM 模型名称
-            dto.setLlmModelName(modelConfigService.getModelNameById(agent.getLlmModelId()));
+                if (!devices.isEmpty()) {
+                    // 获取设备对应的智能体ID列表
+                    List<String> agentIds = devices.stream()
+                            .map(DeviceEntity::getAgentId)
+                            .distinct()
+                            .collect(Collectors.toList());

-            // 获取 VLLM 模型名称
-            dto.setVllmModelName(modelConfigService.getModelNameById(agent.getVllmModelId()));
+                    if (!agentIds.isEmpty()) {
+                        queryWrapper.in("id", agentIds);
+                    } else {
+                        return new ArrayList<>();
+                    }
+                } else {
+                    return new ArrayList<>();
+                }
+            } else {
+                // 按名称搜索
+                queryWrapper.like("agent_name", keyword);
+            }
+        }

-            // 获取记忆模型名称
-            dto.setMemModelId(agent.getMemModelId());
+        // 执行查询
+        List<AgentEntity> agentEntities = baseDao.selectList(queryWrapper);

-            // 获取 TTS 音色名称
-            dto.setTtsVoiceName(timbreModelService.getTimbreNameById(agent.getTtsVoiceId()));
+        // 转换为DTO并设置所有必要字段
+        return agentEntities.stream().map(this::buildAgentDTO).collect(Collectors.toList());
+    }

-            // 获取智能体最近的最后连接时长
-            dto.setLastConnectedAt(deviceService.getLatestLastConnectionTime(agent.getId()));
+    /**
+     * 将AgentEntity转换为AgentDTO
+     */
+    private AgentDTO buildAgentDTO(AgentEntity agent) {
+        AgentDTO dto = new AgentDTO();
+        dto.setId(agent.getId());
+        dto.setAgentName(agent.getAgentName());
+        dto.setSystemPrompt(agent.getSystemPrompt());

-            // 获取设备数量
-            dto.setDeviceCount(getDeviceCountByAgentId(agent.getId()));
-            return dto;
-        }).collect(Collectors.toList());
+        // 获取 TTS 模型名称
+        dto.setTtsModelName(modelConfigService.getModelNameById(agent.getTtsModelId()));
+
+        // 获取 LLM 模型名称
+        dto.setLlmModelName(modelConfigService.getModelNameById(agent.getLlmModelId()));
+
+        // 获取 VLLM 模型名称
+        dto.setVllmModelName(modelConfigService.getModelNameById(agent.getVllmModelId()));
+
+        // 获取记忆模型名称
+        dto.setMemModelId(agent.getMemModelId());
+
+        // 获取 TTS 音色名称
+        dto.setTtsVoiceName(timbreModelService.getTimbreNameById(agent.getTtsVoiceId()));
+
+        // 获取智能体最近的最后连接时长
+        dto.setLastConnectedAt(deviceService.getLatestLastConnectionTime(agent.getId()));
+
+        // 获取设备数量
+        dto.setDeviceCount(getDeviceCountByAgentId(agent.getId()));
+
+        return dto;
    }

    @Override
@@ -468,4 +506,5 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
        agentPluginMappingService.saveBatch(toInsert);
        return entity.getId();
    }
-}
+
+}
@@ -108,4 +108,13 @@ public interface DeviceService extends BaseService<DeviceEntity> {
     */
    String generateWebSocketToken(String clientId, String username) throws Exception;

+    /**
+     * 根据MAC地址搜索设备
+     *
+     * @param macAddress MAC地址关键词
+     * @param userId 用户ID
+     * @return 设备列表
+     */
+    List<DeviceEntity> searchDevicesByMacAddress(String macAddress, Long userId);
+
 }
@@ -496,6 +496,14 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
        redisUtils.delete(RedisKeys.getAgentDeviceCountById(dto.getAgentId()));
    }

+    @Override
+    public List<DeviceEntity> searchDevicesByMacAddress(String macAddress, Long userId) {
+        QueryWrapper<DeviceEntity> wrapper = new QueryWrapper<>();
+        wrapper.like("mac_address", macAddress);
+        wrapper.eq("user_id", userId);
+        return deviceDao.selectList(wrapper);
+    }
+
    /**
     * 生成MQTT密码签名
     *