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

启动包增加环境判断，如果是windows环境加载dll依赖库，如果是linux加载so文件

Browse Source
This commit is contained in:
qiaoqinzheng 2024-02-29 13:57:27 +08:00
parent 8ad0d9db38
commit f89a0ec089
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1785,7 +1785,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
phd.getVPeak().remove(curRow); phd.getVPeak().remove(curRow);
//重新计算核素活度浓度 //重新计算核素活度浓度
gammaFileUtil.NuclidesIdent(phd, nuclideMap); gammaFileUtil.NuclidesIdent(phd, nuclideMap);
redisUtil.set(userName+StringPool.DASH+phd.getHeader().getSystem_type(), nuclideMap);
//重新分析数据 //重新分析数据
gammaFileUtil.PeaksChanged(phd); gammaFileUtil.PeaksChanged(phd);
for (int i = 0; i < phd.getVPeak().size(); i++) { for (int i = 0; i < phd.getVPeak().size(); i++) {
@ -2075,7 +2074,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
nuclideMap.remove(nuclideName); nuclideMap.remove(nuclideName);
//重新计算核素活度浓度 //重新计算核素活度浓度
gammaFileUtil.NuclidesIdent(phd, nuclideMap); gammaFileUtil.NuclidesIdent(phd, nuclideMap);
redisUtil.set(userName+StringPool.DASH+phd.getHeader().getSystem_type(), nuclideMap);
//从核素的选中列表中移除对应下标的核素信息 //从核素的选中列表中移除对应下标的核素信息
list_identify.remove(index); list_identify.remove(index);
//重新初始化峰列表信息 //重新初始化峰列表信息

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

@ -68,13 +68,16 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im
@Override @Override
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
//调用dll String os = System.getProperty("os.name").toLowerCase();
//Windows加载dll工具库 if (os.equalsIgnoreCase("win")) {
System.loadLibrary("ReadPHDFile"); //Windows加载dll工具库
System.loadLibrary("GammaAnaly"); System.loadLibrary("ReadPHDFile");
//Linux版本加载dll工具库 System.loadLibrary("GammaAnaly");
// System.load("/usr/local/jdk/lib/libReadPHDFile.so"); } else {
// System.load("/usr/local/jdk/lib/libGammaAnalyALG.so"); //Linux版本加载dll工具库
System.load("/usr/local/jdk/lib/libReadPHDFile.so");
System.load("/usr/local/jdk/lib/libGammaAnalyALG.so");
}
nuclLibService.getNuclideMap(); nuclLibService.getNuclideMap();
//根据配置文件配置邮件获取策略定义时间条件，默认EmailReceivePolicy.HISTORY_ORDER_RECEIVE.getPolicy() //根据配置文件配置邮件获取策略定义时间条件，默认EmailReceivePolicy.HISTORY_ORDER_RECEIVE.getPolicy()
Date systemStartupTime = null; Date systemStartupTime = null;

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

@ -62,12 +62,16 @@ public class JeecgSpectrumAnalysisApplication extends SpringBootServletInitializ
@Override @Override
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
//Windows加载dll工具库 String os = System.getProperty("os.name").toLowerCase();
System.loadLibrary("ReadPHDFile"); if (os.equalsIgnoreCase("win")) {
System.loadLibrary("GammaAnaly"); //Windows加载dll工具库
//Linux版本加载dll工具库 System.loadLibrary("ReadPHDFile");
// System.load("/usr/local/jdk/lib/libReadPHDFile.so"); System.loadLibrary("GammaAnaly");
// System.load("/usr/local/jdk/lib/libGammaAnalyALG.so"); } else {
//Linux版本加载dll工具库
System.load("/usr/local/jdk/lib/libReadPHDFile.so");
System.load("/usr/local/jdk/lib/libGammaAnalyALG.so");
}
//创建缓存 //创建缓存
betaCache.initCache(); betaCache.initCache();
localCache.initCache(); localCache.initCache();

11
jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java
View File

@ -41,8 +41,13 @@ public class JeecgWebStatisticsApplication extends SpringBootServletInitializer
@Override @Override
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
//windows环境调用dll String os = System.getProperty("os.name").toLowerCase();
System.loadLibrary("ReadPHDFile"); if (os.equalsIgnoreCase("win")) {
//System.load("/usr/local/jdk/lib/libReadPHDFile.so"); //Windows加载dll工具库
System.loadLibrary("ReadPHDFile");
} else {
//Linux版本加载dll工具库
System.load("/usr/local/jdk/lib/libReadPHDFile.so");
}
} }
} }