From 0eb6c0b3276f8493126dd7ef59bdb07c0a5110ee Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 11 八月 2023 16:10:34 +0800
Subject: [PATCH] 通用光电报警越界侦测无法抓图修复
---
src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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 9314aa7..d81cd84 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
@@ -56,7 +56,7 @@
//log.debug("鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
switch (lCommand) {
case HCNetSDK.COMM_ALARM_V30:
- log.debug("绉诲姩渚︽祴");
+ //log.debug("绉诲姩渚︽祴");
ArdCameras ardCameras = new ArdCameras();
ardCameras.setIp(sDeviceIP);
ardCameras.setPort(wLinkPort);
@@ -75,12 +75,12 @@
info.setCameraName(camera.getName());
info.setCameraId(camera.getId());
info.setCameraIp(camera.getIp());
+ info.setCameraPort(camera.getPort());
info.setCameraType(camera.getGdtype());
info.setCameraChannel(Integer.valueOf(netDvrAlarminfoV30.byChannel[0]));
info.setLongitude(camera.getLongitude());
info.setLatitude(camera.getLatitude());
info.setAlarmType("绉诲姩渚︽祴");
- printLog(info);
//鍥剧墖瀛樺叆minio
url = savePicture(info);
info.setPicUrl(url);
@@ -89,7 +89,7 @@
}
case HCNetSDK.COMM_ALARM_RULE:
- log.debug("琛屼负鍒嗘瀽淇℃伅鎶ヨ淇℃伅涓婃姤");
+ //log.debug("琛屼负鍒嗘瀽淇℃伅鎶ヨ淇℃伅涓婃姤");
//region 琛屼负鍒嗘瀽淇℃伅
ardCameras = new ArdCameras();
ardCameras.setIp(sDeviceIP);
@@ -111,7 +111,8 @@
info.setAlarmTime(sTime);
info.setCameraName(ardCamera.getName());
info.setCameraId(ardCamera.getId());
- info.setCameraIp(ipaddr);
+ info.setCameraIp(ardCamera.getIp());
+ info.setCameraPort(ardCamera.getPort());
info.setCameraType(ardCamera.getGdtype());
info.setCameraChannel(channel);
info.setLongitude(ardCamera.getLongitude());
@@ -121,7 +122,6 @@
case 1: //region绌胯秺璀︽垝闈� (瓒婄晫渚︽祴)
info.setAlarmType("瓒婄晫渚︽祴鎶ヨ");
strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_TRAVERSE_PLANE.class);
- printLog(info);
//鍥剧墖瀛樺叆minio
url = savePicture(info);
info.setPicUrl(url);
@@ -141,7 +141,6 @@
case 4: //region 鍛ㄧ晫鍏ヤ镜
info.setAlarmType("鍛ㄧ晫鍏ヤ镜鎶ヨ");
strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_INTRUSION.class);
- printLog(info);
//鍥剧墖瀛樺叆minio
url = savePicture(info);
info.setPicUrl(url);
@@ -185,7 +184,7 @@
// log.debug("GPS鎶ヨ淇℃伅涓婃姤(鏆備笉瑙ｆ瀽)");
// break;
case HCNetSDK.COMM_ALARMHOST_CID_ALARM:
- log.debug("鎶ヨ涓绘満CID鎶ュ憡鎶ヨ涓婃姤");
+ //log.debug("鎶ヨ涓绘満CID鎶ュ憡鎶ヨ涓婃姤");
//region 鎶ヨ涓绘満鎶ヨ澶勭悊
ArdEquipExternal ardEquipExternal = new ArdEquipExternal();
ardEquipExternal.setIp(sDeviceIP);
@@ -401,7 +400,8 @@
*/
private String savePicture(CameraEventInfo info) {
CameraCmd cmd = new CameraCmd();
- ArdCameras Cameras = GlobalVariable.cameraMap.get(info.getCameraIp());
+ String key=info.getCameraIp()+":"+info.getCameraPort();
+ ArdCameras Cameras = GlobalVariable.cameraMap.get(key);
if (Cameras == null) {
return "";
}
@@ -448,7 +448,7 @@
* 閫氱敤鍏夌數鎶ヨ鎺ㄩ�乵qtt
*/
private void publishMqtt(CameraEventInfo info) {
- // printLog(info);
+ printLog(info);
MqttConsumer.publish(2, false, "camera", JSON.toJSONString(info));
}
--
Gitblit v1.9.3