修改评估任务 返回信息

This commit is contained in:
limin 2025-01-03 10:35:52 +08:00
parent 56ba7d3580
commit a04b7a9fce
2 changed files with 29 additions and 3 deletions

View File

@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
@Schema(description = "管理后台 - 人工评估标注 Request VO")
@ -73,6 +74,9 @@ public class ManualAssessmentPageRespVO {
@Schema(description = "模型回答答案")
private String modelAnswer;
@Schema(description = "人工评估信息返回")
private List<ManualModelAnnoRespVO> reqRespVos;
/* @Schema(description = "人工评估信息返回")
private List<ManualModelAnnoRespVO> reqRespVos;*/
@Schema(description = "人工评估信息ListMap返回")
private List<HashMap<String, Object>> reqRespVos;
}

View File

@ -7,12 +7,14 @@ import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.manual
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.ManualAssessmentPageRespVO;
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskDimensionRespVO;
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskManualPageReqVO;
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskManualRespVO;
import cn.iocoder.yudao.module.llm.dal.dataobject.dataset.DatasetAnswerDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.dataset.DatasetQuestionDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ManualModelAnnoDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ManualModelAnswerDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO;
import cn.iocoder.yudao.module.llm.dal.mysql.dataset.DatasetAnswerMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.dataset.DatasetQuestionMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.*;
@ -29,7 +31,9 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.llm.enums.ErrorCodeConstants.*;
@ -81,7 +85,25 @@ public class ManualModelAnswerServiceImpl implements ManualModelAnswerService {
resp.setModelAnswer(modelAnswerDO.getModelAnswer());
List<ManualModelAnnoDO> manualModelAnnoDOS = manualModelAnnoMapper.selectList(new LambdaQueryWrapper<>(ManualModelAnnoDO.class)
.eq(ManualModelAnnoDO::getModelAnswerId, modelAnswerDO.getId()));
resp.setReqRespVos(BeanUtils.toBean(manualModelAnnoDOS, ManualModelAnnoRespVO.class));
List<ModelAssessTaskDimensionRespVO> dimensions = resp.getDimensions();
Map<Long, ManualModelAnnoDO> longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(manualModelAnnoDOS, ManualModelAnnoDO::getDimensionId);
if (!CollectionUtils.isAnyEmpty(dimensions)){
List<HashMap<String, Object>> annoList= new ArrayList<>();
dimensions.forEach(dimension -> {
HashMap<String, Object> map = new HashMap<>();
if (longModelServiceDOMap.containsKey(dimension.getDimensionId())){
map.put("label",dimension.getDimensionName());
map.put("score",longModelServiceDOMap.get(dimension.getDimensionId()).getScore());
annoList.add(map);
}else {
map.put("label",dimension.getDimensionName());
map.put("score",0);
annoList.add(map);
}
});
resp.setReqRespVos(annoList);
}
res.add(resp);
});
}