diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ModelAssessTaskManualRespVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ModelAssessTaskManualRespVO.java index 9d156b4e4..1931b5b06 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ModelAssessTaskManualRespVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ModelAssessTaskManualRespVO.java @@ -64,6 +64,8 @@ public class ModelAssessTaskManualRespVO { @Schema(description = "模型类型(0普通,1官方)") private Integer modelType; + @Schema(description = "备份id") + private Long backupId; } \ No newline at end of file diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/ModelAssessTaskManualBackupController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/ModelAssessTaskManualBackupController.java index 4708410af..4f3b4c272 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/ModelAssessTaskManualBackupController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/ModelAssessTaskManualBackupController.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskauto.vo.ModelAssessTaskAutoPageReqVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskauto.vo.ModelAssessTaskAutoRespVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ManualEvaluationReportRespVO; +import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskManualRespVO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -78,8 +79,8 @@ public class ModelAssessTaskManualBackupController { @Operation(summary = "获得人工评估备份分页") @PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual-backup:query')") public CommonResult> getModelAssessTaskManualBackupPage(@Valid ModelAssessTaskManualBackupPageReqVO pageReqVO) { - PageResult pageResult = modelAssessTaskManualBackupService.getModelAssessTaskManualBackupPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ModelAssessTaskManualBackupRespVO.class)); + PageResult pageResult = modelAssessTaskManualBackupService.getModelAssessTaskManualPage1(pageReqVO); + return success(pageResult); } @GetMapping("/automatic-get") @@ -122,3 +123,4 @@ public class ModelAssessTaskManualBackupController { } + diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupService.java index eeafcb03d..5b6110bab 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupService.java @@ -67,4 +67,7 @@ public interface ModelAssessTaskManualBackupService { PageResult getModelAssessTaskAutoPage1(ModelAssessTaskAutoPageReqVO pageReqVO); ModelAssessTaskAutoRespVO getModelAssessTaskAuto(Long id); + + PageResult getModelAssessTaskManualPage1(ModelAssessTaskManualBackupPageReqVO pageReqVO); } + diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupServiceImpl.java index af48e604e..2b367d6a0 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupServiceImpl.java @@ -323,4 +323,44 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa return result; } + @Override + public PageResult getModelAssessTaskManualPage1(ModelAssessTaskManualBackupPageReqVO pageReqVO) { + PageResult modelAssessTaskManualDOPageResult = modelAssessTaskManualBackupMapper.selectPage(pageReqVO); + PageResult result = BeanUtils.toBean(modelAssessTaskManualDOPageResult, ModelAssessTaskManualBackupRespVO.class); + if (CollectionUtils.isNotEmpty(result.getList())){ + // 我的模型获取校验 + List serviceMyIds = modelAssessTaskManualDOPageResult.getList().stream(). + filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 0) + .map(ModelAssessTaskManualBackupDO::getModelService).collect(Collectors.toList()); + List modelServiceDOS = modelServiceMapper.selectList(new LambdaQueryWrapper() + .in(ModelServiceDO::getId,serviceMyIds)); + Map serviceMyMaps = cn.iocoder.yudao.framework.common.util.collection. + CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId); + // 人工模型获取校验 + List serviceForeseeIds = modelAssessTaskManualDOPageResult.getList().stream(). + filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 1) + .map(ModelAssessTaskManualBackupDO::getModelService).collect(Collectors.toList()); + List baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper() + .in(BaseModelDO::getId, serviceForeseeIds)); + Map serviceForeseeMaps = cn.iocoder.yudao.framework.common.util.collection. + CollectionUtils.convertMap(baseModelDOS, BaseModelDO::getId); + result.getList().stream().forEach(modelAssessTaskManualRespVO -> { + if (modelAssessTaskManualRespVO.getModelType() == 0){ + ModelServiceDO modelServiceDO = serviceMyMaps.get(modelAssessTaskManualRespVO.getModelService()); + if(modelServiceDO != null){ + modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName()); + } + }else { + BaseModelDO baseModelDO = serviceForeseeMaps.get(modelAssessTaskManualRespVO.getModelService()); + if(baseModelDO != null){ + modelAssessTaskManualRespVO.setModelServiceName(baseModelDO.getModelName()); + } + } + + }); + } + return result; + } + } +