From 8d7bee473509c792e15bf6c560099475d7c45441 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 15 Mar 2024 11:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BF=9D=E5=AD=98=E6=96=87=E4=BB=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?,=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84\=E6=94=B9=E4=B8=BA/?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=EF=BC=8C=E9=81=BF=E5=85=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=A2=AB=E8=A6=86=E7=9B=96=E4=B8=BA0KB=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecg/common/util/GammaFileUtil.java | 2 +- .../modules/service/impl/SpectrumAnalysisServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 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 0d77da9e..97b7889c 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 @@ -3232,7 +3232,7 @@ public class GammaFileUtil extends AbstractLogOrReport { sampleTmp = new File(fileAnlyse.getTmpFilePath()); //sample文件的存储路径 String saveSamplePath = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + middleData.analyses_save_filePath; - if (Objects.nonNull(sampleTmp) && !saveSamplePath.equals(fileAnlyse.getTmpFilePath())) { + if (Objects.nonNull(sampleTmp) && !saveSamplePath.equals(fileAnlyse.getTmpFilePath().replace(StringPool.BACK_SLASH, StringPool.SLASH))) { bRet = ftpUtil.saveFile(saveSamplePath, new FileInputStream(sampleTmp)); } } catch (FileNotFoundException e) { diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index c32d3aa3..b34dfe34 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -4278,7 +4278,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements if (StringUtils.isNotBlank(sampleFilePathName)) { //sample文件的saveFile存储路径 String saveSamplePath = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + sampleFilePathName; - if (StringUtils.isNotBlank(betaDataFile.getSampleTmpPath()) && !saveSamplePath.equals(betaDataFile.getSampleTmpPath())) { + if (StringUtils.isNotBlank(betaDataFile.getSampleTmpPath()) && !saveSamplePath.equals(betaDataFile.getSampleTmpPath().replace(StringPool.BACK_SLASH, StringPool.SLASH))) { File sampleTmp = new File(betaDataFile.getSampleTmpPath()); ftpUtil.saveFile(saveSamplePath, new FileInputStream(sampleTmp)); } @@ -4286,7 +4286,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements if (StringUtils.isNotBlank(gasFilePathName)) { //gas文件的saveFile存储路径 String saveGasPath = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + gasFilePathName; - if (StringUtils.isNotBlank(betaDataFile.getGasTmpPath()) && !saveGasPath.equals(betaDataFile.getGasTmpPath())) { + if (StringUtils.isNotBlank(betaDataFile.getGasTmpPath()) && !saveGasPath.equals(betaDataFile.getGasTmpPath().replace(StringPool.BACK_SLASH, StringPool.SLASH))) { File gasTmp = new File(betaDataFile.getGasTmpPath()); ftpUtil.saveFile(saveGasPath, new FileInputStream(gasTmp)); } @@ -4294,7 +4294,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements if (StringUtils.isNotBlank(detFilePathName)) { //det文件的saveFile存储路径 String saveDetPath = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + detFilePathName; - if (StringUtils.isNotBlank(betaDataFile.getDetTmpPath()) && !saveDetPath.equals(betaDataFile.getDetTmpPath())) { + if (StringUtils.isNotBlank(betaDataFile.getDetTmpPath()) && !saveDetPath.equals(betaDataFile.getDetTmpPath().replace(StringPool.BACK_SLASH, StringPool.SLASH))) { File detTmp = new File(betaDataFile.getDetTmpPath()); ftpUtil.saveFile(saveDetPath, new FileInputStream(detTmp)); } @@ -4302,7 +4302,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements if (StringUtils.isNotBlank(qcFilePathName)) { //qc文件的saveFile存储路径 String saveQcPath = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + qcFilePathName; - if (StringUtils.isNotBlank(betaDataFile.getQcTmpPath()) && !saveQcPath.equals(betaDataFile.getQcTmpPath())) { + if (StringUtils.isNotBlank(betaDataFile.getQcTmpPath()) && !saveQcPath.equals(betaDataFile.getQcTmpPath().replace(StringPool.BACK_SLASH, StringPool.SLASH))) { File qcTmp = new File(betaDataFile.getQcTmpPath()); ftpUtil.saveFile(saveQcPath, new FileInputStream(qcTmp)); }