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 628673ff6..6011b3f8a 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 @@ -8,8 +8,10 @@ import cn.iocoder.yudao.module.llm.controller.admin.basemodel.vo.BaseModelPageRe import cn.iocoder.yudao.module.llm.controller.admin.basemodel.vo.BaseModelSaveReqVO; 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.modelservice.ModelServiceMapper; import cn.iocoder.yudao.module.llm.dal.mysql.servername.ServerNameMapper; import cn.iocoder.yudao.module.llm.enums.FinetuningTaskStatusEnum; import cn.iocoder.yudao.module.llm.framework.backend.config.LLMBackendProperties; @@ -18,6 +20,7 @@ import cn.iocoder.yudao.module.llm.service.finetuningtask.FineTuningTaskService; import cn.iocoder.yudao.module.llm.service.modelassesstaskauto.ModelAssessTaskAutoService; import cn.iocoder.yudao.module.llm.service.modelassesstaskmanual.ModelAssessTaskManualService; import cn.iocoder.yudao.module.llm.service.modelassesstaskmanualbackup.ModelAssessTaskManualBackupService; +import cn.iocoder.yudao.module.llm.service.modelservice.ModelServiceService; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -52,8 +55,6 @@ import static cn.iocoder.yudao.module.llm.enums.ErrorCodeConstants.*; @Validated @Slf4j public class BaseModelServiceImpl implements BaseModelService { - @Resource - private ServerNameMapper serverNameMapper; @Resource private BaseModelMapper baseModelMapper; @@ -76,6 +77,9 @@ public class BaseModelServiceImpl implements BaseModelService { @Resource private LLMBackendProperties llmBackendProperties; + @Resource + private ModelServiceMapper modelServiceMapper; + @Override public Long createBaseModel (BaseModelSaveReqVO createReqVO) { validateBaseModelNameExists(createReqVO); @@ -230,6 +234,13 @@ public class BaseModelServiceImpl implements BaseModelService { @Override public void deleteTheModel(Long id) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ModelServiceDO::getFineTuningTask, id); + List modelServiceDOS = modelServiceMapper.selectList(wrapper); + if (modelServiceDOS.size()>0){ + ModelServiceDO modelServiceDO = modelServiceDOS.get(0); + throw exception(new ErrorCode(10003_001, "该基座模型已生成模型服务,请删除"+modelServiceDO.getServiceName()+"模型服务后重试")); + } try { BaseModelDO pageReqVO = baseModelMapper.selectById(id); // String resStr = HttpUtils.del(llmBackendProperties.getDeleteTheModel()+"/"+pageReqVO.getModelName(), null);