From 82f69d9e7a44e75368f72b7f3102c54fa822b72d Mon Sep 17 00:00:00 2001 From: panbaolin <123456> Date: Mon, 8 Jan 2024 14:31:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:1.=E4=BF=AE=E6=94=B9=E4=BB=8E=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E6=9D=A5=E7=9A=84=E9=82=AE=E4=BB=B6=E5=9C=A8=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E7=9B=AE=E5=BD=95=E6=97=B6=E4=BB=A5=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0+=E5=BA=8F=E5=8F=B7=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/spectrum/AbstractSpectrumHandler.java | 13 ++++++++++--- .../org/jeecg/modules/spectrum/AlertSpectrum.java | 3 ++- .../jeecg/modules/spectrum/DetbkphdSpectrum.java | 3 ++- .../jeecg/modules/spectrum/GasbkphdSpectrum.java | 3 ++- .../org/jeecg/modules/spectrum/MetSpectrum.java | 3 ++- .../org/jeecg/modules/spectrum/QcphdSpectrum.java | 3 ++- .../jeecg/modules/spectrum/SamplephdSpectrum.java | 3 ++- .../modules/spectrum/SpectrumParsingActuator.java | 2 +- 8 files changed, 23 insertions(+), 10 deletions(-) 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 63520992..d2bd62f5 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 @@ -5,6 +5,7 @@ import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ArrayUtils; +import org.jeecg.common.constant.StringConstant; import org.jeecg.common.email.EmailLogEvent; import org.jeecg.common.email.EmailLogManager; import org.jeecg.common.properties.SpectrumPathProperties; @@ -43,6 +44,10 @@ public abstract class AbstractSpectrumHandler extends AbstractChain { * 当前解析的邮件内容文本 */ protected String mailContent; + /** + * eml文件名称 + */ + protected String emlFileName; /** * 能谱类型 */ @@ -77,11 +82,12 @@ public abstract class AbstractSpectrumHandler extends AbstractChain { /** * 初始化参数 */ - public void init(String mailContent,SpectrumServiceQuotes spectrumServiceQuotes,StringBuilder returnFileName,Integer spectrumSource) throws Exception{ + public void init(String mailContent,String emlFileName,SpectrumServiceQuotes spectrumServiceQuotes,StringBuilder returnFileName,Integer spectrumSource) throws Exception{ this.mailContent = mailContent; this.spectrumServiceQuotes = spectrumServiceQuotes; this.returnFileName = returnFileName; this.spectrumSource = spectrumSource; + this.emlFileName = emlFileName; } /** @@ -102,12 +108,13 @@ public abstract class AbstractSpectrumHandler extends AbstractChain { */ protected void initNext(SpectrumServiceQuotes spectrumServiceQuotes,File spectrumFile, String sourceFilePath,DataType currDataType, - String mailContent,Integer spectrumSource,StringBuilder returnFileName){ + String mailContent,String emlFileName,Integer spectrumSource,StringBuilder returnFileName){ this.spectrumServiceQuotes = spectrumServiceQuotes; this.spectrumFile = spectrumFile; this.sourceFilePath = sourceFilePath; this.currDataType = currDataType; this.mailContent = mailContent; + this.emlFileName = emlFileName; this.spectrumSource = spectrumSource; this.returnFileName = returnFileName; this.setChina(); @@ -209,7 +216,7 @@ public abstract class AbstractSpectrumHandler extends AbstractChain { StringBuilder localPath = new StringBuilder(); localPath.append(this.spectrumServiceQuotes.getTaskProperties().getTemporaryStoragePath()); localPath.append(File.separator); - localPath.append(UUID.randomUUID()); + localPath.append(emlFileName.substring(0,emlFileName.lastIndexOf(StringConstant.DOT))); localPath.append(value.getSuffix()); this.spectrumFile = FileUtil.writeString(this.mailContent, localPath.toString(), "UTF-8"); this.sourceFilePath = spectrumFile.getAbsolutePath(); 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 84264f8e..c91496d6 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 @@ -52,7 +52,8 @@ public class AlertSpectrum extends AbstractSpectrumHandler{ protected void setChina() { AbstractSpectrumHandler spectrumHandler = new HealthStatusSpectrum(); spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,super.sourceFilePath, - super.currDataType,super.mailContent,super.spectrumSource,super.returnFileName); + super.currDataType,super.mailContent,super.emlFileName, + super.spectrumSource,super.returnFileName); spectrumHandler.setPrevious(this); super.setNext(spectrumHandler); } 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 f13218c5..a61b6fd0 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 @@ -16,7 +16,8 @@ public class DetbkphdSpectrum extends AbstractS_D_Q_G_SpectrumHandler { protected void setChina() { AbstractSpectrumHandler spectrumHandler = new QcphdSpectrum(); spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,super.sourceFilePath, - super.currDataType,super.mailContent,super.spectrumSource,super.returnFileName); + super.currDataType,super.mailContent,super.emlFileName, + super.spectrumSource,super.returnFileName); spectrumHandler.setPrevious(this); super.setNext(spectrumHandler); } 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 19e9888f..8bc4088e 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 @@ -18,7 +18,8 @@ public class GasbkphdSpectrum extends AbstractS_D_Q_G_SpectrumHandler { protected void setChina() { AbstractSpectrumHandler spectrumHandler = new MetSpectrum(); spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,super.sourceFilePath, - super.currDataType,super.mailContent,super.spectrumSource,super.returnFileName); + super.currDataType,super.mailContent,super.emlFileName, + super.spectrumSource,super.returnFileName); spectrumHandler.setPrevious(this); super.setNext(spectrumHandler); } 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 e252989d..7c0141d6 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 @@ -44,7 +44,8 @@ public class MetSpectrum extends AbstractSpectrumHandler{ protected void setChina() { AbstractSpectrumHandler spectrumHandler = new AlertSpectrum(); spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,super.sourceFilePath, - super.currDataType,super.mailContent,super.spectrumSource,super.returnFileName); + super.currDataType,super.mailContent,super.emlFileName, + super.spectrumSource,super.returnFileName); spectrumHandler.setPrevious(this); super.setNext(spectrumHandler); } 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 a540c7f1..d2444204 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 @@ -16,7 +16,8 @@ public class QcphdSpectrum extends AbstractS_D_Q_G_SpectrumHandler { protected void setChina() { AbstractSpectrumHandler spectrumHandler = new GasbkphdSpectrum(); spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,super.sourceFilePath, - super.currDataType,super.mailContent,super.spectrumSource,super.returnFileName); + super.currDataType,super.mailContent,super.emlFileName, + super.spectrumSource,super.returnFileName); spectrumHandler.setPrevious(this); super.setNext(spectrumHandler); } 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 57562239..fe2a68d1 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 @@ -17,7 +17,8 @@ public class SamplephdSpectrum extends AbstractS_D_Q_G_SpectrumHandler { protected void setChina() { AbstractSpectrumHandler spectrumHandler = new DetbkphdSpectrum(); spectrumHandler.initNext(super.spectrumServiceQuotes,super.spectrumFile,super.sourceFilePath, - super.currDataType,super.mailContent,super.spectrumSource,super.returnFileName); + super.currDataType,super.mailContent,super.emlFileName, + super.spectrumSource,super.returnFileName); spectrumHandler.setPrevious(this); super.setNext(spectrumHandler); } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java index 0b373cc6..e382fd6f 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java @@ -85,7 +85,7 @@ public class SpectrumParsingActuator implements Runnable{ //判断是否是IMS2.0协议文件 if(checkMailContent(mailContent,subject)){ AbstractSpectrumHandler spectrumHandler = new SamplephdSpectrum(); - spectrumHandler.init(mailContent.toString(),spectrumServiceQuotes,new StringBuilder(),SpectrumSource.FORM_EMAIL_SERVICE.getSourceType()); + spectrumHandler.init(mailContent.toString(),emlFile.getName(),spectrumServiceQuotes,new StringBuilder(),SpectrumSource.FORM_EMAIL_SERVICE.getSourceType()); final boolean matchResult = spectrumHandler.saveEmailToLocal(); if(matchResult){ //开始解析