diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml index 6aa8fd02..d9203460 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml @@ -938,7 +938,9 @@ #{gardsAnalyses.usedgasphd}, #{gardsAnalyses.useddetphd}, #{gardsAnalyses.usedgasphdId}, - #{gardsAnalyses.useddetphdId}) + #{gardsAnalyses.useddetphdId}, + #{gardsAnalyses.logPath}, + #{gardsAnalyses.reportPath}) 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 38e12df8..6f5fee84 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 @@ -82,6 +82,8 @@ public class SelfStationServiceImpl implements ISelfStationService { selfStationData.setDetTmpPath(detFilePath); } } + } else { + selfStationUtil.loadFile(selfStationData, null, null, map); } //将自建台站的数据封装到缓存对象中 selfCache.put(sampleFileName + StringPool.DASH + userName, selfStationData);