From f7526c86675cf3c282dde37d80bca75851134e44 Mon Sep 17 00:00:00 2001 From: limin Date: Fri, 27 Dec 2024 15:30:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E8=AF=84=E4=BC=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=A8=A1=E5=9E=8B=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/llm/enums/ErrorCodeConstants.java | 1 + .../ModelAssessTaskManualController.java | 13 ++----- .../vo/ModelAssessTaskManualRespVO.java | 6 +++ .../vo/ModelAssessTaskManualSaveReqVO.java | 3 ++ .../ModelAssessTaskManualDO.java | 5 +++ .../ModelAssessTaskManualService.java | 3 +- .../ModelAssessTaskManualServiceImpl.java | 38 +++++++++++++++++-- 7 files changed, 55 insertions(+), 14 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 43a7fb3e9..7b69052ca 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 @@ -26,5 +26,6 @@ public interface ErrorCodeConstants { ErrorCode MODEL_ASSESS_TASK_AUTO_NOT_EXISTS = new ErrorCode(10012, "自动评估维度不存在"); ErrorCode MODEL_ASSESS_TASK_STOPLIST_NOT_EXISTS = new ErrorCode(10013, "自动评估维度不存在"); ErrorCode MODEL_ASSESS_STOPLIST_NOT_EXISTS = new ErrorCode(10014, "自动评估维度不存在"); + ErrorCode LEARNING_RESOURCES_NOT_EXISTS = new ErrorCode(10015, "学习资源不存在"); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/ModelAssessTaskManualController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/ModelAssessTaskManualController.java index 921b3d524..b5c828596 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/ModelAssessTaskManualController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/ModelAssessTaskManualController.java @@ -72,21 +72,16 @@ public class ModelAssessTaskManualController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')") public CommonResult getModelAssessTaskManual(@RequestParam("id") Long id) { - ModelAssessTaskManualDO modelAssessTaskManual = modelAssessTaskManualService.getModelAssessTaskManual(id); - ModelAssessTaskManualRespVO bean = BeanUtils.toBean(modelAssessTaskManual, ModelAssessTaskManualRespVO.class); - List modelAssessTaskDimensionDOS = modelAssessTaskDimensionMapper.selectList(new LambdaQueryWrapper() - .eq(ModelAssessTaskDimensionDO::getTaskId, id) - .eq(ModelAssessTaskDimensionDO::getDeleted, false)); - bean.setDimensions(modelAssessTaskDimensionDOS); - return success(bean); + ModelAssessTaskManualRespVO modelAssessTaskManual = modelAssessTaskManualService.getModelAssessTaskManual(id); + return success(modelAssessTaskManual); } @GetMapping("/page") @Operation(summary = "获得模型评估任务 —— 人工评估分页") @PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')") public CommonResult> getModelAssessTaskManualPage(@Valid ModelAssessTaskManualPageReqVO pageReqVO) { - PageResult pageResult = modelAssessTaskManualService.getModelAssessTaskManualPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ModelAssessTaskManualRespVO.class)); + PageResult pageResult = modelAssessTaskManualService.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/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 cdc62557f..6a89a2c1f 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 @@ -50,6 +50,12 @@ public class ModelAssessTaskManualRespVO { @Schema(description = "模型评估任务状态，使用字典（llm_model_assess_task_status）") private Integer status; + @Schema(description = "任务进度") + private Integer progress; + + @Schema(description = "模型服务名称") + private String modelServiceName; + } \ 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/modelassesstaskmanual/vo/ModelAssessTaskManualSaveReqVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ModelAssessTaskManualSaveReqVO.java index 6cb60d645..12e7c0349 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ModelAssessTaskManualSaveReqVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ModelAssessTaskManualSaveReqVO.java @@ -34,4 +34,7 @@ public class ModelAssessTaskManualSaveReqVO { @Schema(description = "模型评估任务状态，使用字典（llm_model_assess_task_status）") private Integer status; + @Schema(description = "任务进度") + private Integer progress; + } \ 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/modelassesstaskmanual/ModelAssessTaskManualDO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelassesstaskmanual/ModelAssessTaskManualDO.java index 33b6668fe..b1d686e3a 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelassesstaskmanual/ModelAssessTaskManualDO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelassesstaskmanual/ModelAssessTaskManualDO.java @@ -56,4 +56,9 @@ public class ModelAssessTaskManualDO extends BaseDO { */ private Integer status; + /** + * 任务进度 + */ + private Integer progress; + } \ 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/modelassesstaskmanual/ModelAssessTaskManualService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualService.java index b9e63ed22..a3ec04ee8 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualService.java @@ -42,7 +42,7 @@ public interface ModelAssessTaskManualService { * @param id 编号 * @return 模型评估任务 —— 人工评估 */ - ModelAssessTaskManualDO getModelAssessTaskManual(Long id); + ModelAssessTaskManualRespVO getModelAssessTaskManual(Long id); /** * 获得模型评估任务 —— 人工评估分页 @@ -50,6 +50,7 @@ public interface ModelAssessTaskManualService { * @param pageReqVO 分页查询 * @return 模型评估任务 —— 人工评估分页 */ + PageResult getModelAssessTaskManualPage1(ModelAssessTaskManualPageReqVO pageReqVO); PageResult getModelAssessTaskManualPage(ModelAssessTaskManualPageReqVO 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/modelassesstaskmanual/ModelAssessTaskManualServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualServiceImpl.java index fb75cfd22..ad9e6f077 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualServiceImpl.java @@ -1,7 +1,9 @@ package cn.iocoder.yudao.module.llm.service.modelassesstaskmanual; import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskDimensionDO; +import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO; import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.ModelAssessTaskDimensionMapper; +import cn.iocoder.yudao.module.llm.dal.mysql.modelservice.ModelServiceMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -13,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; - import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.*; import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskManualDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -38,6 +39,8 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe private ModelAssessTaskManualMapper modelAssessTaskManualMapper; @Resource private ModelAssessTaskDimensionMapper modelAssessTaskDimensionMapper; + @Resource + private ModelServiceMapper modelServiceMapper; @Override public Long createModelAssessTaskManual(ModelAssessTaskManualSaveReqVO createReqVO) { @@ -100,11 +103,38 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe } @Override - public ModelAssessTaskManualDO getModelAssessTaskManual(Long id) { - ModelAssessTaskManualDO modelAssessTaskManualDO = modelAssessTaskManualMapper.selectById(id); - return modelAssessTaskManualDO; + public ModelAssessTaskManualRespVO getModelAssessTaskManual(Long id) { + ModelAssessTaskManualDO modelAssessTaskManual = modelAssessTaskManualMapper.selectById(id); + ModelAssessTaskManualRespVO result = BeanUtils.toBean(modelAssessTaskManual, ModelAssessTaskManualRespVO.class); + List modelAssessTaskDimensionDOS = modelAssessTaskDimensionMapper.selectList(new LambdaQueryWrapper() + .eq(ModelAssessTaskDimensionDO::getTaskId, id) + .eq(ModelAssessTaskDimensionDO::getDeleted, false)); + result.setDimensions(modelAssessTaskDimensionDOS); + ModelServiceDO modelServiceDO = modelServiceMapper.selectById(modelAssessTaskManual.getModelService()); + if (modelServiceDO != null){ + result.setModelServiceName(modelServiceDO.getServiceName()); + } + return result; } + @Override + public PageResult getModelAssessTaskManualPage1(ModelAssessTaskManualPageReqVO pageReqVO) { + PageResult modelAssessTaskManualDOPageResult = modelAssessTaskManualMapper.selectPage(pageReqVO); + PageResult result = BeanUtils.toBean(modelAssessTaskManualDOPageResult, ModelAssessTaskManualRespVO.class); + List serviceIds = modelAssessTaskManualDOPageResult.getList().stream().map(ModelAssessTaskManualDO::getModelService).collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ModelServiceDO::getId,serviceIds); + List modelServiceDOS = modelServiceMapper.selectList(wrapper); + Map longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection. + CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId); + result.getList().stream().forEach(modelAssessTaskManualRespVO -> { + ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskManualRespVO.getModelService()); + if(modelServiceDO != null){ + modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName()); + } + }); + return result; + } @Override public PageResult getModelAssessTaskManualPage(ModelAssessTaskManualPageReqVO pageReqVO) { return modelAssessTaskManualMapper.selectPage(pageReqVO);