From 463ab4a0581291071e3a224856e1141c498af56d Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Wed, 21 Feb 2024 10:37:20 +0800
Subject: [PATCH] =?UTF-8?q?web=E6=A8=A1=E5=9D=97=E8=B0=83=E7=94=A8dll?=
=?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=BA=93=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/service/impl/GardsSampleDataWebServiceImpl.java | 2 --
.../main/java/org/jeecg/JeecgWebStatisticsApplication.java | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
index 30a22aa7..b862dc6e 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
@@ -147,8 +147,6 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
if (StringUtils.isNotBlank(filePath)) {
file = ftpUtil.downloadFile(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + filePath, "betaGamma");
if (Objects.nonNull(file)) {
-// System.load("/usr/local/jdk/lib/libReadPHDFile.so");
- System.loadLibrary("ReadPHDFile");
EnergySpectrumStruct sourceData = EnergySpectrumHandler.getSourceData(file.getAbsolutePath());
//查询info
this.findInfo(sampleId, report);
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 a31e14aa..ff1a11c7 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,6 +41,8 @@ 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");
}
}
\ No newline at end of file