From 85446b5b526ac53af9add7c83cfd72f39ec39611 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 07 七月 2023 10:51:13 +0800
Subject: [PATCH] 优化外联设备报警解析并上传mqtt

---
 src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 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 a8a32c0..991e60a 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
@@ -3,7 +3,11 @@
 import com.alibaba.fastjson2.JSON;
 import com.ard.alarm.camera.domain.ArdCameras;
 import com.ard.alarm.camera.domain.CameraCmd;
+import com.ard.alarm.camera.service.IArdCamerasService;
 import com.ard.alarm.camera.service.impl.ArdCamerasServiceImpl;
+import com.ard.alarm.external.domain.ArdEquipExternal;
+import com.ard.alarm.external.service.IArdEquipExternalService;
+import com.ard.alarm.external.service.impl.ArdEquipExternalServiceImpl;
 import com.ard.config.MinioClientSingleton;
 import com.ard.utils.ByteUtils;
 import com.ard.utils.hiksdk.common.GlobalVariable;
@@ -45,13 +49,10 @@
      */
     @Override
     public boolean invoke(int lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
-        ArdCamerasServiceImpl ardCamerasService = SpringTool.getApplicationContext().getBean(ArdCamerasServiceImpl.class);
+
         String sDeviceIP = ByteUtils.bytesToStringZh(pAlarmer.sDeviceIP);
         Integer wLinkPort = Integer.valueOf(pAlarmer.wLinkPort);
-        ArdCameras ardCameras = new ArdCameras();
-        ardCameras.setIp(sDeviceIP);
-        ardCameras.setPort(wLinkPort);
-        ArdCameras ardcamere = ardCamerasService.selectArdCamerasList(ardCameras).get(0);
+
         String sTime;//浜嬩欢鏃堕棿
         String url;//浜嬩欢鍥剧墖
         alarmEventInfo info;//浜嬩欢淇℃伅
@@ -60,6 +61,11 @@
         switch (lCommand) {
             case HCNetSDK.COMM_ALARM_RULE:
                 //region 琛屼负鍒嗘瀽淇℃伅
+                ArdCameras ardCameras = new ArdCameras();
+                ardCameras.setIp(sDeviceIP);
+                ardCameras.setPort(wLinkPort);
+                IArdCamerasService ardCamerasService = SpringTool.getApplicationContext().getBean(IArdCamerasService.class);
+                ArdCameras ardcamere = ardCamerasService.selectArdCamerasList(ardCameras).get(0);
                 log.info("鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
                 HCNetSDK.NET_VCA_RULE_ALARM strVcaAlarm = new HCNetSDK.NET_VCA_RULE_ALARM();
                 strVcaAlarm.write();
@@ -146,6 +152,13 @@
                 break;
             case HCNetSDK.COMM_ALARMHOST_CID_ALARM:
                 log.info("鎶ヨ涓绘満 CID 鎶ュ憡鎶ヨ涓婁紶");
+                ArdEquipExternal ardEquipExternal = new ArdEquipExternal();
+                ardEquipExternal.setIp(sDeviceIP);
+                ardEquipExternal.setPort(wLinkPort);
+                IArdEquipExternalService ardEquipExternalService = SpringTool.getApplicationContext().getBean(IArdEquipExternalService.class);
+                ardEquipExternal = ardEquipExternalService.selectArdEquipExternalList(ardEquipExternal).get(0);
+
+
                 HCNetSDK.NET_DVR_CID_ALARM netDvrCidAlarm = new HCNetSDK.NET_DVR_CID_ALARM();
                 netDvrCidAlarm.write();
                 Pointer pCIDInfo = netDvrCidAlarm.getPointer();
@@ -202,7 +215,7 @@
                 String wDefenceName = "";
                 if (!bySubSysNo.equals(-1)) {
                     CameraCmd cmd = new CameraCmd();
-                    cmd.setCameraId(ardcamere.getId());
+                    cmd.setCameraId(ardEquipExternal.getId());
                     cmd.setWZoneIndex(wDefenceNo);
                     wDefenceName = HikClientUtil.getDefenseZoneName(cmd);
                 }
@@ -212,15 +225,12 @@
                 ExternalAlarmEventInfo externalAlarmEventInfo = new ExternalAlarmEventInfo();
                 externalAlarmEventInfo.setAlarmId(sCIDCode);
                 externalAlarmEventInfo.setAlarmName(sCIDDescribe);
-                externalAlarmEventInfo.setDefenseId((wDefenceNo + 1) );
+                externalAlarmEventInfo.setDefenseId((wDefenceNo + 1));
                 externalAlarmEventInfo.setDefenseName(wDefenceName);
                 externalAlarmEventInfo.setSubSysNo(bySubSysNo);
                 externalAlarmEventInfo.setAlarmType(byReportType);
                 externalAlarmEventInfo.setAlarmTime(struTriggerTime);
-                externalAlarmEventInfo.setCameraId(ardcamere.getId());
-                externalAlarmEventInfo.setCameraName(ardcamere.getName());
-                externalAlarmEventInfo.setCameraIp(ardcamere.getIp());
-                externalAlarmEventInfo.setCameraType(ardcamere.getGdtype());
+                externalAlarmEventInfo.setAlarmHostId(ardEquipExternal.getId());
                 publishMqtt(externalAlarmEventInfo);
                 break;
             default:
@@ -291,14 +301,14 @@
                 "銆怚P銆�" + info.getCameraIp() + "銆愰�氶亾銆�" + info.getCameraChannel() + "銆愬瀷鍙枫��" + info.getCameraType() +
                 "銆愬浘鐗囥��" + info.getPicUrl() + "銆愬潗鏍囥��" + info.getLongitude() + "," + info.getLatitude());
     }
+
     /**
      * 鎵撳嵃澶栬仈鎶ヨ鏃ュ織
      */
     private void printLog(ExternalAlarmEventInfo info) {
         log.info("銆愭姤璀D銆�" + info.getAlarmId() + "銆愭姤璀﹀悕绉般��" + info.getAlarmName() +
                 "銆愰槻鍖篒D銆�" + info.getDefenseId() + "銆愰槻鍖哄悕绉般��" + info.getDefenseName() + "銆愮被鍨嬨��" + info.getAlarmType() +
-                "銆愭椂闂淬��" + info.getAlarmTime() + "銆愮浉鏈篒D銆�" + info.getCameraId() + "銆愮浉鏈恒��" + info.getCameraName() +
-                "銆怚P銆�" + info.getCameraIp() + "銆愬瀷鍙枫��" + info.getCameraType());
+                "銆愭椂闂淬��" + info.getAlarmTime() + "銆愭姤璀︿富鏈篒D銆�" + info.getAlarmHostId());
     }
 
     /**
@@ -308,13 +318,15 @@
         // printLog(info);
         MqttConsumer.publish(2, false, "camera", JSON.toJSONString(info));
     }
+
     /**
      * 澶栬仈鎶ヨ鎺ㄩ�乵qtt
      */
     private void publishMqtt(ExternalAlarmEventInfo info) {
         printLog(info);
-        MqttConsumer.publish(2, false, "camera", JSON.toJSONString(info));
+        MqttConsumer.publish(2, false, "external", JSON.toJSONString(info));
     }
+
     /**
      * 鏃堕棿鏍煎紡鍖�
      */

--
Gitblit v1.9.3