From ad89fdba09b8f0596ed41c5b31de6f34fe1ce620 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 10 八月 2023 17:20:41 +0800
Subject: [PATCH] 优化行为分析信息报警

---
 src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java          |   19 +++++++++++--------
 src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java |    2 --
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java b/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
index 34cd15f..7a52bec 100644
--- a/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
@@ -74,6 +74,4 @@
     public List<ArdCameras> selectArdCamerasList(ArdCameras ardCameras) {
         return ardCamerasMapper.selectArdCamerasList(ardCameras);
     }
-
-
 }
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
index 0df027b..898dc85 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
@@ -54,12 +54,12 @@
         String url = "";//浜嬩欢鍥剧墖
         Boolean isSnapPic=true;
         //lCommand鏄紶鐨勬姤璀︾被鍨�
-//        log.debug("鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
+        log.debug("鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
         switch (lCommand) {
             case HCNetSDK.COMM_ALARM_V30:
-                //log.debug("绉诲姩渚︽祴銆佽棰戜涪澶便�侀伄鎸°�両O淇″彿閲忕瓑鎶ヨ淇℃伅(鏆備笉瑙f瀽)"+Integer.toHexString(lCommand));
+                log.debug("绉诲姩渚︽祴銆佽棰戜涪澶便�侀伄鎸°�両O淇″彿閲忕瓑鎶ヨ淇℃伅(鏆備笉瑙f瀽)");
             case HCNetSDK.COMM_ALARM_RULE:
-                log.debug("琛屼负鍒嗘瀽淇℃伅鎶ヨ淇℃伅"+Integer.toHexString(lCommand));
+                log.debug("琛屼负鍒嗘瀽淇℃伅鎶ヨ淇℃伅涓婃姤");
                 //region 琛屼负鍒嗘瀽淇℃伅
                 ArdCameras ardCameras = new ArdCameras();
                 ardCameras.setIp(sDeviceIP);
@@ -143,17 +143,18 @@
                 if(isSnapPic) {
                     url = savePicture(info);
                     info.setPicUrl(url);
+                    publishMqtt(info);
                 }
-                publishMqtt(info);
+
                 break;
             case HCNetSDK.COMM_UPLOAD_FACESNAP_RESULT:
-                log.debug("浜鸿劯妫�娴嬩簨浠朵笂鎶�(鏆備笉瑙f瀽)"+Integer.toHexString(lCommand));
+                log.debug("浜鸿劯妫�娴嬩簨浠朵笂鎶�(鏆備笉瑙f瀽)");
                 break;
             case HCNetSDK.COMM_GISINFO_UPLOAD:
-                log.debug("GPS鎶ヨ淇℃伅涓婃姤(鏆備笉瑙f瀽)"+Integer.toHexString(lCommand));
+                log.debug("GPS鎶ヨ淇℃伅涓婃姤(鏆備笉瑙f瀽)");
                 break;
             case HCNetSDK.COMM_ALARMHOST_CID_ALARM:
-                log.debug("鎶ヨ涓绘満 CID 鎶ュ憡鎶ヨ涓婁紶"+Integer.toHexString(lCommand));
+                log.debug("鎶ヨ涓绘満CID鎶ュ憡鎶ヨ涓婃姤");
                 //region 鎶ヨ涓绘満鎶ヨ澶勭悊
                 ArdEquipExternal ardEquipExternal = new ArdEquipExternal();
                 ardEquipExternal.setIp(sDeviceIP);
@@ -252,8 +253,10 @@
                 acsInfo.write(0, pAlarmInfo.getByteArray(0, strACSInfo.size()), 0, strACSInfo.size());
                 strACSInfo.read();
                 int dwMajor = strACSInfo.dwMajor;
+
                 if (dwMajor != 5) {
                     //鍙幏鍙栦簨浠�
+                    log.debug("闈炰簨浠舵姤璀︽暟鎹笂鎶�(鏆備笉瑙f瀽)");
                     break;
                 }
                 int dwMinor = strACSInfo.dwMinor;
@@ -354,7 +357,7 @@
                 //endregion
                 break;
             default:
-                log.info("鏈煡鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
+                log.debug("鏈煡鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
                 break;
 
         }

--
Gitblit v1.9.3