feng пре 11 месеци
родитељ
комит
a44f8dd0d3

+ 65 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/ThinkModel.java

@@ -0,0 +1,65 @@
+package org.ruoyi.domain;
+
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 模型列表 think_model
+ *
+ * @author fyj
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("think_model")
+public class ThinkModel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 模型名称
+     */
+    private String model;
+
+    /**
+     * 网络
+     */
+    private String network;
+
+    /**
+     * 公司名称
+     */
+    private String company;
+
+
+
+    /**
+     * 描述
+     */
+    private String introduce;
+
+    /**
+     * 排序
+     */
+    private int sort;
+
+
+}
+

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

@@ -0,0 +1,69 @@
+package org.ruoyi.domain.vo;
+
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.ruoyi.domain.KnowledgeInfo;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+
+/**
+ * 模型列表 think_model
+ *
+ * @author fyj
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeInfo.class)
+public class ThinkModelVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String model;
+
+    /**
+     * 网络
+     */
+    @ExcelProperty(value = "网络")
+    private String network;
+
+    /**
+     * 公司名称
+     */
+    @ExcelProperty(value = "公司名称")
+    private String company;
+
+
+
+    /**
+     * 描述
+     */
+    @ExcelProperty(value = "描述")
+    private String introduce;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private int sort;
+
+
+}
+

+ 15 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/ThinkModelMapper.java

@@ -0,0 +1,15 @@
+package org.ruoyi.mapper;
+
+
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.domain.ThinkModel;
+
+/**
+ * 模型Mapper接口
+ *
+ * @author ageerle
+ * @date 2025-04-08
+ */
+public interface ThinkModelMapper extends BaseMapperPlus<ThinkModel, ThinkModel> {
+
+}

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

@@ -4,13 +4,13 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.ruoyi.chat.service.chat.ISseService;
 import org.ruoyi.chat.service.chat.ModelService;
-import org.ruoyi.common.chat.entity.chat.SchemaMessage;
-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.ruoyi.domain.vo.ThinkModelVo;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -39,8 +39,8 @@ public class modelController {
         return modelService.deleteModel(map, request);
     }
     //查询
-    @PostMapping("/modelList")
-    public List<Map<String, Object>> modelList(HttpServletRequest request) {
-        return modelService.modelList();
+    @GetMapping("/modelList")
+    public TableDataInfo<ThinkModel> modelList( PageQuery pageQuery) {
+        return modelService.modelList(pageQuery);
     }
 }

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

@@ -2,6 +2,9 @@ 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.ThinkModel;
 
 import java.util.List;
 import java.util.Map;
@@ -18,5 +21,5 @@ public interface ModelService {
     int deleteModel(Map<String, Object> map, HttpServletRequest request);
 
     @DS("open-db")
-    List<Map<String, Object>> modelList();
+    TableDataInfo<ThinkModel> modelList(PageQuery pageQuery);
 }

+ 18 - 10
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/ModelServiceImpl.java

@@ -1,16 +1,21 @@
 package org.ruoyi.chat.service.chat.impl;
 
+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;
-import org.ruoyi.chat.service.chat.ISseService;
 import org.ruoyi.chat.service.chat.ModelService;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.ThinkModel;
+import org.ruoyi.mapper.ThinkModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
 import java.util.Map;
 
 @Service
@@ -18,22 +23,24 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class ModelServiceImpl implements ModelService {
 
+    private final ThinkModelMapper baseMapper;
+
 
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
     @Override
-    public int uploadmodel(Map<String,Object> map, HttpServletRequest request) {
+    public int uploadmodel(Map<String, Object> map, HttpServletRequest request) {
         int result = -1;
-        result  = jdbcTemplate.update("update think_model set model = ? ,network = ?, company = ?, introduce = ?, sort = ? where id = ?",map.get("model"), map.get("network"), map.get("company"),map.get("introduce"), map.get("sort"), map.get("id"));
+        result = jdbcTemplate.update("update think_model set model = ? ,network = ?, company = ?, introduce = ?, sort = ? where id = ?", map.get("model"), map.get("network"), map.get("company"), map.get("introduce"), map.get("sort"), map.get("id"));
         return result;
     }
 
     @Override
-    public int addModel(Map<String,Object> map, HttpServletRequest request) {
+    public int addModel(Map<String, Object> map, HttpServletRequest request) {
         int result = -1;
 
-        result  = jdbcTemplate.update(
+        result = jdbcTemplate.update(
                 "INSERT INTO think_model (model, network, company, introduce,sort) " +
                         "VALUES (?, ?, ?, ?, ?)",  // 使用数据库当前时间作为创建时间
                 map.get("model"),
@@ -47,7 +54,7 @@ public class ModelServiceImpl implements ModelService {
                 Long.class
         );
         System.out.println(newId);
-        jdbcTemplate.update("update think_model set  sort = ? where id = ?",newId,newId);
+        jdbcTemplate.update("update think_model set  sort = ? where id = ?", newId, newId);
         return result;
     }
 
@@ -63,8 +70,9 @@ public class ModelServiceImpl implements ModelService {
     }
 
     @Override
-    public List<Map<String, Object>> modelList() {
-        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from think_model");
-        return maps;
+    public TableDataInfo<ThinkModel> modelList(PageQuery pageQuery) {
+        LambdaQueryWrapper<ThinkModel> lqw = Wrappers.lambdaQuery();
+        Page<ThinkModel> thinkModelPage = baseMapper.selectPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(thinkModelPage);
     }
 }