From 60ff7ace822e74e92ace2d23255ffd9c5a73ef5a Mon Sep 17 00:00:00 2001
From: sunxiqing <2240398334@qq.com>
Date: Fri, 14 Mar 2025 17:53:38 +0800
Subject: [PATCH] =?UTF-8?q?refactor(llm):=20=E9=87=8D=E6=9E=84=E5=9F=BA?=
 =?UTF-8?q?=E5=BA=A7=E6=A8=A1=E5=9E=8B=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改了 BaseModelController 中删除模型的方法，增加更新模型状态的逻辑
-重命名了 BaseModelService 接口中的方法，提高代码可读性
- 更新了 BaseModelServiceImpl 中的实现，使用更合适的方法
- 简化了 BaseModelTaskService 中的删除逻辑
- 注释掉了定时任务，可能需要根据实际情况重新启用
---
 .../controller/admin/basemodel/BaseModelController.java    | 1 +
 .../module/llm/service/basemodel/BaseModelService.java     | 2 +-
 .../module/llm/service/basemodel/BaseModelServiceImpl.java | 4 ++--
 .../module/llm/service/basemodel/BaseModelTaskService.java | 7 ++-----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/BaseModelController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/BaseModelController.java
index b57f0f10a..35f225123 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/BaseModelController.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/BaseModelController.java
@@ -86,6 +86,7 @@ public class BaseModelController {
     @Operation(summary = "删除基座模型")
     public CommonResult<Boolean> deleteTheModel(@Valid BaseModelPageReqVO pageReqVO) {
         baseModelService.deleteTheModel(pageReqVO);
+        baseModelTaskService.updateTheBaseModelState();
         return success(true);
     }
 
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelService.java
index 6768e8e43..dadf9cfda 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelService.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelService.java
@@ -77,7 +77,7 @@ public interface BaseModelService {
 
     List<BaseModelDO> getAllModels();
 
-    void updetatebyIds(List<BaseModelDO> differentModels);
+    void deletebyIds(List<BaseModelDO> differentModels);
 
     List<BaseModelDO> selectList(LambdaQueryWrapper<BaseModelDO> select);
 
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelServiceImpl.java
index 27dd2d1e8..1d6997549 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelServiceImpl.java
@@ -196,8 +196,8 @@ public class BaseModelServiceImpl implements BaseModelService {
     }
 
     @Override
-    public void updetatebyIds(List<BaseModelDO> differentModels) {
-        baseModelMapper.updateBatch(differentModels);
+    public void deletebyIds(List<BaseModelDO> differentModels) {
+        baseModelMapper.deleteByIds(differentModels);
     }
 
     @Override
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java
index b947a2d4c..e3e495663 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java
@@ -226,10 +226,7 @@ public class BaseModelTaskService {
                     .filter(baseModel -> !remoteModelNames.contains(baseModel.getModelName()))
                     .collect(Collectors.toList());
             if (differentModels.size()>0) {
-                for (BaseModelDO baseModel : differentModels){
-                    baseModel.setDeleted(true);
-                }
-                baseModelService.updetatebyIds(differentModels);
+                baseModelService.deletebyIds(differentModels);
             }
 
             // 筛选出 remoteModelNames 中不在 differentModels 中的模型名称
@@ -249,7 +246,7 @@ public class BaseModelTaskService {
     }
 
 
-    @Scheduled(cron = "0 0/1 * * * ?")
+//    @Scheduled(cron = "0 0/1 * * * ?")
     public void refreshTheModelService() {
         try {
             // 获取所有基础模型列表