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

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

Browse Source
This commit is contained in:
nieziyan 2024-02-22 14:28:20 +08:00
commit 0a87d34c39
6 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@ public class UndealHandleManager{
long currentMillis = System.currentTimeMillis(); long currentMillis = System.currentTimeMillis();
long createMillis = currentMillis; long createMillis = currentMillis;
//判断redis是否包含文件名称 key //判断redis是否包含文件名称 key
if (spectrumServiceQuotes.getRedisStreamUtil().hasKey(spectrumFile.getName())) { if (spectrumServiceQuotes.getRedisStreamUtil().hasKey(RedisConstant.UNDEAL_FILE + spectrumFile.getName())) {
createMillis = (long) spectrumServiceQuotes.getRedisStreamUtil().get(RedisConstant.UNDEAL_FILE + spectrumFile.getName()); createMillis = (long) spectrumServiceQuotes.getRedisStreamUtil().get(RedisConstant.UNDEAL_FILE + spectrumFile.getName());
} else { } else {
spectrumServiceQuotes.getRedisStreamUtil().set(RedisConstant.UNDEAL_FILE + spectrumFile.getName(), currentMillis); spectrumServiceQuotes.getRedisStreamUtil().set(RedisConstant.UNDEAL_FILE + spectrumFile.getName(), currentMillis);

9
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java
View File

@ -182,7 +182,14 @@ public abstract class AbstractS_D_Q_G_SpectrumHandler extends AbstractSpectrumHa
protected void updateErrorSpectrumFileName() throws FileNotFoundException { protected void updateErrorSpectrumFileName() throws FileNotFoundException {
StringBuilder newFileName = new StringBuilder(); StringBuilder newFileName = new StringBuilder();
if (StringUtils.isNotBlank(this.sourceData.measurement_id)) { if (StringUtils.isNotBlank(this.sourceData.measurement_id)) {
newFileName.append(super.spectrumServiceQuotes.getNameStandUtil().GetFileNameFromDateTime(this.sourceData.measurement_id, "")); String newName = super.spectrumServiceQuotes.getNameStandUtil().GetFileNameFromDateTime(this.sourceData.measurement_id, "");
if (StringUtils.isNotBlank(newName)) {
newFileName.append(newName);
} else {
newFileName.append(this.sourceData.detector_code);
newFileName.append(StringConstant.DASH);
newFileName.append("");
}
} else { } else {
newFileName.append(this.sourceData.detector_code); newFileName.append(this.sourceData.detector_code);
newFileName.append(StringConstant.DASH); newFileName.append(StringConstant.DASH);

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

@ -1930,7 +1930,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
map.put("gammaSpectrum", seriseDataList); map.put("gammaSpectrum", seriseDataList);
//判断人工交互的道值与能量对应参数数组是否为空 //判断人工交互的道值与能量对应参数数组是否为空
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaList())) { if (Objects.nonNull(betaDataFile.getBgPara()) && CollectionUtils.isNotEmpty(betaDataFile.getGammaList())) {
//存储计算参数道值 //存储计算参数道值
List<Double> xs = new LinkedList(); List<Double> xs = new LinkedList();
//存储计算参数能量值 //存储计算参数能量值
@ -2151,7 +2151,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
map.put("EToC", fittingParaToUiStr); map.put("EToC", fittingParaToUiStr);
//判断人工交互的道值与能量对应参数数组是否为空 //判断人工交互的道值与能量对应参数数组是否为空
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaList())) { if (Objects.nonNull(betaDataFile.getBgPara()) && CollectionUtils.isNotEmpty(betaDataFile.getBetaList())) {
//存储计算参数道值 //存储计算参数道值
List<Double> xs = new LinkedList(); List<Double> xs = new LinkedList();
//存储计算参数能量值 //存储计算参数能量值

9
jeecg-server-cloud/armd-app-start/pom.xml
View File

@ -37,5 +37,12 @@
<version>3.5.1</version> <version>3.5.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

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

@ -70,8 +70,8 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
//调用dll //调用dll
//Windows加载dll工具库 //Windows加载dll工具库
/*System.loadLibrary("ReadPHDFile"); // System.loadLibrary("ReadPHDFile");
System.loadLibrary("GammaAnaly");*/ // System.loadLibrary("GammaAnaly");
//Linux版本加载dll工具库 //Linux版本加载dll工具库
System.load("/usr/local/jdk/lib/libReadPHDFile.so"); System.load("/usr/local/jdk/lib/libReadPHDFile.so");
System.load("/usr/local/jdk/lib/libGammaAnalyALG.so"); System.load("/usr/local/jdk/lib/libGammaAnalyALG.so");

8
jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java
View File

@ -63,11 +63,11 @@ public class JeecgSpectrumAnalysisApplication extends SpringBootServletInitializ
@Override @Override
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
//Windows加载dll工具库 //Windows加载dll工具库
/*System.loadLibrary("ReadPHDFile"); System.loadLibrary("ReadPHDFile");
System.loadLibrary("GammaAnaly");*/ System.loadLibrary("GammaAnaly");
//Linux版本加载dll工具库 //Linux版本加载dll工具库
System.load("/usr/local/jdk/lib/libReadPHDFile.so"); // System.load("/usr/local/jdk/lib/libReadPHDFile.so");
System.load("/usr/local/jdk/lib/libGammaAnalyALG.so"); // System.load("/usr/local/jdk/lib/libGammaAnalyALG.so");
//创建缓存 //创建缓存
betaCache.initCache(); betaCache.initCache();
localCache.initCache(); localCache.initCache();