From ad89fdba09b8f0596ed41c5b31de6f34fe1ce620 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Thu, 10 Aug 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("移动侦测、视频丢失、遮挡、IO信号量等报警信息(暂不解析)"+Integer.toHexString(lCommand));
+ log.debug("移动侦测、视频丢失、遮挡、IO信号量等报警信息(暂不解析)");
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("人脸检测事件上报(暂不解析)"+Integer.toHexString(lCommand));
+ log.debug("人脸检测事件上报(暂不解析)");
break;
case HCNetSDK.COMM_GISINFO_UPLOAD:
- log.debug("GPS报警信息上报(暂不解析)"+Integer.toHexString(lCommand));
+ log.debug("GPS报警信息上报(暂不解析)");
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("非事件报警数据上报(暂不解析)");
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