diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxdata/DataRefluxDataController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxdata/DataRefluxDataController.java index e5d0dcdd8..6b1f3c1e4 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxdata/DataRefluxDataController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxdata/DataRefluxDataController.java @@ -85,22 +85,24 @@ public class DataRefluxDataController { @GetMapping("/review-the-data") @Operation(summary = "数据回流配置保存数据") - public void saveTheData(@Valid DataRefluxDataReqVO pageReqVO){ + public CommonResult saveTheData(@Valid DataRefluxDataReqVO pageReqVO){ if (pageReqVO.getDataid() != null){ pageReqVO.setDataids(Collections.singletonList(pageReqVO.getDataid())); } dataRefluxDataService.getDataRefluxDataIDs(pageReqVO); + return success(true); } @GetMapping("/save-all-the-data") @Operation(summary = "数据回流配置保存全部数据") - public void saveAllTheData(@Valid DataRefluxDataReqVO pageReqVO, DataRefluxConfigPageReqVO page){ + public CommonResult saveAllTheData(@Valid DataRefluxDataReqVO pageReqVO, DataRefluxConfigPageReqVO page){ page.setPageSize(PageParam.PAGE_SIZE_NONE); PageResult list = dataRefluxDataService.getTheDetails(page); List doList = list.getList(); List collect = doList.stream().map(DataRefluxDataDO::getId).collect(Collectors.toList()); pageReqVO.setDataids(collect); dataRefluxDataService.getDataRefluxDataIDs(pageReqVO); + return success(true); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java index cc9c554f2..f2d8b7988 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.llm.service.datarefluxdata; import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.exception.ServiceException; +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.llm.controller.admin.datarefluxconfig.vo.DataRefluxConfigPageReqVO; import cn.iocoder.yudao.module.llm.dal.dataobject.datarefluxconfig.DataRefluxConfigDO; @@ -146,8 +147,8 @@ public class DataRefluxDataServiceImpl implements DataRefluxDataService { List dataRefluxDataDOS = dataRefluxDataMapper.selectList(wrapper); DatasetDO dataRespVO = BeanUtils.toBean(pageReqVO, DatasetDO.class); dataRespVO.setId(null); - DatasetDO datasetDO = datasetMapper.selectOne(new LambdaQueryWrapper().eq(DatasetDO::getDatasetName, dataRespVO.getDatasetName())); - if (datasetDO!=null){ + List datasetDO = datasetMapper.selectList(new LambdaQueryWrapper().eq(DatasetDO::getDatasetName, dataRespVO.getDatasetName())); + if (!CollectionUtils.isAnyEmpty(datasetDO)){ throw new RuntimeException("数据集名称重复"); } datasetMapper.insert(dataRespVO);