From 47f881c91c31f953d0111ca41ec07804282c6504 Mon Sep 17 00:00:00 2001 From: limin Date: Sat, 4 Jan 2025 09:06:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=87=E4=BB=BDid=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modelassesstaskmanual/vo/ModelAssessTaskManualRespVO.java | 2 ++ 1 file changed, 2 insertions(+) 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 From 6e44b70badb2aee2eeecfef64dd9741a90eef13f Mon Sep 17 00:00:00 2001 From: limin Date: Sat, 4 Jan 2025 09:31:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ModelAssessTaskManualBackupController.java | 5 ++- .../ModelAssessTaskManualBackupService.java | 2 + ...odelAssessTaskManualBackupServiceImpl.java | 39 +++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) 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 bd65e950b..dcdf012de 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 @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup; +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; @@ -75,8 +76,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("/export-excel") 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 2c6bab4fa..4f509ef43 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 @@ -57,4 +57,6 @@ public interface ModelAssessTaskManualBackupService { void unBackup(Long id); ModelAssessTaskManualBackupRespVO getModelAssessTaskManualBackup1(Long id); + + PageResult getModelAssessTaskManualPage1(ModelAssessTaskManualBackupPageReqVO pageReqVO); } \ No newline at end of file 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 6ebfb881f..89b982b1c 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 @@ -162,4 +162,43 @@ 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; + } + } \ No newline at end of file