From 1ca9656140c41165459dfb6f6b7606b3aa6a8747 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Wed, 24 Jul 2024 15:05:13 +0800
Subject: [PATCH] 三一车辆查询加入关联后bug修改提交

---
 ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java
index 645afae..7075434 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java
@@ -82,6 +82,22 @@
         return result;
     }
 
+    //查询通道名称
+    public static String getChannelName(NetSDKLib.LLong hLoginHandle, Integer channel) {
+        String channelName = "";
+        NetSDKLib.AV_CFG_ChannelName channelTitleName = new NetSDKLib.AV_CFG_ChannelName();
+        if (ToolKits.GetDevConfig(hLoginHandle, channel - 1, NetSDKLib.CFG_CMD_CHANNELTITLE, channelTitleName)) {
+            try {
+                channelName = new String(channelTitleName.szName, "GBK");
+            } catch (Exception e) {
+                log.error("getChannelName Failed!");
+            }
+        } else {
+            log.error("Get Channel Name Failed." + ToolKits.getErrorCodePrint());
+        }
+        return channelName;
+    }
+
     public static boolean GetDevConfig(NetSDKLib.LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) {
         boolean result = true;
         IntByReference error = new IntByReference(0);
@@ -98,6 +114,7 @@
         return result;
     }
 
+    //查询相机状态
     public static boolean queryCameraState(NetSDKLib.LLong hLoginHandle, Integer chanNum, Integer chanNo) {
         boolean bRet = false;
         try {
@@ -128,8 +145,9 @@
                 stOut.read();
                 ToolKits.GetPointerDataToStructArr(stOut.pCameraStateInfo, arrCameraStatus);  // 将Pointer拷贝到数组内存
                 final String[] connectionState = {"未知", "正在连接", "已连接", "未连接", "通道未配置,无信息", "通道有配置,但被禁用"};
+
                 if (connectionState[arrCameraStatus[chanNo - 1].emConnectionState].equals("已连接")) {
-                    log.debug("通道" + arrCameraStatus[chanNo - 1].nChannel + connectionState[arrCameraStatus[chanNo - 1].emConnectionState]);
+                    //log.debug("通道:" + arrCameraStatus[chanNo - 1].nChannel + "状态:" + connectionState[arrCameraStatus[chanNo - 1].emConnectionState]);
                     bRet = true;
                 } else {
                     bRet = false;
@@ -191,6 +209,5 @@
 
         return result;
     }
-
 
 }

--
Gitblit v1.9.3