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 'origin/master'

Browse Source
This commit is contained in:
limin 2025-01-03 14:59:00 +08:00
commit 27e5f23879
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskauto/vo/ModelAssessTaskAutoRespVO.java
View File

@ -33,6 +33,9 @@ public class ModelAssessTaskAutoRespVO {
@ExcelProperty("模型服务")
private Long modelService;
@Schema(description = "模型类型（0普通，1官方）")
private Integer modelType;
@Schema(description = "数据集")
@ExcelProperty("数据集")
private Long dataset;
@ -56,4 +59,4 @@ public class ModelAssessTaskAutoRespVO {
@Schema(description = "数据集名称")
private String datasetName;
}
}

33
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java
View File

@ -1,11 +1,13 @@
package cn.iocoder.yudao.module.llm.service.modelassesstaskauto;
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskManualRespVO;
import cn.iocoder.yudao.module.llm.dal.dataobject.basemodel.BaseModelDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.dataset.DatasetDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassessstoplist.ModelAssessStoplistDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskauto.ModelAssessTaskStoplistDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskManualDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO;
import cn.iocoder.yudao.module.llm.dal.mysql.basemodel.BaseModelMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.dataset.DatasetMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.modelassessstoplist.ModelAssessStoplistMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskauto.ModelAssessTaskStoplistMapper;
@ -52,6 +54,8 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic
private DatasetMapper datasetMapper;
@Resource
private ModelAssessStoplistMapper modelAssessStoplistMapper;
@Resource
private BaseModelMapper baseModelMapper;
@Override
@ -166,17 +170,36 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic
PageResult<ModelAssessTaskAutoDO> modelAssessTaskAutoDOPageResult = modelAssessTaskAutoMapper.selectPage(pageReqVO);
PageResult<ModelAssessTaskAutoRespVO> result = BeanUtils.toBean(modelAssessTaskAutoDOPageResult, ModelAssessTaskAutoRespVO.class);
if (CollectionUtils.isNotEmpty(result.getList())){
List<Long> serviceIds = modelAssessTaskAutoDOPageResult.getList().stream().map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList());
// 我的模型获取校验
List<Long> serviceIds = modelAssessTaskAutoDOPageResult.getList().stream().
filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 0)
.map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList());
LambdaQueryWrapper<ModelServiceDO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ModelServiceDO::getId,serviceIds);
List<ModelServiceDO> modelServiceDOS = modelServiceMapper.selectList(wrapper);
Map<Long, ModelServiceDO> longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
result.getList().stream().forEach(modelAssessTaskAutoRespVO -> {
ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskAutoRespVO.getModelService());
if(modelServiceDO != null){
modelAssessTaskAutoRespVO.setModelServiceName(modelServiceDO.getServiceName());
// 人工模型获取校验
List<Long> serviceForeseeIds = modelAssessTaskAutoDOPageResult.getList().stream().
filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 1)
.map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList());
List<BaseModelDO> 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 -> {
if (modelAssessTaskManualRespVO.getModelType() == 0){
ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskManualRespVO.getModelService());
if(modelServiceDO != null){
modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName());
}
}else {
BaseModelDO baseModelDO = serviceForeseeMaps.get(modelAssessTaskManualRespVO.getModelService());
if(baseModelDO != null){
modelAssessTaskManualRespVO.setModelServiceName(baseModelDO.getModelName());
}
}
});
}
return result;