zhaohan 11 месяцев назад
Родитель
Сommit
8cb3adb5d8

+ 7 - 3
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/mcpController.java

@@ -6,6 +6,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.ruoyi.chat.service.chat.McpService;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.ThinkAgent;
+import org.ruoyi.domain.ThinkModel;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -75,9 +79,9 @@ public class mcpController {
         return mcpService.deleteagent(map, request);
     }
     //查询
-    @PostMapping("/agentList")
-    public List<Map<String, Object>> agentList(HttpServletRequest request) {
-        return mcpService.agentList();
+    @GetMapping("/agentList")
+    public TableDataInfo<ThinkAgent> mcpList(PageQuery pageQuery) {
+        return mcpService.agentList(pageQuery);
     }
 
 }

+ 6 - 1
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/McpService.java

@@ -2,6 +2,10 @@ package org.ruoyi.chat.service.chat;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import jakarta.servlet.http.HttpServletRequest;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.ThinkAgent;
+import org.ruoyi.domain.ThinkModel;
 
 import java.util.List;
 import java.util.Map;
@@ -33,7 +37,8 @@ public interface McpService {
 
     //查寻
     @DS("open-db")
-    List<Map<String, Object>> agentList();
+//    List<Map<String, Object>> agentList();
+    TableDataInfo<ThinkAgent> agentList(PageQuery pageQuery);
     //增加
     @DS("open-db")
     int addMcpli(Map<String,Object> map, HttpServletRequest request);

+ 18 - 3
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/McpServiceImpl.java

@@ -3,6 +3,9 @@ package org.ruoyi.chat.service.chat.impl;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONException;
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
@@ -10,6 +13,11 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.weaver.IClassFileProvider;
 import org.ruoyi.chat.service.chat.McpService;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.ThinkAgent;
+import org.ruoyi.domain.ThinkModel;
+import org.ruoyi.mapper.ThinkAgentMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -27,6 +35,7 @@ public class McpServiceImpl implements McpService {
     private static final ObjectMapper mapper = new ObjectMapper();
     @Autowired
     private JdbcTemplate jdbcTemplate;
+    private ThinkAgentMapper thinkAgentMapper;
 
     @Override
     public int uploadMcpli(Map<String,Object> map, HttpServletRequest request){
@@ -159,10 +168,16 @@ public class McpServiceImpl implements McpService {
         return maps;
     }
 
+//    @Override
+//    public List<Map<String, Object>> agentList() {
+//        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from think_agent");
+//        return maps;
+//    }
     @Override
-    public List<Map<String, Object>> agentList() {
-        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from think_agent");
-        return maps;
+    public TableDataInfo<ThinkAgent> agentList(PageQuery pageQuery) {
+        LambdaQueryWrapper<ThinkAgent> lqw = Wrappers.lambdaQuery();
+        Page<ThinkAgent> thinkAgentPage = thinkAgentMapper.selectPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(thinkAgentPage);
     }
 
     // 执行删除