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 |  424 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 295 insertions(+), 129 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..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
@@ -3,23 +3,24 @@
 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.impl.ArdCamerasServiceImpl;
+import com.ard.alarm.camera.service.IArdCamerasService;
+import com.ard.alarm.external.domain.ArdEquipExternal;
+import com.ard.alarm.external.service.IArdEquipExternalService;
 import com.ard.config.MinioClientSingleton;
-import com.ard.utils.ByteUtils;
+import com.ard.utils.other.ByteUtils;
 import com.ard.utils.hiksdk.common.GlobalVariable;
+import com.ard.utils.hiksdk.domain.AccessControlHostEventInfo;
+import com.ard.utils.hiksdk.domain.CameraEventInfo;
 import com.ard.utils.hiksdk.domain.ExternalAlarmEventInfo;
-import com.ard.utils.hiksdk.domain.alarmEventInfo;
 import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
 import com.ard.utils.hiksdk.util.minio.MinioUtils;
-import com.ard.utils.DateUtils;
-import com.ard.utils.SpringTool;
+import com.ard.utils.other.DateUtils;
+import com.ard.utils.other.SpringTool;
 import com.ard.utils.mqtt.MqttConsumer;
 import com.sun.jna.Pointer;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.xml.bind.DatatypeConverter;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
+import java.io.*;
 import java.nio.ByteBuffer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -31,7 +32,7 @@
  * @Date: 2023骞�02鏈�15鏃� 12:16
  * @Version: 1.0
  **/
-@Slf4j(topic = "hiksdk")
+@Slf4j(topic = "hikSdk")
 public class FMSGCallBack implements HCNetSDK.FMSGCallBack_V31 {
 
     /**
@@ -45,22 +46,57 @@
      */
     @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);
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String sDeviceIP = ByteUtils.bytesToStringZh(pAlarmer.sDeviceIP);//璁惧IP鍦板潃
+        Integer wLinkPort = Integer.valueOf(pAlarmer.wLinkPort);//璁惧閫氳绔彛
+        CameraEventInfo info;
         String sTime;//浜嬩欢鏃堕棿
-        String url;//浜嬩欢鍥剧墖
-        alarmEventInfo info;//浜嬩欢淇℃伅
-
+        String url = "";//浜嬩欢鍥剧墖
         //lCommand鏄紶鐨勬姤璀︾被鍨�
