xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/station' into station

Browse Source
This commit is contained in:
qiaoqinzheng 2023-10-19 18:55:37 +08:00
commit 7e4353675e
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java
View File

@ -1,10 +1,13 @@
package org.jeecg.modules.native_jni.struct; package org.jeecg.modules.native_jni.struct;
import lombok.Data;
import java.util.List; import java.util.List;
/** /**
* 能谱结构体字段信息 * 能谱结构体字段信息
*/ */
@Data
public class EnergySpectrumStruct { public class EnergySpectrumStruct {
/************************* Infomations ******************/ /************************* Infomations ******************/
/** /**

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
View File

@ -226,7 +226,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
Pattern regexPattern = Pattern.compile(sampleRx); 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"; 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); 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); Pattern regexPattern2 = Pattern.compile(sampleRx2);
//判断传递的文件名称是否包含， //判断传递的文件名称是否包含，
List<String> matchFileNames = new LinkedList<>(); List<String> matchFileNames = new LinkedList<>();

2
jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java
View File

@ -79,7 +79,7 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im
checkTempStorageDirectory(); checkTempStorageDirectory();
//校验存储目录是否存在，不存在则创建，存在无操作 //校验存储目录是否存在，不存在则创建，存在无操作
checkStorageDirectory(); checkStorageDirectory();
// autoProcessManager.start(systemStartupTime); autoProcessManager.start(systemStartupTime);
undealHandleManager.start(); undealHandleManager.start();
fileSourceHandleManager.start(); fileSourceHandleManager.start();
} }