From 58f110ee30938c5ef654461e820d39d702db87c3 Mon Sep 17 00:00:00 2001 From: limin Date: Fri, 3 Jan 2025 19:36:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=A4=87=E4=BB=BD=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=8E=B7=E5=8F=96=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ModelAssessTaskManualBackupController.java | 4 +- .../vo/ModelAssessTaskManualBackupRespVO.java | 13 ++++ .../ModelAssessTaskManualBackupSaveReqVO.java | 2 + .../ModelAssessTaskManualBackupDO.java | 1 + .../ModelAssessTaskManualBackupService.java | 2 + ...odelAssessTaskManualBackupServiceImpl.java | 69 +++++++++++++++++++ 6 files changed, 89 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 ce6c36992..bd65e950b 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 @@ -67,8 +67,8 @@ public class ModelAssessTaskManualBackupController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual-backup:query')") public CommonResult getModelAssessTaskManualBackup(@RequestParam("id") Long id) { - ModelAssessTaskManualBackupDO modelAssessTaskManualBackup = modelAssessTaskManualBackupService.getModelAssessTaskManualBackup(id); - return success(BeanUtils.toBean(modelAssessTaskManualBackup, ModelAssessTaskManualBackupRespVO.class)); + ModelAssessTaskManualBackupRespVO modelAssessTaskManual = modelAssessTaskManualBackupService.getModelAssessTaskManualBackup1(id); + return success(modelAssessTaskManual); } @GetMapping("/page") diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/vo/ModelAssessTaskManualBackupRespVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/vo/ModelAssessTaskManualBackupRespVO.java index 3170252b6..6694374ed 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/vo/ModelAssessTaskManualBackupRespVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/vo/ModelAssessTaskManualBackupRespVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo; +import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskDimensionRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -51,5 +52,17 @@ public class ModelAssessTaskManualBackupRespVO { @Schema(description = "进度") @ExcelProperty("进度") private Integer progress; + @Schema(description = "人工评估列表") + private List dimensions; + @Schema(description = "模型服务名称") + private String modelServiceName; + + @Schema(description = "数据集名称") + private String datasetName; + /** + * 模型类型 + */ + @Schema(description = "模型类型（0普通，1官方）") + private Integer modelType; } \ 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/vo/ModelAssessTaskManualBackupSaveReqVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/vo/ModelAssessTaskManualBackupSaveReqVO.java index 7f0224577..1cf20fbef 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/vo/ModelAssessTaskManualBackupSaveReqVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/vo/ModelAssessTaskManualBackupSaveReqVO.java @@ -38,5 +38,7 @@ public class ModelAssessTaskManualBackupSaveReqVO { @Schema(description = "进度") private Integer progress; + @Schema(description = "模型类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + private Integer modelType; } \ No newline at end of file diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelassesstaskmanualbackup/ModelAssessTaskManualBackupDO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelassesstaskmanualbackup/ModelAssessTaskManualBackupDO.java index 969912a85..53a6825d0 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelassesstaskmanualbackup/ModelAssessTaskManualBackupDO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelassesstaskmanualbackup/ModelAssessTaskManualBackupDO.java @@ -59,5 +59,6 @@ public class ModelAssessTaskManualBackupDO extends BaseDO { * 进度 */ private Integer progress; + private Integer modelType; } \ 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/ModelAssessTaskManualBackupService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupService.java index b37a4046d..2c6bab4fa 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 @@ -55,4 +55,6 @@ public interface ModelAssessTaskManualBackupService { void isBackup(Long srcId); void unBackup(Long id); + + ModelAssessTaskManualBackupRespVO getModelAssessTaskManualBackup1(Long id); } \ 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 da05f0733..6ebfb881f 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 @@ -1,14 +1,31 @@ package cn.iocoder.yudao.module.llm.service.modelassesstaskmanualbackup; +import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskDimensionRespVO; +import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskManualRespVO; +import cn.iocoder.yudao.module.llm.dal.dataobject.basemodel.BaseModelDO; +import cn.iocoder.yudao.module.llm.dal.dataobject.dataset.DatasetDO; +import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessDimensionDO; +import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskDimensionDO; +import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskManualDO; +import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupDO; +import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO; +import cn.iocoder.yudao.module.llm.dal.mysql.basemodel.BaseModelMapper; +import cn.iocoder.yudao.module.llm.dal.mysql.dataset.DatasetMapper; import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.ManualModelAnswerMapper; +import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.ModelAssessDimensionMapper; import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ManualModelAnswerBackupMapper; import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupMapper; +import cn.iocoder.yudao.module.llm.dal.mysql.modelservice.ModelServiceMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; + import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo.*; import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskManualBackupDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -35,6 +52,14 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa private ModelAssessTaskDimensionBackupMapper modelAssessTaskDimensionBackupMapper; @Resource private ManualModelAnswerBackupMapper manualModelAnswerBackupMapper; + @Resource + private ModelAssessDimensionMapper modelAssessDimensionMapper; + @Resource + private ModelServiceMapper modelServiceMapper; + @Resource + private DatasetMapper datasetMapper; + @Resource + private BaseModelMapper baseModelMapper; @Override public Long createModelAssessTaskManualBackup(ModelAssessTaskManualBackupSaveReqVO createReqVO) { @@ -93,4 +118,48 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa manualModelAnswerBackupMapper.deleteTrue(id); } + @Override + public ModelAssessTaskManualBackupRespVO getModelAssessTaskManualBackup1(Long id) { + ModelAssessTaskManualBackupDO modelAssessTaskManual = modelAssessTaskManualBackupMapper.selectById(id); + ModelAssessTaskManualBackupRespVO result = BeanUtils.toBean(modelAssessTaskManual, ModelAssessTaskManualBackupRespVO.class); + List modelAssessTaskDimensionDOS = modelAssessTaskDimensionBackupMapper.selectList(new LambdaQueryWrapper() + .eq(ModelAssessTaskDimensionBackupDO::getTaskId, id) + .eq(ModelAssessTaskDimensionBackupDO::getDeleted, false)); + List modelAssessTaskDimensionRespVOS = BeanUtils.toBean(modelAssessTaskDimensionDOS, ModelAssessTaskDimensionRespVO.class); + // 提取id + List dimensionIds = modelAssessTaskDimensionDOS.stream().map(ModelAssessTaskDimensionBackupDO::getDimensionId).collect(Collectors.toList()); + // 查询模型评估维度 将维度名称返回 + if (!CollectionUtils.isEmpty(dimensionIds)){ + List modelAssessDimensionDOS = modelAssessDimensionMapper.selectList(new LambdaQueryWrapper() + .in(ModelAssessDimensionDO::getId, dimensionIds)); + Map longModelDimesionDOMap = cn.iocoder.yudao.framework.common.util.collection. + CollectionUtils.convertMap(modelAssessDimensionDOS, ModelAssessDimensionDO::getId); + modelAssessTaskDimensionRespVOS.stream().forEach( + modelAssessTaskDimensionRespVO -> { + ModelAssessDimensionDO modelAssessDimensionDO = longModelDimesionDOMap.get(modelAssessTaskDimensionRespVO.getDimensionId()); + if (modelAssessDimensionDO != null){ + modelAssessTaskDimensionRespVO.setDimensionName(modelAssessDimensionDO.getDimension()); + } + } + ); + } + result.setDimensions(modelAssessTaskDimensionRespVOS); + if (modelAssessTaskManual.getModelType() == 0){ + ModelServiceDO modelServiceDO = modelServiceMapper.selectById(modelAssessTaskManual.getModelService()); + if (modelServiceDO != null){ + result.setModelServiceName(modelServiceDO.getServiceName()); + } + }else { + BaseModelDO baseModelDO = baseModelMapper.selectById(modelAssessTaskManual.getModelService()); + if (baseModelDO != null){ + result.setModelServiceName(baseModelDO.getModelName()); + } + } + DatasetDO datasetDO = datasetMapper.selectById(modelAssessTaskManual.getDataset()); + if (datasetDO != null){ + result.setDatasetName(datasetDO.getDatasetName()); + } + return result; + } + } \ No newline at end of file