瀏覽代碼

项目列表接口更改

zhaohan 10 月之前
父節點
當前提交
cfec793541

+ 34 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/ThinkAgent.java

@@ -0,0 +1,34 @@
+package org.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serial;
+import java.io.Serializable;
+//智能体列表 think_agent
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("think_agent")
+public class ThinkAgent implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 智能体名称
+     */
+    private String agent;
+
+    /**
+     * 智能体描述
+     */
+    private String introduce;
+}

+ 68 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/ThinkMcp.java

@@ -0,0 +1,68 @@
+package org.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+//mcp列表 think_mcp
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("think_mcp")
+public class ThinkMcp implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * MCP名称
+     */
+    private String mcp;
+
+    /**
+     * MCP描述
+     */
+    private String mcpintroduce;
+
+    /**
+     * MCP出参
+     */
+    private String mcpOutdata;
+
+    /**
+     * MCP入参
+     */
+    private String mcpIndata;
+
+    /**
+     * mcp地址
+     */
+    private String mcpUrl;
+
+    /**
+     * 序号
+     */
+    private int sort;
+
+    /**
+     * 所属智能体
+     */
+    private String agent;
+
+    /**
+     * 0为删除,1为未删除
+     */
+    private int state;
+
+
+}

+ 69 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/ThinkProject.java

@@ -0,0 +1,69 @@
+package org.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+/*
+ * 项目列表 think_project
+ */
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("think_project")
+public class ThinkProject implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 组织名称
+     */
+    private String organization;
+
+    /**
+     * 项目名称
+     */
+    private String project;
+
+    /**
+     * 私钥
+     */
+    private String privateKey;
+
+    /**
+     * 公钥
+     */
+    private String publicKey;
+
+    /**
+     * 模型仓库
+     */
+    private String models;
+
+    /**
+     * 知识库仓库
+     */
+    private String rags;
+
+    /**
+     * 智能体权限
+     */
+    private String agents;
+
+
+
+}

+ 52 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/ThinkRag.java

@@ -0,0 +1,52 @@
+package org.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serial;
+import java.io.Serializable;
+/*
+ * 知识库列表 think_rag
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("think_rag")
+public class ThinkRag implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 知识库索引
+     */
+    private String ragid;
+
+    /**
+     * 知识库名称
+     */
+    private String rag;
+
+    /**
+     * 知识库描述
+     */
+    private String introduce;
+
+    /**
+     * 创建时间
+     */
+    private int time;
+
+    /**
+     * 更新时间
+     */
+    private int updatetime;
+
+}

+ 10 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/ThinkAgentMapper.java

@@ -0,0 +1,10 @@
+package org.ruoyi.mapper;
+
+
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.domain.ThinkAgent;
+
+
+public interface ThinkAgentMapper extends BaseMapperPlus<ThinkAgent,ThinkAgent> {
+
+}

+ 8 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/ThinkMcpMapper.java

@@ -0,0 +1,8 @@
+package org.ruoyi.mapper;
+
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.domain.ThinkAgent;
+
+public interface ThinkMcpMapper extends BaseMapperPlus<ThinkAgent,ThinkAgent> {
+
+}

+ 8 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/ThinkProjectMapper.java

@@ -0,0 +1,8 @@
+package org.ruoyi.mapper;
+
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.domain.ThinkProject;
+
+public interface ThinkProjectMapper extends BaseMapperPlus<ThinkProject,ThinkProject> {
+
+}

+ 7 - 4
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ragController.java

@@ -10,6 +10,9 @@ import org.ruoyi.chat.service.chat.RagService;
 import org.ruoyi.common.chat.entity.chat.SchemaMessage;
 import org.ruoyi.common.chat.entity.chat.ThinkProject;
 import org.ruoyi.common.chat.request.SchemaRequest;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.ThinkModel;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -75,12 +78,12 @@ public class ragController {
     }
 
     /**
-     * 查询模型列表
+     * 查询项目列表
      */
-    @PostMapping("/project")
+    @GetMapping("/project")
     @ResponseBody
-    public List<Map<String, Object>> projectList(@RequestBody @Valid ThinkProject thinkProject, HttpServletRequest request) {
-        return sseService.projeictList(thinkProject, request);
+    public TableDataInfo<org.ruoyi.domain.ThinkProject> projectList(PageQuery pageQuery) {
+        return sseService.projectList(pageQuery);
     }
 
     /**

+ 4 - 1
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/ISseService.java

@@ -9,6 +9,9 @@ import org.ruoyi.common.chat.entity.files.UploadFileResponse;
 import org.ruoyi.common.chat.entity.whisper.WhisperResponse;
 import org.ruoyi.common.chat.request.ChatRequest;
 import org.ruoyi.common.chat.request.SchemaRequest;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.ThinkModel;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
@@ -59,7 +62,7 @@ public interface ISseService {
     @DS("open-db")
     int saveRag(ThinkProject thinkProject, HttpServletRequest request);
     @DS("open-db")
-    List<Map<String, Object>> projeictList(ThinkProject thinkProject, HttpServletRequest request);
+    TableDataInfo<org.ruoyi.domain.ThinkProject> projectList(PageQuery pageQuery);
     @DS("open-db")
     int updateProjectList(Map<String,Object> map, HttpServletRequest request);
     @DS("open-db")

+ 14 - 3
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java

@@ -1,6 +1,9 @@
 package org.ruoyi.chat.service.chat.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,10 +27,14 @@ import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.common.core.utils.file.FileUtils;
 import org.ruoyi.common.core.utils.file.MimeTypeUtils;
 import org.ruoyi.common.satoken.utils.LoginHelper;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.ThinkModel;
 import org.ruoyi.domain.bo.ChatSessionBo;
 import org.ruoyi.domain.bo.QueryVectorBo;
 import org.ruoyi.domain.vo.ChatModelVo;
 import org.ruoyi.domain.vo.KnowledgeInfoVo;
+import org.ruoyi.mapper.ThinkProjectMapper;
 import org.ruoyi.service.IChatModelService;
 import org.ruoyi.service.IChatSessionService;
 import org.ruoyi.service.IKnowledgeInfoService;
@@ -80,6 +87,9 @@ public class SseServiceImpl implements ISseService {
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
+    @Autowired
+    private ThinkProjectMapper thinkProjectMapper;
+
 
     @Override
     public SseEmitter sseChat(ChatRequest chatRequest, HttpServletRequest request) {
@@ -332,9 +342,10 @@ public class SseServiceImpl implements ISseService {
     }
 
     @Override
-    public List<Map<String, Object>> projeictList(ThinkProject thinkProject, HttpServletRequest request) {
-        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from think_project");
-        return maps;
+    public TableDataInfo<org.ruoyi.domain.ThinkProject> projectList(PageQuery pageQuery) {
+        LambdaQueryWrapper<org.ruoyi.domain.ThinkProject> lqw = Wrappers.lambdaQuery();
+        Page<org.ruoyi.domain.ThinkProject> thinkProjectPage = thinkProjectMapper.selectPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(thinkProjectPage);
     }
 
     @Override