Explorar el Código

模型增删改后端修改

zhaohan hace 11 meses
padre
commit
93e05fda26

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

@@ -1,8 +1,14 @@
 package org.ruoyi.mapper;
 
 import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.ThinkModel;
 import org.ruoyi.domain.ThinkProject;
 
+import java.util.List;
+import java.util.Map;
+
 public interface ThinkProjectMapper extends BaseMapperPlus<ThinkProject,ThinkProject> {
 
+
 }

+ 10 - 0
ruoyi-modules-api/ruoyi-system-api/src/main/resources/mapper/ThinkProjectMapper.xml

@@ -0,0 +1,10 @@
+<?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="org.ruoyi.mapper.ThinkProjectMapper">
+
+
+
+
+</mapper>

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

@@ -99,7 +99,7 @@ public class ragController {
      * 查询模型列表
      */
     @GetMapping("/model/list")
-    public List<Map<String, Object>> modelList(HttpServletRequest request) {
+    public TableDataInfo<ThinkModel> modelList() {
         return sseService.modelList();
     }
 

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

@@ -66,7 +66,7 @@ public interface ISseService {
     @DS("open-db")
     int updateProjectList(Map<String,Object> map, HttpServletRequest request);
     @DS("open-db")
-    List<Map<String, Object>> modelList();
+    TableDataInfo<ThinkModel> modelList();
     @DS("open-db")
     List<Map<String, Object>> ragList(HttpServletRequest request);
     @DS("open-db")

+ 12 - 6
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java

@@ -34,6 +34,7 @@ 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.ThinkModelMapper;
 import org.ruoyi.mapper.ThinkProjectMapper;
 import org.ruoyi.service.IChatModelService;
 import org.ruoyi.service.IChatSessionService;
@@ -89,6 +90,8 @@ public class SseServiceImpl implements ISseService {
 
     @Autowired
     private ThinkProjectMapper thinkProjectMapper;
+    @Autowired
+    private ThinkModelMapper  thinkModelMapper;
 
 
     @Override
@@ -357,15 +360,18 @@ public class SseServiceImpl implements ISseService {
         } else if (!"".equals(map.get("rags")) && "".equals(map.get("models"))) {
             result = jdbcTemplate.update("update think_project set rags = ? where id = ?", map.get("rags"), map.get("id"));
         } else {
-            result = jdbcTemplate.update("update think_project set organization = ? ,project = ?, private_key = ?, public_key = ? where id = ?", map.get("organization"), map.get("project"), map.get("private_key"), map.get("public_key"), map.get("id"));
+            result = jdbcTemplate.update("update think_project set organization = ? ,project = ?, private_key = ?, public_key = ? where id = ?", map.get("organization"), map.get("project"), map.get("privateKey"), map.get("publicKey"), map.get("id"));
         }
         return result;
     }
 
     @Override
-    public List<Map<String, Object>> modelList() {
-        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from think_model");
-        return maps;
+    public TableDataInfo<ThinkModel> modelList() {
+        List<ThinkModel> allModels = thinkModelMapper.selectList(Wrappers.lambdaQuery());
+        Page<ThinkModel> page = new Page<>();
+        page.setRecords(allModels);
+        page.setTotal(allModels.size());
+        return TableDataInfo.build(page);
     }
 
     @Override
@@ -448,8 +454,8 @@ public class SseServiceImpl implements ISseService {
                         "VALUES (?, ?, ?, ?, ?)",  // 使用数据库当前时间作为创建时间
                 map.get("organization"),
                 map.get("project"),
-                map.get("private_key"),
-                map.get("public_key"),
+                map.get("privateKey"),
+                map.get("publicKey"),
                 "[]"// 提供sort默认值
         );
         return result;