+        //log.debug("鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
         switch (lCommand) {
+            case HCNetSDK.COMM_ALARM_V30:
+                //log.debug("绉诲姩渚︽祴");
+                ArdCameras ardCameras = new ArdCameras();
+                ardCameras.setIp(sDeviceIP);
+                ardCameras.setPort(wLinkPort);
+                IArdCamerasService ardCamerasService = SpringTool.getApplicationContext().getBean(IArdCamerasService.class);
+                ArdCameras camera = ardCamerasService.selectArdCamerasList(ardCameras).get(0);
+                HCNetSDK.NET_DVR_ALARMINFO_V30 netDvrAlarminfoV30 = new HCNetSDK.NET_DVR_ALARMINFO_V30();
+                netDvrAlarminfoV30.write();
+                Pointer pNDAInfo = netDvrAlarminfoV30.getPointer();
+                pNDAInfo.write(0, pAlarmInfo.getByteArray(0, netDvrAlarminfoV30.size()), 0, netDvrAlarminfoV30.size());
+                netDvrAlarminfoV30.read();
+                switch (netDvrAlarminfoV30.dwAlarmType) {
+                    case 3:
+                        info = new CameraEventInfo();
+                        info.setAlarmName("绉诲姩渚︽祴");
+                        info.setAlarmTime(fmt.format(new Date()));
+                        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("绉诲姩渚︽祴");
+                        //鍥剧墖瀛樺叆minio
+                        url = savePicture(info);
+                        info.setPicUrl(url);
+                        publishMqtt(info);
+                        break;
+                }
+
             case HCNetSDK.COMM_ALARM_RULE:
+                //log.debug("琛屼负鍒嗘瀽淇℃伅鎶ヨ淇℃伅涓婃姤");
                 //region 琛屼负鍒嗘瀽淇℃伅
-                log.info("鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
+                ardCameras = new ArdCameras();
+                ardCameras.setIp(sDeviceIP);
+                ardCameras.setPort(wLinkPort);
+                ardCamerasService = SpringTool.getApplicationContext().getBean(IArdCamerasService.class);
+                ArdCameras ardCamera = ardCamerasService.selectArdCamerasList(ardCameras).get(0);
+
                 HCNetSDK.NET_VCA_RULE_ALARM strVcaAlarm = new HCNetSDK.NET_VCA_RULE_ALARM();
                 strVcaAlarm.write();
                 Pointer pVCAInfo = strVcaAlarm.getPointer();
@@ -70,82 +106,93 @@
                 sTime = DateUtils.parseTime(strVcaAlarm.dwAbsTime);//浜嬩欢鏃堕棿
                 String ipaddr = new String(strVcaAlarm.struDevInfo.struDevIP.sIpV4).trim();//璁惧ip
                 Integer channel = Integer.valueOf(strVcaAlarm.struDevInfo.byChannel);//閫氶亾
-                info = new alarmEventInfo();
+                info = new CameraEventInfo();
                 info.setAlarmName("浜哄憳琛屼负鍒嗘瀽");
                 info.setAlarmTime(sTime);
-                info.setCameraName(ardcamere.getName());
-                info.setCameraId(ardcamere.getId());
-                info.setCameraIp(ipaddr);
-                info.setCameraType(ardcamere.getGdtype());
+                info.setCameraName(ardCamera.getName());
+                info.setCameraId(ardCamera.getId());
+                info.setCameraIp(ardCamera.getIp());
+                info.setCameraPort(ardCamera.getPort());
+                info.setCameraType(ardCamera.getGdtype());
                 info.setCameraChannel(channel);
-                info.setLongitude(ardcamere.getLongitude());
-                info.setLatitude(ardcamere.getLatitude());
-                info.setAlarmType(ardcamere.getGdtype());
+                info.setLongitude(ardCamera.getLongitude());
+                info.setLatitude(ardCamera.getLatitude());
                 info.setRuleId(ruleID);
                 switch (strVcaAlarm.struRuleInfo.wEventTypeEx) {
                     case 1: //region绌胯秺璀︽垝闈� (瓒婄晫渚︽祴)
                         info.setAlarmType("瓒婄晫渚︽祴鎶ヨ");
                         strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_TRAVERSE_PLANE.class);
+                        //鍥剧墖瀛樺叆minio
+                        url = savePicture(info);
+                        info.setPicUrl(url);
+                        publishMqtt(info);
                         //endregion
                         break;
-                    case 2: //region 鐩爣杩涘叆鍖哄煙
-                        info.setAlarmType("鐩爣杩涘叆鍖哄煙鎶ヨ");
-                        strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_AREA.class);
-                        //endregion
-                        break;
-                    case 3: //region 鐩爣绂诲紑鍖哄煙
-                        info.setAlarmType("鐩爣绂诲紑鍖哄煙鎶ヨ");
-                        strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_AREA.class);
-                        //endregion
-                        break;
+//                    case 2: //region 鐩爣杩涘叆鍖哄煙
+//                        info.setAlarmType("鐩爣杩涘叆鍖哄煙鎶ヨ");
+//                        strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_AREA.class);
+//                        //endregion
+//                        break;
+//                    case 3: //region 鐩爣绂诲紑鍖哄煙
+//                        info.setAlarmType("鐩爣绂诲紑鍖哄煙鎶ヨ");
+//                        strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_AREA.class);
+//                        //endregion
+//                        break;
                     case 4: //region 鍛ㄧ晫鍏ヤ镜
                         info.setAlarmType("鍛ㄧ晫鍏ヤ镜鎶ヨ");
                         strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_INTRUSION.class);
+                        //鍥剧墖瀛樺叆minio
+                        url = savePicture(info);
+                        info.setPicUrl(url);
+                        publishMqtt(info);
                         //endregion
                         break;
