From 7cb6cf4960e58a5628f51626b13c0006800abb89 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 18 Jan 2024 18:59:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E5=88=86?= =?UTF-8?q?=E6=9E=90gamma=E9=83=A8=E5=88=86baseline=EF=BC=8Clc=EF=BC=8Csca?= =?UTF-8?q?c=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=88=B0ftp=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/GammaFileUtil.java | 2 +- .../service/impl/GammaServiceImpl.java | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) 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 42b11a82..e8ab7db3 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 @@ -3269,7 +3269,7 @@ public class GammaFileUtil extends AbstractLogOrReport { middleData.analyses_lc_filePath = qsLcPath; middleData.analyses_scac_filePath = qsScacPath; - middleData.analyses_baseline_absolute_filePath =qsSaveLc; + middleData.analyses_baseline_absolute_filePath =qsSaveBaseLine; middleData.analyses_lc_absolute_filePath=qsSaveLc; middleData.analyses_scac_absolute_filePath=qsSaveScac; middleData.analyses_save_absolute_filePath=spectrumPathProperties.getSaveFilePath()+StringPool.SLASH+qsSaveFile; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index a25d9bd0..d2e08462 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -5085,6 +5085,52 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi if (bRet) { phd.setStatus("R"); //分析成功后存储日志文件和报告文件 + String rootPath = spectrumPathProperties.getRootPath(); + { + String baselinePathName = ftpUtil.getFtpRootPath()+middleData.analyses_baseline_absolute_filePath.substring(0, middleData.analyses_baseline_absolute_filePath.lastIndexOf(StringPool.SLASH)); + String baselineFileName = middleData.analyses_baseline_absolute_filePath.substring(middleData.analyses_baseline_absolute_filePath.lastIndexOf(StringPool.SLASH) + 1); + File baselineFile = new File(rootPath+middleData.analyses_baseline_absolute_filePath); + try { + FileInputStream in = new FileInputStream(baselineFile); + ftpUtil.saveFile(baselinePathName, baselineFileName, in); + } catch (FileNotFoundException e) { + throw new RuntimeException(e); + } finally { + if (Objects.nonNull(baselineFile)) { + baselineFile.delete(); + } + } + } + { + String lcPathName = ftpUtil.getFtpRootPath()+middleData.analyses_lc_absolute_filePath.substring(0, middleData.analyses_lc_absolute_filePath.lastIndexOf(StringPool.SLASH)); + String lcFileName = middleData.analyses_lc_absolute_filePath.substring(middleData.analyses_lc_absolute_filePath.lastIndexOf(StringPool.SLASH) + 1); + File lcFile = new File(rootPath+middleData.analyses_lc_absolute_filePath); + try { + FileInputStream in = new FileInputStream(lcFile); + ftpUtil.saveFile(lcPathName, lcFileName, in); + } catch (FileNotFoundException e) { + throw new RuntimeException(e); + } finally { + if (Objects.nonNull(lcFile)) { + lcFile.delete(); + } + } + } + { + String scacPathName = ftpUtil.getFtpRootPath()+middleData.analyses_scac_absolute_filePath.substring(0, middleData.analyses_scac_absolute_filePath.lastIndexOf(StringPool.SLASH)); + String scacFileName = middleData.analyses_scac_absolute_filePath.substring(middleData.analyses_scac_absolute_filePath.lastIndexOf(StringPool.SLASH) + 1); + File scacFile = new File(rootPath+middleData.analyses_scac_absolute_filePath); + try { + FileInputStream in = new FileInputStream(scacFile); + ftpUtil.saveFile(scacPathName, scacFileName, in); + } catch (FileNotFoundException e) { + throw new RuntimeException(e); + } finally { + if (Objects.nonNull(scacFile)) { + scacFile.delete(); + } + } + } { String logPathName = middleData.analyses_absolute_LogPath.substring(0, middleData.analyses_absolute_LogPath.lastIndexOf(StringPool.SLASH)); String logFileName = middleData.analyses_absolute_LogPath.substring(middleData.analyses_absolute_LogPath.lastIndexOf(StringPool.SLASH)+1);