From c57812396fb34070b6970d08457e090a1b6bcc47 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期六, 29 三月 2025 16:11:12 +0800
Subject: [PATCH] hik温度更新
---
src/main/java/com/whyc/util/HikTempUtil.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/whyc/util/HikTempUtil.java b/src/main/java/com/whyc/util/HikTempUtil.java
index c72fbe5..8c8d0da 100644
--- a/src/main/java/com/whyc/util/HikTempUtil.java
+++ b/src/main/java/com/whyc/util/HikTempUtil.java
@@ -8,6 +8,7 @@
import com.whyc.dto.TempPoint;
import com.whyc.hik.Commom.osSelect;
import com.whyc.hik.NetSDKDemo.HCNetSDK;
+import com.whyc.pojo.db_batt.BattCamera;
import org.springframework.stereotype.Service;
import java.io.FileOutputStream;
@@ -30,19 +31,7 @@
public static List<Integer> lUserIDs = new LinkedList<>();
public static Map<String,Integer> ipLUserIdMap = new HashMap<>();
public static FExceptionCallBack_Imp fExceptionCallBack;
- public static List<IpInfo> ipInfoList = new LinkedList<>();
- static {
- //TODO 鏆傛椂瀹氫箟,鍚庣画瑕佹敼鎴愬搴旂殑
- ipInfoList.add(new IpInfo("192.168.10.11","1"));
- ipInfoList.add(new IpInfo("192.168.10.12","2"));
- ipInfoList.add(new IpInfo("192.168.10.13","3"));
- ipInfoList.add(new IpInfo("192.168.10.14","4"));
- ipInfoList.add(new IpInfo("192.168.10.15","5"));
- ipInfoList.add(new IpInfo("192.168.10.16","6"));
- ipInfoList.add(new IpInfo("192.168.10.17","7"));
- ipInfoList.add(new IpInfo("192.168.10.18","8"));
- }
-
+ public static List<BattCamera> cameraInfoList = new LinkedList<>();
public static Response getTempPoint(String ip){
Integer lUserID = ipLUserIdMap.get(ip);
@@ -207,7 +196,8 @@
return new Response().setII(1,true,tempPointMap,null);
}
- public static void init(){
+ public static void init(List<BattCamera> list){
+ cameraInfoList = list;
if (hCNetSDK == null) {
if (!createSDKInstance()) {
System.out.println("Load SDK fail");
@@ -251,8 +241,8 @@
//鐧诲綍璁惧锛屾瘡涓�鍙拌澶囧彧闇�瑕佺櫥褰曚竴娆�
//lUserID = TestDemo.loginDevice("10.9.137.21", (short) 8000, "admin", "Cpfwb518+");
//int lUserID = HikTempUtil.loginDevice("192.168.10.16", (short) 8000, "admin", "fg001@hdw");
- for (int i = 0; i < ipInfoList.size(); i++) {
- String ip = ipInfoList.get(i).getIp();
+ for (int i = 0; i < cameraInfoList.size(); i++) {
+ String ip = cameraInfoList.get(i).getCameraIp();
int lUserID = HikTempUtil.loginDevice(ip, (short) 8000, "admin", "fg001@hdw");
lUserIDs.add(lUserID);
ipLUserIdMap.put(ip,lUserID);
--
Gitblit v1.9.1