From d5c2fc3c243cf7f2a8706ba5b20ba1c9621c8553 Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Fri, 21 Mar 2025 15:33:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(llm):=20=E4=BF=AE=E5=A4=8D=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=9C=8D=E5=8A=A1=E5=88=A0=E9=99=A4=E6=97=B6=E6=9C=AA?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98-=20=E5=9C=A8=20ModelServiceServiceImpl=20?= =?UTF-8?q?=E7=B1=BB=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86=20BaseModelContro?= =?UTF-8?q?ller=20=E5=92=8C=20BaseModelMapper=20=E7=9A=84=E5=BC=95?= =?UTF-8?q?=E7=94=A8=20-=20=E5=9C=A8=E5=88=A0=E9=99=A4=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=B9=E5=BA=94=E5=9F=BA=E7=A1=80=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E9=80=BB=E8=BE=91-=20=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9E=8B=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=9D=A5=E8=8E=B7=E5=8F=96=E5=9F=BA=E7=A1=80=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=20ID=EF=BC=8C=E5=B9=B6=E8=B0=83=E7=94=A8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/modelservice/ModelServiceServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 745a00344..72e551291 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 @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.http.HttpUtils; 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.modelservice.vo.ModelServicePageReqVO; import cn.iocoder.yudao.module.llm.controller.admin.modelservice.vo.ModelServiceRespVO; import cn.iocoder.yudao.module.llm.controller.admin.modelservice.vo.ModelServiceSaveReqVO; @@ -14,6 +15,7 @@ import cn.iocoder.yudao.module.llm.dal.dataobject.basemodel.BaseModelDO; import cn.iocoder.yudao.module.llm.dal.dataobject.finetuningtask.FineTuningTaskDO; import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO; import cn.iocoder.yudao.module.llm.dal.dataobject.servername.ServerNameDO; +import cn.iocoder.yudao.module.llm.dal.mysql.basemodel.BaseModelMapper; import cn.iocoder.yudao.module.llm.dal.mysql.finetuningtask.FineTuningTaskMapper; import cn.iocoder.yudao.module.llm.dal.mysql.modelservice.ModelServiceMapper; import cn.iocoder.yudao.module.llm.framework.backend.config.LLMBackendProperties; @@ -92,6 +94,10 @@ public class ModelServiceServiceImpl implements ModelServiceService { @Resource @Lazy private BaseModelService baseModelService; + @Resource + private BaseModelController baseModelController; + @Resource + private BaseModelMapper baseModelMapper; @Override @@ -180,6 +186,11 @@ public class ModelServiceServiceImpl implements ModelServiceService { ModelServiceDO modelServiceDO = modelServiceMapper.selectById(id); ServerNameDO serverNameDO = serverNameService.getServerName(modelServiceDO.getGpuType()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper().eq(BaseModelDO::getModelName, modelServiceDO.getBaseModelName()); + List baseModelDOS = baseModelMapper.selectList(wrapper); + if (baseModelDOS != null && baseModelDOS.size() > 0) { + baseModelController.deleteTheModel(baseModelDOS.get(0).getId()); + } // 发起模型卸载请求 log.info("正在发起模型卸载请求，服务ID: {}", id);