From 457bb8e5bb8e37ffa0a26fe48bd3e0eccaed92cc Mon Sep 17 00:00:00 2001 From: nieziyan Date: Thu, 19 Oct 2023 16:13:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java | 2 +- .../src/main/java/org/jeecg/JeecgAutoProcessApplication.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 73c8844f..7eab662d 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 @@ -226,7 +226,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { Pattern regexPattern = Pattern.compile(sampleRx); String sampleRx1 = "[a-zA-Z]{3}[0-9]{2}_[0-9]{3}-[0-9]{8}_[0-9]{4}_S_(FULL_|PREL_)\\d+\\.\\d+\\.PHD"; Pattern regexPattern1 = Pattern.compile(sampleRx1); - String sampleRx2 = "[a-zA-Z]{3}[0-9]{2}_[0-9]{3}-[0-9]{8}_[0-9]{4}_S_.PHD"; + String sampleRx2 = "[a-zA-Z]{3}[0-9]{2}_[0-9]{3}-[0-9]{8}_[0-9]{4}_S.PHD"; Pattern regexPattern2 = Pattern.compile(sampleRx2); //判断传递的文件名称是否包含， List matchFileNames = new LinkedList<>(); diff --git a/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java b/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java index bf671ea6..5195acdb 100644 --- a/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java +++ b/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java @@ -79,7 +79,7 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im checkTempStorageDirectory(); //校验存储目录是否存在，不存在则创建，存在无操作 checkStorageDirectory(); - // autoProcessManager.start(systemStartupTime); + autoProcessManager.start(systemStartupTime); undealHandleManager.start(); fileSourceHandleManager.start(); } From 740274df1a07fcd3c4efcf51ebf2841698cb20f3 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Thu, 19 Oct 2023 17:22:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3gamma=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86=20=E5=9C=A8=E8=BF=9B=E8=A1=8CbeancC?= =?UTF-8?q?ope=E6=97=B6=E5=87=BA=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/native_jni/struct/EnergySpectrumStruct.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java index b02d240d..d0279728 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java @@ -1,10 +1,13 @@ package org.jeecg.modules.native_jni.struct; +import lombok.Data; + import java.util.List; /** * 能谱结构体字段信息 */ +@Data public class EnergySpectrumStruct { /************************* Infomations ******************/ /**