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

fix：自建台站saveToDB报错

Browse Source
This commit is contained in:
nieziyan 2024-08-05 09:25:01 +08:00
parent 219b644669
commit b7ae380fb1
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -861,6 +861,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
path.append("Spectrum"); path.append("Spectrum");
path.append(StringPool.SLASH+"Xenon"); path.append(StringPool.SLASH+"Xenon");
path.append(StringPool.SLASH+"Spalax"); path.append(StringPool.SLASH+"Spalax");
} else if (systemType.contains("C")) {
path.append("Spectrum");
path.append(StringPool.SLASH+"Xenon");
path.append(StringPool.SLASH+"Self");
} }
if(dataType.contains("SAMPLEPHD")) { if(dataType.contains("SAMPLEPHD")) {
path.append(StringPool.SLASH+"Samplephd"); path.append(StringPool.SLASH+"Samplephd");

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

@ -4984,9 +4984,11 @@ public class SelfStationServiceImpl implements ISelfStationService {
result.error500("sampleFile save failed"); result.error500("sampleFile save failed");
return result; return result;
} }
if (!this.OriginalDataStore(detStruct, detTmpPath, detFilePathName) ){ if (StrUtil.isNotBlank(detFilePathName)){
result.error500("detFile save failed"); if (!this.OriginalDataStore(detStruct, detTmpPath, detFilePathName) ){
return result; result.error500("detFile save failed");
return result;
}
} }
if (StringUtils.isNotBlank(qcFilePathName)) { if (StringUtils.isNotBlank(qcFilePathName)) {
if (!this.OriginalDataStore(qcStruct, qcTmpPath, qcFilePathName) ){ if (!this.OriginalDataStore(qcStruct, qcTmpPath, qcFilePathName) ){