From 8f18b119aec1016f2f5ff679fadad4ccf4ffddc0 Mon Sep 17 00:00:00 2001
From: sunxiqing <2240398334@qq.com>
Date: Fri, 21 Mar 2025 15:56:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(llm):=20=E4=BF=AE=E5=A4=8D=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=A8=A1=E5=9E=8B=E6=97=B6=E5=8F=AF=E8=83=BD=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?-=20=E5=9C=A8=20FineTuningTaskServiceImpl=20=E4=B8=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A0=E9=99=A4=E5=BE=AE=E8=B0=83=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E5=88=A0=E9=99=A4=E5=9F=BA=E6=A8=A1=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20-=20=E5=9C=A8=20ModelServiceServiceImpl=20?=
 =?UTF-8?q?=E4=B8=AD=E7=A7=BB=E9=99=A4=E5=88=A0=E9=99=A4=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=B6=E5=88=A0=E9=99=A4=E5=9F=BA=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finetuningtask/FineTuningTaskServiceImpl.java     | 11 +++++++++++
 .../service/modelservice/ModelServiceServiceImpl.java | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java
index 1f2b7be21..550d09a1d 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.llm.service.finetuningtask;
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.llm.controller.admin.basemodel.BaseModelController;
 import cn.iocoder.yudao.module.llm.controller.admin.finetuningtask.vo.FineTuningTaskPageReqVO;
 import cn.iocoder.yudao.module.llm.controller.admin.finetuningtask.vo.FineTuningTaskRespVO;
 import cn.iocoder.yudao.module.llm.controller.admin.finetuningtask.vo.FineTuningTaskSaveReqVO;
@@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -67,6 +69,10 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService {
 
     @Resource
     private ModelServiceService modelServiceService;
+    @Resource
+    @Lazy
+    private BaseModelController baseModelController;
+
 
     @Override
     public Long createFineTuningTask (FineTuningTaskSaveReqVO createReqVO) {
@@ -115,6 +121,11 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService {
 //        validateFineTuningTaskUse(id);
         FineTuningTaskDO fineTuningTaskDO = fineTuningTaskMapper.selectById(id);
         // 删除
+        LambdaQueryWrapper<BaseModelDO> eq = new LambdaQueryWrapper<BaseModelDO>().eq(BaseModelDO::getModelName, fineTuningTaskDO.getJobModelName());
+        List<BaseModelDO> baseModelDOS = baseModelMapper.selectList(eq);
+        if (baseModelDOS != null && baseModelDOS.size() > 0) {
+            baseModelController.deleteTheModel(baseModelDOS.get(0).getId());
+        }
         LambdaUpdateWrapper<FineTuningTaskDO> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(FineTuningTaskDO::getId, id)
                 .set(FineTuningTaskDO::getDeleted, true);
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java
index 72e551291..742b2150e 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java
@@ -94,10 +94,6 @@ public class ModelServiceServiceImpl implements ModelServiceService {
     @Resource
     @Lazy
     private BaseModelService baseModelService;
-    @Resource
-    private BaseModelController baseModelController;
-    @Resource
-    private BaseModelMapper baseModelMapper;
 
 
     @Override
@@ -186,12 +182,6 @@ public class ModelServiceServiceImpl implements ModelServiceService {
 
         ModelServiceDO modelServiceDO = modelServiceMapper.selectById(id);
         ServerNameDO serverNameDO = serverNameService.getServerName(modelServiceDO.getGpuType());
-        LambdaQueryWrapper<BaseModelDO> wrapper = new LambdaQueryWrapper<BaseModelDO>().eq(BaseModelDO::getModelName, modelServiceDO.getBaseModelName());
-        List<BaseModelDO> baseModelDOS = baseModelMapper.selectList(wrapper);
-        if (baseModelDOS != null && baseModelDOS.size() > 0) {
-            baseModelController.deleteTheModel(baseModelDOS.get(0).getId());
-        }
-
         // 发起模型卸载请求
         log.info("正在发起模型卸载请求，服务ID: {}", id);
         trainHttpService.modelUndeploy(new HashMap<>(), serverNameDO.getHost(), modelServiceDO.getJobId());