From 9b6cd2b3cbd4a39e8b9a3717d53ec21c16fc623d Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Sat, 4 Jan 2025 17:36:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ManualAssessmentPageRespVO.java | 2 -- .../ManualModelAnswerServiceImpl.java | 9 --------- 2 files changed, 11 deletions(-) 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 65a498621..30ea45b52 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,8 +71,6 @@ 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/ManualModelAnswerServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerServiceImpl.java index f3d445b6a..37ba79392 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 @@ -91,14 +91,6 @@ 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<>(); @@ -111,7 +103,6 @@ public class ManualModelAnswerServiceImpl implements ManualModelAnswerService { report.put(dimension.getDimensionName(),0); }); resp.setReqRespVos(map); - resp.setReportMap(report); } } res.add(resp); From f47bdb372e365723ccb16306f8199599926ed15b Mon Sep 17 00:00:00 2001 From: limin Date: Sat, 4 Jan 2025 21:30:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModelAssessTaskManualServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 92dcc253a..176b58a74 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 @@ -207,16 +207,22 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe List serviceMyIds = modelAssessTaskManualDOPageResult.getList().stream(). filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 0) .map(ModelAssessTaskManualDO::getModelService).collect(Collectors.toList()); - List modelServiceDOS = modelServiceMapper.selectList(new LambdaQueryWrapper() - .in(ModelServiceDO::getId,serviceMyIds)); + List modelServiceDOS = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(serviceMyIds)) { + 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(ModelAssessTaskManualDO::getModelService).collect(Collectors.toList()); - List baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper() - .in(BaseModelDO::getId, serviceForeseeIds)); + List baseModelDOS = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(serviceForeseeIds)) { + 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 -> { From e61b2185e3d281d5880266f7faff048d6f117806 Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Sun, 5 Jan 2025 14:00:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=91=8A=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8A=A8=E6=80=81=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModelAssessTaskManualBackupController.java | 9 +++++++++ .../ModelAssessTaskManualBackupService.java | 1 + .../ModelAssessTaskManualBackupServiceImpl.java | 12 ++++++++++++ 3 files changed, 22 insertions(+) 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 75e51bb6c..281f57e60 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 @@ -2,6 +2,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.manualAnnoVo.ManualModelAnswerPageReqVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ManualAssessmentPageRespVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ManualEvaluationReportRespVO; import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskManualRespVO; @@ -123,6 +124,14 @@ public class ModelAssessTaskManualBackupController { return success(manualEvaluationReportRespVOS); } + @GetMapping("/gitManualReport") + @Operation(summary = "获取模型结果") + @PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')") + public CommonResult> queryTheEvaluationType(@Valid ManualModelAnswerPageReqVO pageReqVO) { + List evaluationTypeList = modelAssessTaskManualBackupService.queryTheEvaluationType(pageReqVO); + return success(evaluationTypeList); + } + } 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 28fd827e0..3ec726b8b 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 @@ -75,5 +75,6 @@ public interface ModelAssessTaskManualBackupService { // 备份导出列表查询 PageResult getManualAssessment(ManualModelAnswerBackupPageReqVO pageReqVO); + List queryTheEvaluationType(ManualModelAnswerPageReqVO 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 2520e158c..e05213cc2 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 @@ -413,5 +413,17 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa result.setTotal(modelAnswerDOPageResult.getTotal()); return result; } + + @Override + public List queryTheEvaluationType(ManualModelAnswerPageReqVO pageReqVO) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ManualModelAnswerBackupDO::getManalTaskId,pageReqVO.getManalTaskId()) + .eq(ManualModelAnswerBackupDO::getStatus,2) + .isNotNull(ManualModelAnswerBackupDO::getReqRespVos); + List manualModelAnswerDOS = manualModelAnswerBackupMapper.selectList(wrapper); + List bean = BeanUtils.toBean(manualModelAnswerDOS.get(0).getReqRespVos(), LabelInformationVO.class); + List collect = bean.stream().map(LabelInformationVO::getLabel).collect(Collectors.toList()); + return collect; + } } From 4926ca75447ea3b3d326f3861b43dd49e4d071df Mon Sep 17 00:00:00 2001 From: limin Date: Sun, 5 Jan 2025 14:16:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/llm/service/async/AsyncModelServiceService.java | 4 ++++ .../llm/service/modelservice/ModelServiceServiceImpl.java | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java index 1146ada56..007aedaa7 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java @@ -22,6 +22,8 @@ public class AsyncModelServiceService { public void startModelService(ModelServiceDO updateObj) { try { Thread.sleep(30000); + updateObj.setStatus(2); + modelServiceMapper.updateById(updateObj); }catch(Exception e){ updateObj.setStatus(5); modelServiceMapper.updateById(updateObj); @@ -33,6 +35,8 @@ public class AsyncModelServiceService { public void stopModelService(ModelServiceDO updateObj) { try { Thread.sleep(30000); + updateObj.setStatus(3); + modelServiceMapper.updateById(updateObj); }catch(Exception e){ updateObj.setStatus(5); modelServiceMapper.updateById(updateObj); diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java index d81676bab..093ce6e22 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java @@ -95,9 +95,6 @@ public class ModelServiceServiceImpl implements ModelServiceService { //todo 开启模型服务 asyncModelServiceService.startModelService(updateObj); - - updateObj.setStatus(2); - modelServiceMapper.updateById(updateObj); } @Override @@ -109,8 +106,6 @@ public class ModelServiceServiceImpl implements ModelServiceService { //todo 关闭模型服务 asyncModelServiceService.stopModelService(updateObj); -/* updateObj.setStatus(3); - modelServiceMapper.updateById(updateObj);*/ } From 80499f72f212f270b2069f75af0596d24e2c0975 Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Sun, 5 Jan 2025 14:22:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=91=8A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModelAssessTaskManualBackupController.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 281f57e60..c20c69c24 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 @@ -124,6 +124,13 @@ public class ModelAssessTaskManualBackupController { return success(manualEvaluationReportRespVOS); } + @GetMapping("/getManualAssessment") + @Operation(summary = "获取模型结果") + @PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')") + public CommonResult> getManualAssessment(@Valid ManualModelAnswerBackupPageReqVO pageReqVO) { + return success(modelAssessTaskManualBackupService.getManualAssessment(pageReqVO)); + } + @GetMapping("/gitManualReport") @Operation(summary = "获取模型结果") @PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')")