diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java index c41eb697..2e365471 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java @@ -4889,19 +4889,19 @@ public class SelfStationServiceImpl implements ISelfStationService { String path3 = savePathName + StrUtil.SLASH + phdFile3.getFilename(); String path4 = savePathName + StrUtil.SLASH + phdFile4.getFilename(); List phdFilePaths = ListUtil.toList(path1, path2, path3, path4); - //读取参数内容 - Map mdcInfoMap1 = phdFile1.getMdcInfoMap(); - Map mdcInfoMap2 = phdFile1.getMdcInfoMap(); - Map mdcInfoMap3 = phdFile1.getMdcInfoMap(); - Map mdcInfoMap4 = phdFile1.getMdcInfoMap(); - List> mdcInfoMaps = ListUtil.toList(mdcInfoMap1, mdcInfoMap2, - mdcInfoMap3, mdcInfoMap4); bRet = gammaFileUtil.GetInterMiddlData(phdFiles, userName, middleDatas, "save"); if (!bRet) { result.error500("Transform PHDFile into structGStoreMiddleProcessData failed."); return result; } + // 读取参数内容 + Map mdcInfoMap1 = phdFile1.getMdcInfoMap(); + Map mdcInfoMap2 = phdFile2.getMdcInfoMap(); + Map mdcInfoMap3 = phdFile3.getMdcInfoMap(); + Map mdcInfoMap4 = phdFile4.getMdcInfoMap(); + List> mdcInfoMaps = ListUtil.toList(mdcInfoMap1, mdcInfoMap2, + mdcInfoMap3, mdcInfoMap4); // 根据文件名称查询对应的sampleId 如果存在则赋值sampleId, Status 如果不存在则先存储数据信息到sampleData PHDFile phd = new PHDFile(); BeanUtils.copyProperties(phdFiles.get(0), phd);