-                    case 5: //region 寰樺緤
-                        info.setAlarmType("寰樺緤浜嬩欢鎶ヨ");
-                        //endregion
-                        break;
-                    case 8: //region 蹇�熺Щ鍔�(濂旇窇)
-                        info.setAlarmType("蹇�熺Щ鍔�(濂旇窇)浜嬩欢鎶ヨ");
-                        //endregion
-                        break;
-                    case 13: //region 鐗╁搧閬楃暀浜嬩欢
-                        info.setAlarmType("鐗╁搧閬楃暀浜嬩欢鎶ヨ");
-                        //endregion
-                        break;
-                    case 14: //region 鐗╁搧鎷垮彇浜嬩欢
-                        info.setAlarmType("鐗╁搧鎷垮彇浜嬩欢浜嬩欢鎶ヨ");
-                        //endregion
-                        break;
-                    case 20: //region 鍊掑湴妫�娴�
-                        info.setAlarmType("鍊掑湴浜嬩欢瑙﹀彂");
-                        //endregion
-                        break;
-                    case 44: //region 鐜╂墜鏈�
-                        info.setAlarmType("鐜╂墜鏈烘姤璀︿簨浠�");
-                        //endregion
-                        break;
+//                    case 5: //region 寰樺緤
+//                        info.setAlarmType("寰樺緤浜嬩欢鎶ヨ");
+//                        //endregion
+//                        break;
+//                    case 8: //region 蹇�熺Щ鍔�(濂旇窇)
+//                        info.setAlarmType("蹇�熺Щ鍔�(濂旇窇)浜嬩欢鎶ヨ");
+//                        //endregion
+//                        break;
+//                    case 13: //region 鐗╁搧閬楃暀浜嬩欢
+//                        info.setAlarmType("鐗╁搧閬楃暀浜嬩欢鎶ヨ");
+//                        //endregion
+//                        break;
+//                    case 14: //region 鐗╁搧鎷垮彇浜嬩欢
+//                        info.setAlarmType("鐗╁搧鎷垮彇浜嬩欢浜嬩欢鎶ヨ");
+//                        //endregion
+//                        break;
+//                    case 20: //region 鍊掑湴妫�娴�
+//                        info.setAlarmType("鍊掑湴浜嬩欢瑙﹀彂");
+//                        //endregion
+//                        break;
+//                    case 44: //region 鐜╂墜鏈�
+//                        info.setAlarmType("鐜╂墜鏈烘姤璀︿簨浠�");
+//                        //endregion
+//                        break;
                     default:
-                        log.info("鏈煡琛屼负浜嬩欢绫诲瀷:" + strVcaAlarm.struRuleInfo.wEventTypeEx);
-                        printLog(info);
+                        // log.debug("鏈煡琛屼负浜嬩欢绫诲瀷:" + strVcaAlarm.struRuleInfo.wEventTypeEx);
                         break;
                 }
                 //endregion
-                //鍥剧墖瀛樺叆minio
-                url = savePicture(info);
-                info.setPicUrl(url);
-                publishMqtt(info);
                 break;
-            case HCNetSDK.COMM_UPLOAD_FACESNAP_RESULT:
-                log.info("浜鸿劯妫�娴嬩簨浠朵笂鎶�");
-                break;
-            case HCNetSDK.COMM_GISINFO_UPLOAD:
-                log.info("GPS鎶ヨ淇℃伅涓婃姤");
-                break;
+//            case HCNetSDK.COMM_UPLOAD_FACESNAP_RESULT:
+//                log.debug("浜鸿劯妫�娴嬩簨浠朵笂鎶�(鏆備笉瑙f瀽)");
+//                break;
+//            case HCNetSDK.COMM_GISINFO_UPLOAD:
+//                log.debug("GPS鎶ヨ淇℃伅涓婃姤(鏆備笉瑙f瀽)");
+//                break;
             case HCNetSDK.COMM_ALARMHOST_CID_ALARM:
