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 0044ef581..00f668bc9 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 @@ -120,6 +120,14 @@ public class ModelAssessTaskManualController { return success(manualModelAnswerService.getManualAssessment(pageReqVO)); } + @GetMapping("/gitManualReport") + @Operation(summary = "获取模型结果") + @PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')") + public CommonResult> queryTheEvaluationType(@Valid ManualModelAnswerPageReqVO pageReqVO) { + List evaluationTypeList = manualModelAnswerService.queryTheEvaluationType(pageReqVO); + return success(evaluationTypeList); + } + @PostMapping("/backup") diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ManualAssessmentPageRespVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ManualAssessmentPageRespVO.java index 2a80e37f4..65a498621 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ManualAssessmentPageRespVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ManualAssessmentPageRespVO.java @@ -71,6 +71,9 @@ public class ManualAssessmentPageRespVO { @ExcelIgnore private List> reqRespVos; + @Schema(description = "评估报告专用") + private HashMap reportMap; + @Schema(description = "系统信息") private String system; } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerService.java index 812e89466..ac490801d 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerService.java @@ -57,4 +57,6 @@ public interface ManualModelAnswerService { void annoManualModelAnswer(List reqRespVo); PageResult getManualAssessment(ManualModelAnswerPageReqVO pageReqVO); -} \ No newline at end of file + + List queryTheEvaluationType( ManualModelAnswerPageReqVO pageReqVO); +} diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerServiceImpl.java index b09bd1db2..f3d445b6a 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerServiceImpl.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.llm.controller.admin.dataset.vo.DatasetQuestionPa import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.manualAnnoVo.ManualModelAnnoRespVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.manualAnnoVo.ManualModelAnswerPageReqVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.manualAnnoVo.ManualModelAnswerSaveReqVO; +import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.LabelInformationVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ManualAssessmentPageRespVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskDimensionRespVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskManualPageReqVO; @@ -34,6 +35,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.llm.enums.ErrorCodeConstants.*; @@ -89,16 +91,27 @@ public class ManualModelAnswerServiceImpl implements ManualModelAnswerService { resp.setManalTaskId(modelAnswerDO.getManalTaskId()); if (!CollectionUtils.isAnyEmpty(modelAnswerDO.getReqRespVos())){ resp.setReqRespVos(modelAnswerDO.getReqRespVos()); + // 将map 转换成 map给评估报告专用 + HashMap report = new HashMap<>(); + modelAnswerDO.getReqRespVos().forEach( + map -> { + report.put(String.valueOf(map.get("label")),map.get("score")); + } + ); + resp.setReportMap(report); }else { if (!CollectionUtils.isAnyEmpty(modelAssessTaskManual.getDimensions())){ List> map = new ArrayList<>(); + HashMap report = new HashMap<>(); modelAssessTaskManual.getDimensions().forEach(dimension -> { HashMap map1 = new HashMap<>(); map1.put("label", dimension.getDimensionName()); map1.put("score", 0); map.add(map1); + report.put(dimension.getDimensionName(),0); }); resp.setReqRespVos(map); + resp.setReportMap(report); } } res.add(resp); @@ -109,6 +122,18 @@ public class ManualModelAnswerServiceImpl implements ManualModelAnswerService { return result; } + @Override + public List queryTheEvaluationType( ManualModelAnswerPageReqVO pageReqVO) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ManualModelAnswerDO::getManalTaskId,pageReqVO.getManalTaskId()) + .eq(ManualModelAnswerDO::getStatus,2) + .isNotNull(ManualModelAnswerDO::getReqRespVos); + List manualModelAnswerDOS = manualModelAnswerMapper.selectList(wrapper); + List bean = BeanUtils.toBean(manualModelAnswerDOS.get(0).getReqRespVos(), LabelInformationVO.class); + List collect = bean.stream().map(LabelInformationVO::getLabel).collect(Collectors.toList()); + return collect; + } + /** * 模型回答人工标注 * @param reqRespVo