From 720210d6b9cf6396707727c51548407da1f10484 Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Mon, 17 Mar 2025 12:51:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor(llm):=20=E4=BC=98=E5=8C=96=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E6=A8=A1=E5=9E=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ModelServiceController 中添加模型禁用前的检查应用逻辑 - 在 ModelServiceService 接口中新增 inspectTheApplication 方法 - 在 ModelServiceServiceImpl 中实现 inspectTheApplication 方法,增加应用中心模型使用情况的校验 --- .../admin/modelservice/ModelServiceController.java | 1 + .../llm/service/modelservice/ModelServiceService.java | 2 ++ .../llm/service/modelservice/ModelServiceServiceImpl.java | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java index f327feab0..3d2cdb1e9 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java @@ -162,6 +162,7 @@ public class ModelServiceController { @Operation(summary = "禁用模型") // @PreAuthorize("@ss.hasPermission('llm:base-model:update')") public CommonResult disable(@Valid @RequestBody ModelServiceSaveReqVO updateReqVO) { + modelServiceService.inspectTheApplication(updateReqVO); modelServiceService.disableTheModel(updateReqVO); return success(true); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java index 8f931a961..bcebd2bfe 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java @@ -93,4 +93,6 @@ public interface ModelServiceService { void startTheModel(ModelServiceSaveReqVO updateReqVO); void disableTheModel(ModelServiceSaveReqVO updateReqVO); + + void inspectTheApplication(ModelServiceSaveReqVO updateReqVO); } 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 b1b21a64a..745a00344 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 @@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 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; +import cn.iocoder.yudao.module.llm.dal.dataobject.application.ApplicationDO; 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; @@ -30,6 +31,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -485,4 +487,9 @@ public class ModelServiceServiceImpl implements ModelServiceService { } } + @Override + public void inspectTheApplication(ModelServiceSaveReqVO updateReqVO) { + validateModelUsesInApplicationCenter(updateReqVO.getId(), updateReqVO.getServiceName()); + } + }