-                log.info("鎶ヨ涓绘満 CID 鎶ュ憡鎶ヨ涓婁紶");
+                //log.debug("鎶ヨ涓绘満CID鎶ュ憡鎶ヨ涓婃姤");
+                //region 鎶ヨ涓绘満鎶ヨ澶勭悊
+                ArdEquipExternal ardEquipExternal = new ArdEquipExternal();
+                ardEquipExternal.setIp(sDeviceIP);
+                ardEquipExternal.setPort(wLinkPort);
+                IArdEquipExternalService ardEquipExternalService = SpringTool.getApplicationContext().getBean(IArdEquipExternalService.class);
+                ardEquipExternal = ardEquipExternalService.selectArdEquipExternal(ardEquipExternal);
+
+
                 HCNetSDK.NET_DVR_CID_ALARM netDvrCidAlarm = new HCNetSDK.NET_DVR_CID_ALARM();
                 netDvrCidAlarm.write();
                 Pointer pCIDInfo = netDvrCidAlarm.getPointer();
@@ -202,76 +249,162 @@
                 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);
                 }
                 if (sCIDDescribe.contains("鎭㈠")) {
                     return true;
                 }
+
                 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);
+                //endregion
+                break;
+            case HCNetSDK.COMM_ALARM_ACS:
+                //region 闂ㄧ涓绘満鎶ヨ澶勭悊
+                ArdEquipExternal accessControlHost = new ArdEquipExternal();
+                accessControlHost.setIp(sDeviceIP);
+                accessControlHost.setPort(wLinkPort);
+                ardEquipExternalService = SpringTool.getApplicationContext().getBean(IArdEquipExternalService.class);
+                accessControlHost = ardEquipExternalService.selectArdEquipExternal(accessControlHost);
+
+                HCNetSDK.NET_DVR_ACS_ALARM_INFO strACSInfo = new HCNetSDK.NET_DVR_ACS_ALARM_INFO();
+                strACSInfo.write();
+                Pointer acsInfo = strACSInfo.getPointer();
+                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;
+                if (dwMinor != 80 && dwMinor != 104) {
+                    //鍙В鏋愮湡浜烘娴嬪け璐ュ拰浜鸿劯鎶撴媿澶辫触鐨勬绫诲瀷浜嬩欢
+                    break;
+                }
+//                log.info("闂ㄧ涓绘満鎶ヨ涓婁紶");
+//                log.info("銆愪富绫诲瀷銆戜簨浠�");
+                String alarmType = "";
+                switch (dwMinor) {
+                    case 104:
+                        alarmType = "鐪熶汉妫�娴嬪け璐�";
+                        break;
+                    case 80:
+                        alarmType = "浜鸿劯鎶撴媿澶辫触";
+                        break;
+                }
+                String alarmTime = DateUtils.convertDate(parseAlarmTime(strACSInfo.struTime), "yyyy-M-d H:m:s");
+
+                //浜嬩欢鍥剧墖澶勭悊
+                int dwPicDataLen = strACSInfo.dwPicDataLen;
+                if (dwPicDataLen > 0) {
+                    SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+                    String newName = sf.format(new Date());
+                    try {
+                        //灏嗗瓧鑺傚啓鍏ユ枃浠�
+                        long offset = 0;
+                        ByteBuffer buffers = strACSInfo.pPicData.getByteBuffer(offset, strACSInfo.dwPicDataLen);
+                        byte[] bytes = new byte[strACSInfo.dwPicDataLen];
+                        buffers.rewind();
+                        buffers.get(bytes);
+                        InputStream input = new ByteArrayInputStream(bytes);
+                        String bucketName = "pic";
+                        String objectName = "alarm_" + newName + ".jpeg";
+                        boolean uploadObject = MinioUtils.uploadObject(bucketName, objectName, input, "image/JPEG");
+                        if (uploadObject) {
+                            url = MinioClientSingleton.domainUrl + "/" + bucketName + "/" + objectName;
+                            //log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
+                        }
+                    } catch (Exception e) {
+                        log.error("鍥剧墖淇濆瓨澶辫触");
+                    }
+                }
+                HCNetSDK.NET_DVR_ACS_EVENT_INFO struAcsEventInfo = strACSInfo.struAcsEventInfo;
+                int byType = struAcsEventInfo.byType;
+                String defenseType = "";
+                switch (byType) {
+                    case 0:
+                        defenseType = "鍗虫椂闃插尯";
+                        break;
+                    case 1:
+                        defenseType = "24灏忔椂闃插尯";
+                        break;
+                    case 2:
+                        defenseType = "寤舵椂闃插尯";
+                        break;
+                    case 3:
+                        defenseType = "鍐呴儴闃插尯";
+                        break;
+                    case 4:
+                        defenseType = "閽ュ寵闃插尯";
+                        break;
+                    case 5:
+                        defenseType = "鐏闃插尯";
+                        break;
+                    case 6:
+                        defenseType = "鍛ㄧ晫闃插尯";
+                        break;
+                    case 7:
+                        defenseType = "24灏忔椂鏃犲0闃插尯";
+                        break;
+                    case 8:
+                        defenseType = "24灏忔椂杈呭姪闃插尯";
+                        break;
+                    case 9:
+                        defenseType = "24灏忔椂闇囧姩闃插尯";
+                        break;
+                    case 10:
+                        defenseType = "闂ㄧ绱ф�ュ紑闂ㄩ槻鍖�";
+                        break;
+                    case 11:
+                        defenseType = "闂ㄧ绱ф�ュ叧闂ㄩ槻鍖�";
+                        break;
+                    default:
+                        defenseType = "鏃�";
+                        break;
+                }
+                AccessControlHostEventInfo accessControlHostEventInfo = new AccessControlHostEventInfo();
+                accessControlHostEventInfo.setSerialNo(struAcsEventInfo.dwSerialNo);
+                accessControlHostEventInfo.setAlarmType(alarmType);
+                accessControlHostEventInfo.setDoorNo(struAcsEventInfo.dwDoorNo);
+                accessControlHostEventInfo.setDefenseType(defenseType);
+                accessControlHostEventInfo.setAlarmTime(alarmTime);
+                accessControlHostEventInfo.setPicUrl(url);
+                accessControlHostEventInfo.setAcsId(accessControlHost.getId());
+                publishMqtt(accessControlHostEventInfo);
+                //endregion
                 break;
             default:
