diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java index f9674f6a2..4c23a6b44 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java @@ -174,33 +174,39 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic List serviceIds = modelAssessTaskAutoDOPageResult.getList().stream(). filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 0) .map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList()); + Map longModelServiceDOMap = null; + if (!CollectionUtils.isEmpty(serviceIds)){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(ModelServiceDO::getId,serviceIds); List modelServiceDOS = modelServiceMapper.selectList(wrapper); - Map longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection. + longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection. CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId); + } // 人工模型获取校验 List serviceForeseeIds = modelAssessTaskAutoDOPageResult.getList().stream(). filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 1) .map(ModelAssessTaskAutoDO::getModelService).collect(Collectors.toList()); - List 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 -> { - if (modelAssessTaskManualRespVO.getModelType() == 0){ + Map serviceForeseeMaps = null; + if (!CollectionUtils.isEmpty(serviceForeseeIds)) { + List baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper() + .in(BaseModelDO::getId, serviceForeseeIds)); + serviceForeseeMaps = cn.iocoder.yudao.framework.common.util.collection. + CollectionUtils.convertMap(baseModelDOS, BaseModelDO::getId); + } + for (ModelAssessTaskAutoRespVO modelAssessTaskManualRespVO : result.getList()){ + if (modelAssessTaskManualRespVO.getModelType() == 0 && longModelServiceDOMap != null){ ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskManualRespVO.getModelService()); if(modelServiceDO != null){ modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName()); } - }else { + }else if (modelAssessTaskManualRespVO.getModelType() == 1 && serviceForeseeMaps != null){ BaseModelDO baseModelDO = serviceForeseeMaps.get(modelAssessTaskManualRespVO.getModelService()); if(baseModelDO != null){ modelAssessTaskManualRespVO.setModelServiceName(baseModelDO.getModelName()); } } - }); + } } return result; }