From f89a0ec0897263465ddb6a083d21b351c23bfc21 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 29 Feb 2024 13:57:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=8C=85=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AFwindows=E7=8E=AF=E5=A2=83=E5=8A=A0=E8=BD=BDdll?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=BA=93=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF?= =?UTF-8?q?linux=E5=8A=A0=E8=BD=BDso=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/GammaServiceImpl.java | 2 -- .../org/jeecg/JeecgAutoProcessApplication.java | 17 ++++++++++------- .../jeecg/JeecgSpectrumAnalysisApplication.java | 16 ++++++++++------ .../jeecg/JeecgWebStatisticsApplication.java | 11 ++++++++--- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index 95a12029..0ca89d0b 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -1785,7 +1785,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi phd.getVPeak().remove(curRow); //重新计算核素活度浓度 gammaFileUtil.NuclidesIdent(phd, nuclideMap); - redisUtil.set(userName+StringPool.DASH+phd.getHeader().getSystem_type(), nuclideMap); //重新分析数据 gammaFileUtil.PeaksChanged(phd); for (int i = 0; i < phd.getVPeak().size(); i++) { @@ -2075,7 +2074,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi nuclideMap.remove(nuclideName); //重新计算核素活度浓度 gammaFileUtil.NuclidesIdent(phd, nuclideMap); - redisUtil.set(userName+StringPool.DASH+phd.getHeader().getSystem_type(), nuclideMap); //从核素的选中列表中移除对应下标的核素信息 list_identify.remove(index); //重新初始化峰列表信息 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 c2ca5b2f..ab0ad6a7 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 @@ -68,13 +68,16 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im @Override public void run(String... args) throws Exception { - //调用dll - //Windows加载dll工具库 - System.loadLibrary("ReadPHDFile"); - System.loadLibrary("GammaAnaly"); - //Linux版本加载dll工具库 -// System.load("/usr/local/jdk/lib/libReadPHDFile.so"); -// System.load("/usr/local/jdk/lib/libGammaAnalyALG.so"); + String os = System.getProperty("os.name").toLowerCase(); + if (os.equalsIgnoreCase("win")) { + //Windows加载dll工具库 + System.loadLibrary("ReadPHDFile"); + System.loadLibrary("GammaAnaly"); + } else { + //Linux版本加载dll工具库 + System.load("/usr/local/jdk/lib/libReadPHDFile.so"); + System.load("/usr/local/jdk/lib/libGammaAnalyALG.so"); + } nuclLibService.getNuclideMap(); //根据配置文件配置邮件获取策略定义时间条件，默认EmailReceivePolicy.HISTORY_ORDER_RECEIVE.getPolicy() Date systemStartupTime = null; diff --git a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java index 135ddf28..9b8c692b 100644 --- a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java +++ b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java @@ -62,12 +62,16 @@ public class JeecgSpectrumAnalysisApplication extends SpringBootServletInitializ @Override public void run(String... args) throws Exception { - //Windows加载dll工具库 - System.loadLibrary("ReadPHDFile"); - System.loadLibrary("GammaAnaly"); - //Linux版本加载dll工具库 -// System.load("/usr/local/jdk/lib/libReadPHDFile.so"); -// System.load("/usr/local/jdk/lib/libGammaAnalyALG.so"); + String os = System.getProperty("os.name").toLowerCase(); + if (os.equalsIgnoreCase("win")) { + //Windows加载dll工具库 + System.loadLibrary("ReadPHDFile"); + System.loadLibrary("GammaAnaly"); + } else { + //Linux版本加载dll工具库 + System.load("/usr/local/jdk/lib/libReadPHDFile.so"); + System.load("/usr/local/jdk/lib/libGammaAnalyALG.so"); + } //创建缓存 betaCache.initCache(); localCache.initCache(); diff --git a/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java b/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java index ff1a11c7..2227a14e 100644 --- a/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java +++ b/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java @@ -41,8 +41,13 @@ public class JeecgWebStatisticsApplication extends SpringBootServletInitializer @Override public void run(String... args) throws Exception { - //windows环境调用dll - System.loadLibrary("ReadPHDFile"); - //System.load("/usr/local/jdk/lib/libReadPHDFile.so"); + String os = System.getProperty("os.name").toLowerCase(); + if (os.equalsIgnoreCase("win")) { + //Windows加载dll工具库 + System.loadLibrary("ReadPHDFile"); + } else { + //Linux版本加载dll工具库 + System.load("/usr/local/jdk/lib/libReadPHDFile.so"); + } } } \ No newline at end of file