-                log.info("鏈煡鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
+                // log.debug("鏈煡鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
                 break;
 
         }
         return true;
     }
 
-    /**
-     * @鎻忚堪 淇濆瓨鍥剧墖灏佽鏂规硶
-     * @鍙傛暟 [strVcaAlarm, eventName, eventNameEng]
-     * @杩斿洖鍊� java.lang.String
-     * @鍒涘缓浜� 鍒樿嫃涔�
-     * @鍒涘缓鏃堕棿 2023/2/17 15:05
-     * @淇敼浜哄拰鍏跺畠淇℃伅
-     */
-    private String savePicture(HCNetSDK.NET_VCA_RULE_ALARM strVcaAlarm, String eventName, String eventNameEng) {
-        String url = "";
-        if ((strVcaAlarm.dwPicDataLen > 0) && (strVcaAlarm.byPicTransType == 0)) {
-            String currentTime = new SimpleDateFormat("yyyyMMdd").format(new Date());
-            try {
-                //瀛樺叆minio
-                long offset = 0;
-                ByteBuffer buffers = strVcaAlarm.pImage.getByteBuffer(offset, strVcaAlarm.dwPicDataLen);
-                byte[] bytes = new byte[strVcaAlarm.dwPicDataLen];
-                buffers.rewind();
-                buffers.get(bytes);
-                InputStream inputStream = new ByteArrayInputStream(bytes);
-                String ipaddr = new String(strVcaAlarm.struDevInfo.struDevIP.sIpV4).trim();//璁惧ip
-                String UUID = java.util.UUID.randomUUID().toString().replace("-", "");
-                String filename = ipaddr + "/" + currentTime + "/" + eventNameEng + "/" + UUID + ".jpg";
-                boolean uploadRes = MinioUtils.uploadObject("pic", filename, inputStream, inputStream.available(), "image/jpeg");
-                if (uploadRes) {
-                    url = MinioClientSingleton.domainUrl + filename;
-                    log.info("鍐欏叆minio鍥剧墖鍦板潃锛�" + url);
-                }
-            } catch (Exception ex) {
-                log.error(eventName + "澶勭悊鍥剧墖寮傚父锛�" + ex.getMessage());
-            }
-        }
-        return url;
-    }
 
     /**
-     * 鎵撲繚瀛樺浘鐗�
+     * 鐩告満鎴浘
      */
