xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: xiaoguangbin:0aeb76d959ffd64fe2289e76fa57c6603fd16e31
Branches Tags
xiaoguangbin:mdc
xiaoguangbin:SelfStation
xiaoguangbin:SelfStation-pgsql
xiaoguangbin:SelfStation-testdll
xiaoguangbin:mdc-merge
xiaoguangbin:sleepDownload
xiaoguangbin:noFtp-seflStation
xiaoguangbin:noFtp
xiaoguangbin:noFtp-F
xiaoguangbin:onlyDownload
xiaoguangbin:master
..
compare: xiaoguangbin:135f4ebd21e2b44ef3f408674c016588cfe8c938
Branches Tags
xiaoguangbin:SelfStation
xiaoguangbin:mdc
xiaoguangbin:SelfStation-pgsql
xiaoguangbin:SelfStation-testdll
xiaoguangbin:mdc-merge
xiaoguangbin:sleepDownload
xiaoguangbin:noFtp-seflStation
xiaoguangbin:noFtp
xiaoguangbin:noFtp-F
xiaoguangbin:onlyDownload
xiaoguangbin:master

No commits in common. "0aeb76d959ffd64fe2289e76fa57c6603fd16e31" and "135f4ebd21e2b44ef3f408674c016588cfe8c938" have entirely different histories.
0aeb76d959 ... 135f4ebd21

2 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
View File

@ -312,7 +312,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
betaDataFile.setDetGammaEnergyList(gammaEnergyList); betaDataFile.setDetGammaEnergyList(gammaEnergyList);
betaDataFile.setDetBetaOriginalSeriseData(betaOriginalSeriseData); betaDataFile.setDetBetaOriginalSeriseData(betaOriginalSeriseData);
betaDataFile.setDetBetaProjectedSeriseData(betaProjectedSeriseData); betaDataFile.setDetBetaProjectedSeriseData(betaProjectedSeriseData);
betaDataFile.setDetBetaEnergyList(betaEnergyList); betaDataFile.setSampleBetaEnergyList(betaEnergyList);
} else if (type.equalsIgnoreCase("qc")) { } else if (type.equalsIgnoreCase("qc")) {
betaDataFile.setQcSpectrumData(spectrumData); betaDataFile.setQcSpectrumData(spectrumData);
betaDataFile.setQcBoundary(boundaryList); betaDataFile.setQcBoundary(boundaryList);

1
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
View File

@ -194,7 +194,6 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
String[] names = name.split(comma); String[] names = name.split(comma);
ftpFiles = ftpFiles.stream() ftpFiles = ftpFiles.stream()
.filter(file -> containsAllIgnoreCase(file.getName(),names)) .filter(file -> containsAllIgnoreCase(file.getName(),names))
.filter(file -> !StrUtil.contains(file.getName(), "_ROI_"))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
for (File ftpFile : ftpFiles) { for (File ftpFile : ftpFiles) {