From 3d7c994bf96ae01fdd8a810a835ed0b9254115f7 Mon Sep 17 00:00:00 2001
From: cherishsince <cherishsince@aliyun.com>
Date: Mon, 6 May 2024 16:38:33 +0800
Subject: [PATCH] 【调整】ai模型，增加sort排序

---
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/AiChatModalDO.java        |  5 +++++
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatModalServiceImpl.java |  2 +-
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalAddReq.java                | 10 +++++++---
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalListRes.java               |  3 +++
 yudao-module-ai/yudao-module-ai-biz/src/main/resources/http/chat-modal.http                                           |  6 ++++--
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/AiChatModalDO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/AiChatModalDO.java
index 43175d3..cb045c5 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/AiChatModalDO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/AiChatModalDO.java
@@ -44,7 +44,12 @@ public class AiChatModalDO extends BaseDO {
      */
     private Integer disable;
     /**
+     * 排序
+     */
+    private Integer sort;
+    /**
      * modal 配置(json)
      */
     private String config;
+
 }
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatModalServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatModalServiceImpl.java
index cc7f505..b8030cc 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatModalServiceImpl.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatModalServiceImpl.java
@@ -54,7 +54,7 @@ public class AiChatModalServiceImpl implements AiChatModalService {
             queryWrapperX.like(AiChatModalDO::getName, req.getSearch().trim());
         }
         // 默认排序
-        queryWrapperX.orderByDesc(AiChatModalDO::getId);
+        queryWrapperX.orderByAsc(AiChatModalDO::getSort);
         // 查询
         PageResult<AiChatModalDO> aiChatModalDOPageResult = aiChatModalMapper.selectPage(req, queryWrapperX);
         // 转换 res
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalAddReq.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalAddReq.java
index 4145e2c..6a2b143 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalAddReq.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalAddReq.java
@@ -19,25 +19,29 @@ import java.util.Map;
 @Accessors(chain = true)
 public class AiChatModalAddReq {
 
-    @NotNull
     @Schema(description = "模型名字")
     @Size(max = 60, message = "模型名字最大60个字符")
+    @NotNull(message = "模型名字不能为空!")
     private String name;
 
-    @NotNull
     @Size(max = 32, message = "模型平台最大32个字符")
     @Schema(description = "模型平台 参考 AiPlatformEnum")
+    @NotNull(message = "平台不能为空!")
     private String platform;
 
-    @NotNull
     @Schema(description = "模型类型(qianwen、yiyan、xinghuo、openai)")
     @Size(max = 32, message = "模型类型最大32个字符")
+    @NotNull(message = "modal模型不能为空!")
     private String modal;
 
     @Schema(description = "模型照片")
     @Size(max = 256, message = "模型照片地址最大256个字符")
     private String imageUrl;
 
+    @Schema(description = "排序")
+    @NotNull(message = "sort排序不能为空!")
+    private Integer sort;
+
     @Schema(description = "模型配置JSON")
 //    @Size(max = 1024, message = "模型配置最大1024个字符")
     private Map<String, Object> config;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalListRes.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalListRes.java
index d05ed7d..ce99e39 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalListRes.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatModalListRes.java
@@ -34,6 +34,9 @@ public class AiChatModalListRes {
     @Schema(description = "禁用 0、正常 1、禁用")
     private Integer disable;
 
+    @Schema(description = "排序 asc 排序")
+    private Integer sort;
+
     @Schema(description = "modal 配置")
     private String config;
 }
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/resources/http/chat-modal.http b/yudao-module-ai/yudao-module-ai-biz/src/main/resources/http/chat-modal.http
index 50c8990..ab8aa85 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/resources/http/chat-modal.http
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/resources/http/chat-modal.http
@@ -10,10 +10,11 @@ Content-Type: application/json
 Authorization: {{token}}
 
 {
-  "name": "小红书Ai写作大模型-plus",
-  "modal": "ERNIE-3.5-8K",
+  "name": "小红书Ai写作大模型4.0",
+  "modal": "ERNIE 4.0",
   "platform": "yiyan",
   "imageUrl": "",
+  "sort": 100,
   "config": {
     "topK": 0.6,
     "topP": 0.6,
@@ -32,6 +33,7 @@ Authorization: {{token}}
   "modal": "ERNIE-3.5-8K",
   "platform": "yiyan",
   "imageUrl": "",
+  "sort": 1,
   "config": {
     "topK": 0.6,
     "topP": 0.6,
--
libgit2 0.21.4