DATA_MIDDLE_PLATFORM/Data_Middle_Platform_Server
3
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'xnjz/master'

Browse Source
This commit is contained in:
zhangtao 2025-01-05 17:10:07 +08:00
commit eca575b743
8 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ManualAssessmentPageRespVO.java
View File

@ -71,8 +71,6 @@ public class ManualAssessmentPageRespVO {
@ExcelIgnore
private List<HashMap<String, Object>> reqRespVos;
@Schema(description = "评估报告专用")
private HashMap<String ,Object> reportMap;
@Schema(description = "系统信息")
private String system;

16
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/ModelAssessTaskManualBackupController.java
View File

@ -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,21 @@ public class ModelAssessTaskManualBackupController {
return success(manualEvaluationReportRespVOS);
}
@GetMapping("/getManualAssessment")
@Operation(summary = "获取模型结果")
@PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')")
public CommonResult<PageResult<ManualAssessmentPageRespVO>> getManualAssessment(@Valid ManualModelAnswerBackupPageReqVO pageReqVO) {
return success(modelAssessTaskManualBackupService.getManualAssessment(pageReqVO));
}
@GetMapping("/gitManualReport")
@Operation(summary = "获取模型结果")
@PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')")
public CommonResult<List<String>> queryTheEvaluationType(@Valid ManualModelAnswerPageReqVO pageReqVO) {
List<String> evaluationTypeList = modelAssessTaskManualBackupService.queryTheEvaluationType(pageReqVO);
return success(evaluationTypeList);
}
}

4
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java
View File

@ -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);

9
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ManualModelAnswerServiceImpl.java
View File

@ -91,14 +91,6 @@ public class ManualModelAnswerServiceImpl implements ManualModelAnswerService {
resp.setManalTaskId(modelAnswerDO.getManalTaskId());
if (!CollectionUtils.isAnyEmpty(modelAnswerDO.getReqRespVos())){
resp.setReqRespVos(modelAnswerDO.getReqRespVos());
// 将map 转换成 map<String,Object>给评估报告专用
HashMap<String, Object> 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<HashMap<String, Object>> 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);

14
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualServiceImpl.java
View File

@ -207,16 +207,22 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe
List<Long> serviceMyIds = modelAssessTaskManualDOPageResult.getList().stream().
filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 0)
.map(ModelAssessTaskManualDO::getModelService).collect(Collectors.toList());
List<ModelServiceDO> modelServiceDOS = modelServiceMapper.selectList(new LambdaQueryWrapper<ModelServiceDO>()
.in(ModelServiceDO::getId,serviceMyIds));
List<ModelServiceDO> modelServiceDOS = new ArrayList<>();
if (CollectionUtils.isNotEmpty(serviceMyIds)) {
modelServiceDOS = modelServiceMapper.selectList(new LambdaQueryWrapper<ModelServiceDO>()
.in(ModelServiceDO::getId, serviceMyIds));
}
Map<Long, ModelServiceDO> serviceMyMaps = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
// 人工模型获取校验
List<Long> serviceForeseeIds = modelAssessTaskManualDOPageResult.getList().stream().
filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 1)
.map(ModelAssessTaskManualDO::getModelService).collect(Collectors.toList());
List<BaseModelDO> baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper<BaseModelDO>()
.in(BaseModelDO::getId, serviceForeseeIds));
List<BaseModelDO> baseModelDOS = new ArrayList<>();
if (CollectionUtils.isNotEmpty(serviceForeseeIds)) {
baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper<BaseModelDO>()
.in(BaseModelDO::getId, serviceForeseeIds));
}
Map<Long, BaseModelDO> serviceForeseeMaps = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(baseModelDOS, BaseModelDO::getId);
result.getList().stream().forEach(modelAssessTaskManualRespVO -> {

1
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupService.java
View File

@ -75,5 +75,6 @@ public interface ModelAssessTaskManualBackupService {
// 备份导出列表查询
PageResult<ManualAssessmentPageRespVO> getManualAssessment(ManualModelAnswerBackupPageReqVO pageReqVO);
List<String> queryTheEvaluationType(ManualModelAnswerPageReqVO pageReqVO);
}

12
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupServiceImpl.java
View File

@ -413,5 +413,17 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa
result.setTotal(modelAnswerDOPageResult.getTotal());
return result;
}
@Override
public List<String> queryTheEvaluationType(ManualModelAnswerPageReqVO pageReqVO) {
LambdaQueryWrapper<ManualModelAnswerBackupDO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ManualModelAnswerBackupDO::getManalTaskId,pageReqVO.getManalTaskId())
.eq(ManualModelAnswerBackupDO::getStatus,2)
.isNotNull(ManualModelAnswerBackupDO::getReqRespVos);
List<ManualModelAnswerBackupDO> manualModelAnswerDOS = manualModelAnswerBackupMapper.selectList(wrapper);
List<LabelInformationVO> bean = BeanUtils.toBean(manualModelAnswerDOS.get(0).getReqRespVos(), LabelInformationVO.class);
List<String> collect = bean.stream().map(LabelInformationVO::getLabel).collect(Collectors.toList());
return collect;
}
}

5
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java
View File

@ -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);*/
}