-    private String savePicture(alarmEventInfo info) {
+    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 "";
+        }
         cmd.setCameraId(Cameras.getId());
         cmd.setChannelNum(info.getCameraChannel());
         cmd.setBucketName("pic");
@@ -285,36 +418,56 @@
     /**
      * 鎵撳嵃閫氱敤鍏夌數鏃ュ織
      */
-    private void printLog(alarmEventInfo info) {
-        log.info("銆愯鍒欍��" + info.getAlarmName() + "銆愯鍒檌d銆�" + info.getRuleId() + "銆愮被鍨嬨��" + info.getAlarmType() +
+    private void printLog(CameraEventInfo info) {
+        log.debug("銆愯鍒欍��" + info.getAlarmName() + "銆愯鍒檌d銆�" + info.getRuleId() + "銆愮被鍨嬨��" + info.getAlarmType() +
                 "銆愭椂闂淬��" + info.getAlarmTime() + "銆愮浉鏈篿d銆�" + info.getCameraId() + "銆愮浉鏈恒��" + info.getCameraName() +
                 "銆怚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() +
+        log.debug("銆愭姤璀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());
+    }
+
+    /**
+     * 鎵撳嵃闂ㄧ浜嬩欢鏃ュ織
+     */
+    private void printLog(AccessControlHostEventInfo info) {
+        log.debug("銆愭姤璀D銆�" + info.getSerialNo() + "銆愯澶囩紪鍙枫��" +
+                "銆愰棬缂栧彿銆�" + info.getDoorNo() + "銆愪簨浠剁被鍨嬨��" + info.getAlarmType() +
+                "銆愰槻鍖虹被鍨嬨��" + info.getDefenseType() + "銆愭椂闂淬��" + info.getAlarmTime() +
+                "銆愰棬绂佷富鏈篒D銆�" + info.getAcsId());
     }
 
     /**
      * 閫氱敤鍏夌數鎶ヨ鎺ㄩ�乵qtt
      */
-    private void publishMqtt(alarmEventInfo info) {
-        // printLog(info);
+    private void publishMqtt(CameraEventInfo info) {
+         printLog(info);
         MqttConsumer.publish(2, false, "camera", JSON.toJSONString(info));
     }
+
     /**
-     * 澶栬仈鎶ヨ鎺ㄩ�乵qtt
+     * 鎶ヨ涓绘満浜嬩欢鎺ㄩ�乵qtt
      */
     private void publishMqtt(ExternalAlarmEventInfo info) {
         printLog(info);
-        MqttConsumer.publish(2, false, "camera", JSON.toJSONString(info));
+        MqttConsumer.publish(2, false, "external", JSON.toJSONString(info));
     }
+
+    /**
+     * 闂ㄧ浜嬩欢鎺ㄩ�乵qtt
+     */
+    private void publishMqtt(AccessControlHostEventInfo info) {
+        printLog(info);
+        MqttConsumer.publish(2, false, "accessControl", JSON.toJSONString(info));
+    }
+
     /**
      * 鏃堕棿鏍煎紡鍖�
      */
@@ -327,4 +480,17 @@
         byte bySecond = netDvrTimeEx.bySecond;
         return wYear + "-" + byMonth + "-" + byDay + " " + byHour + ":" + byMinute + ":" + bySecond;
     }
+
+    /**
+     * 鏃堕棿鏍煎紡鍖�
+     */
+    private String parseAlarmTime(HCNetSDK.NET_DVR_TIME netDvrTimeEx) {
+        int wYear = netDvrTimeEx.dwYear;
+        int byMonth = netDvrTimeEx.dwMonth;
+        int byDay = netDvrTimeEx.dwDay;
+        int byHour = netDvrTimeEx.dwHour;
+        int byMinute = netDvrTimeEx.dwMinute;
+        int bySecond = netDvrTimeEx.dwSecond;
+        return wYear + "-" + byMonth + "-" + byDay + " " + byHour + ":" + byMinute + ":" + bySecond;
+    }
 }

--
Gitblit v1.9.3