From 758bd27f27465b705621d64b9daaf119d439363d Mon Sep 17 00:00:00 2001 From: panbaolin <123456> Date: Wed, 25 Oct 2023 16:05:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:1.=E6=B7=BB=E5=8A=A0=E8=8B=A5=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=9D=A5=E8=87=AA=E4=BA=8Eundel=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=A7=A3=E6=9E=90=E6=88=90=E5=8A=9F=E5=88=99?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractS_D_Q_G_SpectrumHandler.java | 1 + .../spectrum/AbstractSpectrumHandler.java | 18 ++++++++++++++++++ .../jeecg/modules/spectrum/AlertSpectrum.java | 4 ++-- .../modules/spectrum/DetbkphdSpectrum.java | 2 ++ .../modules/spectrum/GasbkphdSpectrum.java | 2 ++ .../modules/spectrum/HealthStatusSpectrum.java | 4 ++-- .../jeecg/modules/spectrum/MetSpectrum.java | 4 ++-- .../jeecg/modules/spectrum/QcphdSpectrum.java | 2 ++ .../modules/spectrum/SamplephdSpectrum.java | 2 ++ 9 files changed, 33 insertions(+), 6 deletions(-) diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java index 87b8601c..f9daa734 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java @@ -195,6 +195,7 @@ public abstract class AbstractS_D_Q_G_SpectrumHandler extends AbstractSpectrumHa * 修改解析状态 */ protected void updateStatus(){ + //这里要加非空判断，若台站或探测器不存在，这时所有数据还都没有入库sampleData还为null，不需要修改状态 if(Objects.nonNull(this.sampleData)){ this.spectrumServiceQuotes.getSampleDataService().updateStatus(this.status,this.sampleData.getInputFileName()); } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java index 7d172b3d..c485d87a 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java @@ -197,6 +197,24 @@ public abstract class AbstractSpectrumHandler extends AbstractChain { } } + /** + * 若文件件来自于undel并且解析成功后则需要把undel目录里文件删除 + */ + protected void deleteIfFromUndelFile(){ + if(fromUndel){ + StringBuilder undealFilePath = new StringBuilder(); + undealFilePath.append(spectrumServiceQuotes.getSpectrumPathProperties().getRootPath()); + undealFilePath.append(File.separator); + undealFilePath.append(spectrumServiceQuotes.getSpectrumPathProperties().getUndealPath()); + undealFilePath.append(File.separator); + undealFilePath.append(this.spectrumFile.getName()); + File undelFile = new File(undealFilePath.toString()); + if(undelFile.exists()){ + undelFile.delete(); + } + } + } + /** * 删除本地临时文件 */ diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java index 119c16a6..712e3acd 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java @@ -70,8 +70,8 @@ public class AlertSpectrum extends AbstractSpectrumHandler{ super.saveFileToSavefile(); //结构体数据入库 this.handlerOriginalData(); - //删除本地临时文件 - super.deleteLocalTemporaryFile(); + //若本次文件来自于undel目录，解析成功则删除 + deleteIfFromUndelFile(); }catch (Exception e){ throw e; }finally { diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java index ee625fc8..56f86467 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java @@ -45,6 +45,8 @@ public class DetbkphdSpectrum extends AbstractS_D_Q_G_SpectrumHandler { //修改状态为解析完成 super.status = SampleStatus.COMPLETE.getValue(); super.updateStatus(); + //若本次文件来自于undel目录，解析成功则删除 + deleteIfFromUndelFile(); }catch (Exception e){ //修改状态为解析失败 super.status = SampleStatus.FAIL.getValue(); diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java index 10e50df2..19e8506f 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java @@ -47,6 +47,8 @@ public class GasbkphdSpectrum extends AbstractS_D_Q_G_SpectrumHandler { //修改状态为解析完成 super.status = SampleStatus.COMPLETE.getValue(); super.updateStatus(); + //若本次文件来自于undel目录，解析成功则删除 + deleteIfFromUndelFile(); }catch (Exception e){ //修改状态为解析失败 super.status = SampleStatus.FAIL.getValue(); diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java index 8a67f5d8..fb554287 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java @@ -67,10 +67,10 @@ public class HealthStatusSpectrum extends AbstractSpectrumHandler{ super.saveFileToSavefile(); //结构体数据入库 this.handlerOriginalData(); - //删除本地临时文件 - super.deleteLocalTemporaryFile(); //把流程日志保存到日志目录 this.saveLogToLogDir(); + //若本次文件来自于undel目录，解析成功则删除 + deleteIfFromUndelFile(); } } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java index 5b73b265..b243a61a 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java @@ -62,10 +62,10 @@ public class MetSpectrum extends AbstractSpectrumHandler{ super.saveFileToSavefile(); //结构体数据入库 this.handlerOriginalData(); - //删除本地临时文件 - super.deleteLocalTemporaryFile(); //把流程日志保存到日志目录 this.saveLogToLogDir(); + //若本次文件来自于undel目录，解析成功则删除 + deleteIfFromUndelFile(); }else{ super.next.handler(); } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java index bed64933..ef489640 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java @@ -46,6 +46,8 @@ public class QcphdSpectrum extends AbstractS_D_Q_G_SpectrumHandler { //修改状态为解析完成 super.status = SampleStatus.COMPLETE.getValue(); super.updateStatus(); + //若本次文件来自于undel目录，解析成功则删除 + deleteIfFromUndelFile(); }catch (Exception e){ //修改状态为解析失败 super.status = SampleStatus.FAIL.getValue(); diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java index 66316846..d4e4f086 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java @@ -49,6 +49,8 @@ public class SamplephdSpectrum extends AbstractS_D_Q_G_SpectrumHandler { //修改状态为解析完成 super.status = SampleStatus.COMPLETE.getValue(); super.updateStatus(); + //若本次文件来自于undel目录，解析成功则删除 + deleteIfFromUndelFile(); }catch (Exception e){ //修改状态为解析失败 super.status = SampleStatus.FAIL.getValue();