fix:1.添加undel标记的文件若执行失败不再次复制到undel目录

jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java

@@ -127,7 +127,7 @@ public class UndealHandleManager{
                 final String fileContent = FileUtils.readFileToString(spectrumFile,"UTF-8");
                 //解析文件
                 AbstractSpectrumHandler spectrumHandler = new SamplephdSpectrum();
-                spectrumHandler.init(fileContent,spectrumServiceQuotes);
+                spectrumHandler.init(fileContent,spectrumServiceQuotes,true);
                 final boolean matchResult = spectrumHandler.saveEmailToLocal();
                 if(matchResult){
                     //开始解析

jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java

@@ -44,6 +44,10 @@ public abstract class AbstractSpectrumHandler extends AbstractChain {
      * 能谱文件保存相对路径
      */
     protected String spectrumFileRelativePath;
+    /**
+     * 是否来自于undel目录
+     */
+    protected boolean fromUndel = false;
 
     /**
      * 保存当前能谱文件有哪些#开头的标签
@@ -58,15 +62,25 @@ public abstract class AbstractSpectrumHandler extends AbstractChain {
         this.spectrumServiceQuotes = spectrumServiceQuotes;
     }
 
+    /**
+     * 初始化参数
+     */
+    public void init(String mailContent,SpectrumServiceQuotes spectrumServiceQuotes,boolean fromUndel) throws Exception{
+        this.mailContent = mailContent;
+        this.spectrumServiceQuotes = spectrumServiceQuotes;
+        this.fromUndel = fromUndel;
+    }
+
     /**
      * 初始化参数
      */
     protected void initNext(SpectrumServiceQuotes spectrumServiceQuotes,File spectrumFile,DataType currDataType,
-                            String mailContent){
+                            String mailContent,boolean fromUndel){
         this.spectrumServiceQuotes = spectrumServiceQuotes;
         this.spectrumFile = spectrumFile;
         this.currDataType = currDataType;
         this.mailContent = mailContent;
+        this.fromUndel = fromUndel;
         this.setChina();
     }
 
@@ -169,14 +183,16 @@ public abstract class AbstractSpectrumHandler extends AbstractChain {
      * @throws FileNotFoundException
      */
     protected void handleParseingFailFile() throws FileNotFoundException {
-        try {
+        if(!fromUndel){
-            //解析失败会把文件移动到undeal目录
+            try {
-            final String rootPath = spectrumServiceQuotes.getSpectrumPathProperties().getRootPath();
+                //解析失败会把文件移动到undeal目录
-            final String undealPath = spectrumServiceQuotes.getSpectrumPathProperties().getUndealPath();
+                final String rootPath = spectrumServiceQuotes.getSpectrumPathProperties().getRootPath();
-            final String finalPath = rootPath+File.separator+undealPath;
+                final String undealPath = spectrumServiceQuotes.getSpectrumPathProperties().getUndealPath();
-            FileOperation.copyFile(spectrumFile,finalPath,true);
+                final String finalPath = rootPath+File.separator+undealPath;
-        } catch (IOException ex) {
+                FileOperation.copyFile(spectrumFile,finalPath,true);
-            ex.printStackTrace();
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
         }
     }
 

jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java

@@ -47,7 +47,7 @@ public class AlertSpectrum extends AbstractSpectrumHandler{
     protected void setChina() {
         AbstractSpectrumHandler spectrumHandler = new HealthStatusSpectrum();
         spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,
-                super.currDataType,super.mailContent);
+                super.currDataType,super.mailContent,super.fromUndel);
         spectrumHandler.setPrevious(this);
         super.setNext(spectrumHandler);
     }

jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java

@@ -16,7 +16,7 @@ public class DetbkphdSpectrum extends AbstractS_D_Q_G_SpectrumHandler {
     protected void setChina() {
         AbstractSpectrumHandler spectrumHandler = new QcphdSpectrum();
         spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,
-                super.currDataType,super.mailContent);
+                super.currDataType,super.mailContent,super.fromUndel);
         spectrumHandler.setPrevious(this);
         super.setNext(spectrumHandler);
     }

jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java

@@ -18,7 +18,7 @@ public class GasbkphdSpectrum extends AbstractS_D_Q_G_SpectrumHandler {
     protected void setChina() {
         AbstractSpectrumHandler spectrumHandler = new MetSpectrum();
         spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,
-                super.currDataType,super.mailContent);
+                super.currDataType,super.mailContent,super.fromUndel);
         spectrumHandler.setPrevious(this);
         super.setNext(spectrumHandler);
     }

jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java

@@ -43,7 +43,7 @@ public class MetSpectrum extends AbstractSpectrumHandler{
     protected void setChina() {
         AbstractSpectrumHandler spectrumHandler = new AlertSpectrum();
         spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,
-                super.currDataType,super.mailContent);
+                super.currDataType,super.mailContent,super.fromUndel);
         spectrumHandler.setPrevious(this);
         super.setNext(spectrumHandler);
     }

jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java

@@ -16,7 +16,7 @@ public class QcphdSpectrum extends AbstractS_D_Q_G_SpectrumHandler {
     protected void setChina() {
         AbstractSpectrumHandler spectrumHandler = new GasbkphdSpectrum();
         spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,
-                super.currDataType,super.mailContent);
+                super.currDataType,super.mailContent,super.fromUndel);
         spectrumHandler.setPrevious(this);
         super.setNext(spectrumHandler);
     }

jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java

@@ -17,7 +17,7 @@ public class SamplephdSpectrum extends AbstractS_D_Q_G_SpectrumHandler {
     protected void setChina() {
         AbstractSpectrumHandler spectrumHandler = new DetbkphdSpectrum();
         spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,
-                super.currDataType,super.mailContent);
+                super.currDataType,super.mailContent,super.fromUndel);
         spectrumHandler.setPrevious(this);
         super.setNext(spectrumHandler);
     }