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

gamma功能加载lc，scac，baseline文件判空问题修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-11-15 19:00:42 +08:00
parent 6e7b3f8e01
commit 27d22a8173
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -253,30 +253,32 @@ public class GammaFileUtil extends AbstractLogOrReport {
String lcFileName = prefixName+"_"+subFileName + ".lc"; String lcFileName = prefixName+"_"+subFileName + ".lc";
String fromPathLc = pathName + StringPool.SLASH + lcFileName; String fromPathLc = pathName + StringPool.SLASH + lcFileName;
lcFile = ftpUtil.downloadFile(fromPathLc, "betaGamma"); lcFile = ftpUtil.downloadFile(fromPathLc, "betaGamma");
if (Objects.nonNull(lcFile)) {
List<String> readLinesLc = FileUtils.readLines(lcFile, "UTF-8"); List<String> readLinesLc = FileUtils.readLines(lcFile, "UTF-8");
//得到行数据处理后的数据结果 //得到行数据处理后的数据结果
List<Double> vDataLc = ReadLcScacInfo(readLinesLc); List<Double> vDataLc = ReadLcScacInfo(readLinesLc);
//将数据结果赋值给 phdFile的vLc //将数据结果赋值给 phdFile的vLc
phd.setVLc(vDataLc); phd.setVLc(vDataLc);
}
String scacFileName = prefixName+"_"+subFileName + ".scac"; String scacFileName = prefixName+"_"+subFileName + ".scac";
String fromPathScac = pathName + StringPool.SLASH + scacFileName; String fromPathScac = pathName + StringPool.SLASH + scacFileName;
scacFile = ftpUtil.downloadFile(fromPathScac, "betaGamma"); scacFile = ftpUtil.downloadFile(fromPathScac, "betaGamma");
if (Objects.nonNull(scacFile)) {
List<String> readLinesScac = FileUtils.readLines(scacFile, "UTF-8"); List<String> readLinesScac = FileUtils.readLines(scacFile, "UTF-8");
//得到行数据处理后的数据结果 //得到行数据处理后的数据结果
List<Double> vDataScac = ReadLcScacInfo(readLinesScac); List<Double> vDataScac = ReadLcScacInfo(readLinesScac);
//将数据结果赋值给 phdFile的vLc //将数据结果赋值给 phdFile的vLc
phd.setVScac(vDataScac); phd.setVScac(vDataScac);
}
String baselineFileName = prefixName+"_"+subFileName + ".baseline"; String baselineFileName = prefixName+"_"+subFileName + ".baseline";
String fromPathBase = pathName + StringPool.SLASH + baselineFileName; String fromPathBase = pathName + StringPool.SLASH + baselineFileName;
inputStreamBase = ftpUtil.downloadFileStream(fromPathBase); inputStreamBase = ftpUtil.downloadFileStream(fromPathBase);
// 调用处理BaseCtrl的方法 if (Objects.nonNull(inputStreamBase)) {
ReadBaseCtrlInfo(phd, inputStreamBase); // 调用处理BaseCtrl的方法
// 将phdFile的BaseCtrls的BaseLine部分数据 赋值给 phdFile的vBase ReadBaseCtrlInfo(phd, inputStreamBase);
phd.setVBase(phd.getBaseCtrls().getBaseline()); // 将phdFile的BaseCtrls的BaseLine部分数据 赋值给 phdFile的vBase
phd.setVBase(phd.getBaseCtrls().getBaseline());
}
}catch (IOException e){ }catch (IOException e){
e.printStackTrace(); e.printStackTrace();
} finally { } finally {