From 10efb123f47fd22cc5c0cae501eeb91105e5997c Mon Sep 17 00:00:00 2001 From: limin Date: Fri, 10 Jan 2025 15:13:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=90=8D=E7=A7=B0=20=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/llm/enums/ErrorCodeConstants.java | 5 +++-- .../modelservice/ModelServiceServiceImpl.java | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-api/src/main/java/cn/iocoder/yudao/module/llm/enums/ErrorCodeConstants.java b/yudao-module-llm/yudao-module-llm-api/src/main/java/cn/iocoder/yudao/module/llm/enums/ErrorCodeConstants.java index a12d8e2ec..7bb531fbe 100644 --- a/yudao-module-llm/yudao-module-llm-api/src/main/java/cn/iocoder/yudao/module/llm/enums/ErrorCodeConstants.java +++ b/yudao-module-llm/yudao-module-llm-api/src/main/java/cn/iocoder/yudao/module/llm/enums/ErrorCodeConstants.java @@ -93,8 +93,9 @@ public interface ErrorCodeConstants { ErrorCode PROMPT_TEMPLATES_TAGS_BACKUP_NOT_EXISTS = new ErrorCode(10037, "模板信息不存在"); ErrorCode DATA_PROCESS_TASK_NAME_NOT_EXISTS = new ErrorCode(10038, "数据处理任务名称已存在"); ErrorCode FINE_TUNING_TASK_NAME_NOT_EXISTS = new ErrorCode(10039, "模型调优任务名称已存在"); - ErrorCode LEARNING_RESOURCES_NAME_NOT_EXISTS = new ErrorCode(10040, "学习资源标题名称已存在"); - ErrorCode KNOWLEDGE_BASE_NAME_NOT_EXISTS = new ErrorCode(10040, "知识库名称已存在"); + ErrorCode LEARNING_RESOURCES_NAME_NOT_EXISTS = new ErrorCode(10041, "学习资源标题名称已存在"); + ErrorCode KNOWLEDGE_BASE_NAME_NOT_EXISTS = new ErrorCode(10042, "知识库名称已存在"); + ErrorCode MODEL_SERVIC_ENAME_NOT_EXISTS = new ErrorCode(10043, "模型名称已存在"); } 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 7fde0da08..b47fcfb24 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 @@ -1,9 +1,11 @@ package cn.iocoder.yudao.module.llm.service.modelservice; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +import cn.iocoder.yudao.module.llm.dal.dataobject.dataset.DatasetDO; import cn.iocoder.yudao.module.llm.dal.dataobject.finetuningtask.FineTuningTaskDO; import cn.iocoder.yudao.module.llm.dal.mysql.finetuningtask.FineTuningTaskMapper; import cn.iocoder.yudao.module.llm.service.async.AsyncModelServiceService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -43,6 +45,7 @@ public class ModelServiceServiceImpl implements ModelServiceService { @Override public Long createModelService(ModelServiceSaveReqVO createReqVO) { // 插入 + validateModelServiceNameExists(createReqVO); ModelServiceDO modelService = BeanUtils.toBean(createReqVO, ModelServiceDO.class); modelServiceMapper.insert(modelService); asyncModelServiceService.createModelService(modelService); @@ -54,6 +57,7 @@ public class ModelServiceServiceImpl implements ModelServiceService { public void updateModelService(ModelServiceSaveReqVO updateReqVO) { // 校验存在 validateModelServiceExists(updateReqVO.getId()); + validateModelServiceNameExists(updateReqVO); // 更新 ModelServiceDO updateObj = BeanUtils.toBean(updateReqVO, ModelServiceDO.class); modelServiceMapper.updateById(updateObj); @@ -72,6 +76,18 @@ public class ModelServiceServiceImpl implements ModelServiceService { throw exception(MODEL_SERVICE_NOT_EXISTS); } } + private void validateModelServiceNameExists(ModelServiceSaveReqVO updateReqVO) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(ModelServiceDO::getServiceName, updateReqVO.getServiceName()); + + if (updateReqVO.getId() != null){ + wrapper.ne(ModelServiceDO::getId, updateReqVO.getId()); + } + List modelServiceDOS = modelServiceMapper.selectList(wrapper); + if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(modelServiceDOS)){ + throw exception(MODEL_SERVIC_ENAME_NOT_EXISTS); + } + } @Override public ModelServiceDO getModelService(Long id) {