From 27d22a8173059880dbf6f06b7052158c4b6c87cf Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 15 Nov 2023 19:00:42 +0800 Subject: [PATCH] =?UTF-8?q?gamma=E5=8A=9F=E8=83=BD=E5=8A=A0=E8=BD=BDlc?= =?UTF-8?q?=EF=BC=8Cscac=EF=BC=8Cbaseline=E6=96=87=E4=BB=B6=E5=88=A4?= =?UTF-8?q?=E7=A9=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/GammaFileUtil.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java index 1d9d2d33..7254a3d3 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -253,30 +253,32 @@ public class GammaFileUtil extends AbstractLogOrReport { String lcFileName = prefixName+"_"+subFileName + ".lc"; String fromPathLc = pathName + StringPool.SLASH + lcFileName; lcFile = ftpUtil.downloadFile(fromPathLc, "betaGamma"); - - List readLinesLc = FileUtils.readLines(lcFile, "UTF-8"); - //得到行数据处理后的数据结果 - List vDataLc = ReadLcScacInfo(readLinesLc); - //将数据结果赋值给 phdFile的vLc - phd.setVLc(vDataLc); - + if (Objects.nonNull(lcFile)) { + List readLinesLc = FileUtils.readLines(lcFile, "UTF-8"); + //得到行数据处理后的数据结果 + List vDataLc = ReadLcScacInfo(readLinesLc); + //将数据结果赋值给 phdFile的vLc + phd.setVLc(vDataLc); + } String scacFileName = prefixName+"_"+subFileName + ".scac"; String fromPathScac = pathName + StringPool.SLASH + scacFileName; scacFile = ftpUtil.downloadFile(fromPathScac, "betaGamma"); - - List readLinesScac = FileUtils.readLines(scacFile, "UTF-8"); - //得到行数据处理后的数据结果 - List vDataScac = ReadLcScacInfo(readLinesScac); - //将数据结果赋值给 phdFile的vLc - phd.setVScac(vDataScac); - + if (Objects.nonNull(scacFile)) { + List readLinesScac = FileUtils.readLines(scacFile, "UTF-8"); + //得到行数据处理后的数据结果 + List vDataScac = ReadLcScacInfo(readLinesScac); + //将数据结果赋值给 phdFile的vLc + phd.setVScac(vDataScac); + } String baselineFileName = prefixName+"_"+subFileName + ".baseline"; String fromPathBase = pathName + StringPool.SLASH + baselineFileName; inputStreamBase = ftpUtil.downloadFileStream(fromPathBase); - // 调用处理BaseCtrl的方法 - ReadBaseCtrlInfo(phd, inputStreamBase); - // 将phdFile的BaseCtrls的BaseLine部分数据 赋值给 phdFile的vBase - phd.setVBase(phd.getBaseCtrls().getBaseline()); + if (Objects.nonNull(inputStreamBase)) { + // 调用处理BaseCtrl的方法 + ReadBaseCtrlInfo(phd, inputStreamBase); + // 将phdFile的BaseCtrls的BaseLine部分数据 赋值给 phdFile的vBase + phd.setVBase(phd.getBaseCtrls().getBaseline()); + } }catch (IOException e){ e.printStackTrace(); } finally {