From a69ece9e3bb32741a6a980648f5c935c54eda682 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 11:12:37 +0800
Subject: [PATCH] 宇视初始化修改
---
ycl-server/src/main/java/com/ycl/api/YS/YSInit.java | 3 ++-
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/YS/YSInit.java b/ycl-server/src/main/java/com/ycl/api/YS/YSInit.java
index 7bb5de6..22fc161 100644
--- a/ycl-server/src/main/java/com/ycl/api/YS/YSInit.java
+++ b/ycl-server/src/main/java/com/ycl/api/YS/YSInit.java
@@ -18,11 +18,12 @@
@Value("${spring.profiles.active}")
private String activeEnv;
- public static NetDEVSDKLib netdevsdk = NetDEVSDKLib.NETDEVSDK_INSTANCE;
+ public static NetDEVSDKLib netdevsdk;
public static String strPicturePath = "."+File.separator+"Picture"+File.separator;
@PostConstruct
void init() {
if("prod".equals(activeEnv)) {
+ netdevsdk = NetDEVSDKLib.NETDEVSDK_INSTANCE;
String strLogPath = "./sdklog/";
boolean bRet = netdevsdk.NETDEV_SetLogPath(strLogPath);
if(false == bRet){
diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index 885339a..ff8dc82 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -161,6 +161,7 @@
if (monitorVOMap.containsKey(result.getSerialNumber().getValue())) {
monitor.setId(monitorVOMap.get(result.getSerialNumber().getValue()).getId());
}
+
monitor.setSerialNumber(result.getSerialNumber().getValue());
monitor.setName(result.getName().getValue());
String siteType = result.getJkdwlx().getValue();
--
Gitblit v1.8.0