From a20bc4abb2b913bf03dda03a45d835da090cf9aa Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期三, 27 十二月 2023 22:18:11 +0800
Subject: [PATCH] 雷达通过ip和端口关联

---
 src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java |  611 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 393 insertions(+), 218 deletions(-)

diff --git a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java b/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java
index 3283dbf..b784e5f 100644
--- a/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java
+++ b/src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java
@@ -1,6 +1,7 @@
 package com.ard.utils.sdk.hiksdk.service.impl;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.ard.alarm.camera.domain.ArdCameras;
 import com.ard.alarm.camera.domain.CameraCmd;
 import com.ard.alarm.camera.service.impl.ArdCamerasServiceImpl;
@@ -8,6 +9,8 @@
 import com.ard.alarm.external.service.impl.ArdEquipExternalServiceImpl;
 import com.ard.utils.sdk.hiksdk.domain.*;
 import com.ard.utils.minio.MinioUtil;
+import com.ard.utils.sdk.hiksdk.domain.isapi.FaceCapture;
+import com.ard.utils.sdk.hiksdk.domain.isapi.IsapiAlarm;
 import com.ard.utils.util.ByteUtils;
 import com.ard.utils.sdk.hiksdk.common.GlobalVariable;
 import com.ard.utils.sdk.hiksdk.util.hikSdkUtil.HCNetSDK;
@@ -15,12 +18,14 @@
 import com.ard.utils.mqtt.MqttProducer;
 import com.ard.utils.util.IdUtils;
 import com.sun.jna.Pointer;
+import javafx.scene.Camera;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.*;
 import java.nio.ByteBuffer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Optional;
 
 import static com.ard.utils.sdk.hiksdk.util.hikSdkUtil.HCNetSDK.*;
@@ -48,7 +53,7 @@
     public boolean invoke(int lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
         SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String sDeviceIP = ByteUtils.bytesToStringZh(pAlarmer.sDeviceIP).trim();//璁惧IP鍦板潃
-        Integer wLinkPort = Integer.valueOf(pAlarmer.wLinkPort);//璁惧閫氳绔彛
+        int wLinkPort = pAlarmer.wLinkPort;//璁惧閫氳绔彛
         //閫氳繃ip鍜岀鍙f煡璇㈣澶�
         Optional<ArdCameras> foundCamera = findArdCameraByIpAndPort(sDeviceIP, wLinkPort);
         Optional<ArdEquipExternal> foundExternal = findArdEquipExternalByIpAndPort(sDeviceIP, wLinkPort);
@@ -65,19 +70,18 @@
         if (camera == null && ardEquipExternal == null) {
             return false;
         }
-        CameraEventInfo info;
+        String alarmName = "";//鎶ヨ鍚嶇О
         String alarmTime;//浜嬩欢鏃堕棿
         String alarmType = "";//鎶ヨ绫诲瀷
         String picUrl = "";//浜嬩欢鍥剧墖
-        String facePicUrl = "";//浜鸿劯鍥剧墖
+        String facePicUrl = "";//浜鸿劯鎶撴媿鍥剧墖
+        int dwPicDataLen;//鍥剧墖鏁版嵁闀垮害
+        int chanNo = 0;//閫氶亾鍙�
         //lCommand鏄紶鐨勬姤璀︾被鍨�
         log.debug("銆�" + sDeviceIP + ":" + wLinkPort + "銆戞姤璀︿簨浠剁被鍨�:lCommand:" + Integer.toHexString(lCommand));
         switch (lCommand) {
             case COMM_ALARM_V30:
-                log.debug("绉诲姩渚︽祴鎶ヨ淇℃伅涓婃姤");
-                if (camera == null) {
-                    return false;
-                }
+                log.debug("绉诲姩渚︽祴淇℃伅涓婃姤");
                 //region 绉诲姩渚︽祴銆佽棰戜涪澶便�侀伄鎸°�両O淇″彿閲忕瓑鎶ヨ淇℃伅(V3.0浠ヤ笂鐗堟湰鏀寔鐨勮澶�)
                 HCNetSDK.NET_DVR_ALARMINFO_V30 netDvrAlarminfoV30 = new HCNetSDK.NET_DVR_ALARMINFO_V30();
                 netDvrAlarminfoV30.write();
@@ -86,28 +90,26 @@
                 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
-                        picUrl = snapPicture(info);
-                        info.setPicUrl(picUrl);
-                        publishMqtt(info, "camera");
+                        if (camera != null) {
+                            for (byte b : netDvrAlarminfoV30.byChannel) {
+                                if (b == 1) {
+                                    chanNo = b;
+                                    switch (camera.getGdType()) {
+                                        case "0":
+                                            cameraEventHandler(camera, chanNo, "绉诲姩渚︽祴", "绉诲姩渚︽祴鎶ヨ", fmt.format(new Date()), picUrl, "");
+                                            break;
+                                    }
+                                }
+                            }
+                        }
                         break;
                 }
                 //endregion
                 break;
+            case COMM_VCA_ALARM:
+                log.debug("鏅鸿兘妫�娴嬮�氱敤淇℃伅涓婃姤(鏆備笉瑙f瀽)");
             case COMM_ALARM_RULE:
-                log.debug("寮傚父琛屼负璇嗗埆淇℃伅鎶ヨ淇℃伅涓婃姤");
+                log.debug("寮傚父琛屼负璇嗗埆淇℃伅涓婃姤");
                 //region 寮傚父琛屼负璇嗗埆淇℃伅
                 HCNetSDK.NET_VCA_RULE_ALARM strVcaAlarm = new HCNetSDK.NET_VCA_RULE_ALARM();
                 strVcaAlarm.write();
@@ -116,80 +118,100 @@
                 strVcaAlarm.read();
                 Integer ruleID = Integer.valueOf(strVcaAlarm.struRuleInfo.byRuleID);
                 alarmTime = DateUtils.parseTime(strVcaAlarm.dwAbsTime);//浜嬩欢鏃堕棿
-                Integer channel = Integer.valueOf(strVcaAlarm.struDevInfo.byChannel);//閫氶亾
-                info = new CameraEventInfo();
-                info.setAlarmName("浜哄憳琛屼负鍒嗘瀽");
-                info.setAlarmTime(alarmTime);
-                info.setCameraName(camera.getName());
-                info.setCameraId(camera.getId());
-                info.setCameraIp(camera.getIp());
-                info.setCameraPort(camera.getPort());
-                info.setCameraType(camera.getGdType());
-                info.setCameraChannel(channel);
-                info.setLongitude(camera.getLongitude());
-                info.setLatitude(camera.getLatitude());
-                info.setRuleId(ruleID);
+                chanNo = Integer.valueOf(strVcaAlarm.struDevInfo.byChannel);//閫氶亾
                 switch (strVcaAlarm.struRuleInfo.wEventTypeEx) {
                     case 1: //region绌胯秺璀︽垝闈� (瓒婄晫渚︽祴)
-                        info.setAlarmType("瓒婄晫渚︽祴鎶ヨ");
-                        strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_TRAVERSE_PLANE.class);
-                        //鍥剧墖瀛樺叆minio
-                        picUrl = snapPicture(info);
-                        info.setPicUrl(picUrl);
-                        publishMqtt(info, "camera");
+                        alarmType = "瓒婄晫渚︽祴鎶ヨ";
                         //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 鐩爣杩涘叆鍖哄煙
+                        alarmType = "鐩爣杩涘叆鍖哄煙鎶ヨ";
+                        //endregion
+                        break;
+                    case 3: //region 鐩爣绂诲紑鍖哄煙
+                        alarmType = "鐩爣绂诲紑鍖哄煙鎶ヨ";
+                        //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
-                        picUrl = snapPicture(info);
-                        info.setPicUrl(picUrl);
-                        publishMqtt(info, "camera");
+                        alarmType = "鍛ㄧ晫鍏ヤ镜鎶ヨ";
                         //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 寰樺緤
+                        alarmType = "寰樺緤浜嬩欢鎶ヨ";
+                        //endregion
+                        break;
+                    case 8: //region 蹇�熺Щ鍔�(濂旇窇)
+                        alarmType = "蹇�熺Щ鍔ㄦ姤璀�";
+                        //endregion
+                        break;
+                    case 9: //region 浜哄憳鑱氶泦鎶ヨ
+                        alarmType = "浜哄憳鑱氶泦鎶ヨ";
+                        //endregion
+                        break;
+                    case 13: //region 鐗╁搧閬楃暀浜嬩欢
+                        alarmType = "鐗╁搧閬楃暀浜嬩欢鎶ヨ";
+                        //endregion
+                        break;
+                    case 14: //region 鐗╁搧鎷垮彇浜嬩欢
+                        alarmType = "鐗╁搧鎷垮彇浜嬩欢鎶ヨ";
+                        //endregion
+                        break;
+                    case 15: //region 绂诲矖浜嬩欢
+                        strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_LEAVE_POSITION.class);
+                        int byMode = strVcaAlarm.struRuleInfo.uEventParam.struLeavePos.byMode;
+                        switch (byMode) {
+                            case 0:
+                                alarmType = "绂诲矖浜嬩欢鎶ヨ";
+                                break;
+                            case 1:
+                                alarmType = "鐫″矖浜嬩欢鎶ヨ";
+                                break;
+                        }
+                        //endregion
+                        break;
+                    case 20: //region 鍊掑湴妫�娴�
+                        alarmType = "鍊掑湴妫�娴嬩簨浠舵姤璀�";
+                        //endregion
+                        break;
+                    case 35: //region 浜烘暟鍙樺寲浜嬩欢鎶ヨ
+                        alarmType = "浜烘暟鍙樺寲浜嬩欢鎶ヨ";
+                        //endregion
+                        break;
+                    case 41: //region 婊炵暀妫�娴�
+                        alarmType = "婊炵暀妫�娴嬩簨浠舵姤璀�";
+                        //endregion
+                        break;
+                    case 44: //region 鐜╂墜鏈�
+                        alarmType = "鐜╂墜鏈轰簨浠舵姤璀�";
+                        //endregion
+                        break;
                     default:
                         log.debug("鏈煡寮傚父琛屼负浜嬩欢绫诲瀷:" + strVcaAlarm.struRuleInfo.wEventTypeEx);
                         break;
                 }
+                //鍥剧墖鎺ユ敹
+                int byPicType = strVcaAlarm.byPicType;
+                dwPicDataLen = strVcaAlarm.dwPicDataLen;
+                int byPicTransType = strVcaAlarm.byPicTransType;
+                if (dwPicDataLen > 0 && strVcaAlarm.pImage != null && byPicTransType == 0) {
+                    picUrl = saveBinPicToMinio(strVcaAlarm.pImage, dwPicDataLen);
+                }
+                if (camera != null) {
+                    alarmName = "寮傚父琛屼负璇嗗埆";
+                    switch (camera.getGdType()) {
+                        case "0":
+                            cameraEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, picUrl, "");
+                            break;
+                        case "3":
+                            superBrainEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, picUrl, "");
+                            break;
+                    }
+                }
                 //endregion
                 break;
             case COMM_UPLOAD_FACESNAP_RESULT:
-                log.debug("浜鸿劯鎶撴媿鎶ヨ淇℃伅(鏆備笉瑙f瀽)");
+                log.debug("浜鸿劯鎶撴媿鎶ヨ淇℃伅涓婃姤");
                 //region 浜鸿劯鎶撴媿鎶ヨ淇℃伅
                 HCNetSDK.NET_VCA_FACESNAP_RESULT struFaceSnap = new HCNetSDK.NET_VCA_FACESNAP_RESULT();
                 struFaceSnap.write();
@@ -198,6 +220,7 @@
                 struFaceSnap.read();
                 alarmTime = DateUtils.parseTime(struFaceSnap.dwAbsTime);
                 String facePicTyp;
+                chanNo = struFaceSnap.struDevInfo.byChannel;
                 switch (struFaceSnap.byUploadEventDataType) {
                     case 0:
                         facePicTyp = "浜岃繘鍒舵暟鎹�";
@@ -210,54 +233,28 @@
                         break;
                 }
                 if (struFaceSnap.dwFacePicLen > 0 && struFaceSnap.pBuffer1 != null) {
-                    //灏嗗瓧鑺傚啓鍏ユ枃浠�
-                    long offset = 0;
-                    ByteBuffer buffers = struFaceSnap.pBuffer1.getByteBuffer(offset, struFaceSnap.dwBackgroundPicLen);
-                    byte[] bytes = new byte[struFaceSnap.dwBackgroundPicLen];
-                    buffers.rewind();
-                    buffers.get(bytes);
-                    InputStream input = new ByteArrayInputStream(bytes);
-                    try {
-                        String bucketName = "pic";
-                        String objectName = "alarm/" + IdUtils.simpleUUID() + ".jpeg";
-                        boolean uploadObject = MinioUtil.uploadObject(bucketName, objectName, input, input.available(), "image/JPEG");
-                        if (uploadObject) {
-                            facePicUrl = MinioUtil.getBucketObjectUrl(bucketName, objectName);
-                            //log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
-                        }
-                    } catch (Exception e) {
-                        log.error("浜鸿劯鎶撴媿鎶ヨ淇℃伅鍥剧墖淇濆瓨澶辫触" + e.getMessage());
-                    }
+                    facePicUrl = saveBinPicToMinio(struFaceSnap.pBuffer1, struFaceSnap.dwFacePicLen);
                 }
                 if (struFaceSnap.dwBackgroundPicLen > 0 && struFaceSnap.pBuffer2 != null) {
-                    //灏嗗瓧鑺傚啓鍏ユ枃浠�
-                    long offset = 0;
-                    ByteBuffer buffers = struFaceSnap.pBuffer2.getByteBuffer(offset, struFaceSnap.dwBackgroundPicLen);
-                    byte[] bytes = new byte[struFaceSnap.dwBackgroundPicLen];
-                    buffers.rewind();
-                    buffers.get(bytes);
-                    InputStream input = new ByteArrayInputStream(bytes);
-                    try {
-                        String bucketName = "pic";
-                        String objectName = "alarm/" + IdUtils.simpleUUID() + ".jpeg";
-                        boolean uploadObject = MinioUtil.uploadObject(bucketName, objectName, input, input.available(), "image/JPEG");
-                        if (uploadObject) {
-                            picUrl = MinioUtil.getBucketObjectUrl(bucketName, objectName);
-                            //log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
-                        }
-                    } catch (Exception e) {
-                        log.error("浜鸿劯鎶撴媿鎶ヨ淇℃伅鍥剧墖淇濆瓨澶辫触" + e.getMessage());
+                    picUrl = saveBinPicToMinio(struFaceSnap.pBuffer2, struFaceSnap.dwBackgroundPicLen);
+                }
+                //log.debug("銆愪汉鑴告姄鎷嶆姤璀︿俊鎭��: alarmTime:" + alarmTime + " picUrl:" + picUrl + " facePicType:" + facePicTyp + " facePicUrl:" + facePicUrl);
+                if (camera != null) {
+                    alarmName = "浜鸿劯鎶撴媿妫�娴�";
+                    alarmType = "浜鸿劯鎶撴媿鎶ヨ";
+                    switch (camera.getGdType()) {
+                        case "0":
+                            cameraEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, "", "");
+                            break;
+                        case "3":
+                            superBrainEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, picUrl, facePicUrl);
+                            break;
                     }
                 }
-                log.debug("銆愪汉鑴告姄鎷嶆姤璀︿俊鎭��: alarmTime:" + alarmTime + " picUrl:" + picUrl + " facePicType:" + facePicTyp + " facePicUrl:" + facePicUrl);
-                FaceSnapEventInfo faceSnapEventInfo = new FaceSnapEventInfo();
-                faceSnapEventInfo.setAlarmTime(alarmTime);
-                faceSnapEventInfo.setPicUrl(picUrl);
-                publishMqtt(faceSnapEventInfo, "superbrain");
                 //endregion
                 break;
             case COMM_SNAP_MATCH_ALARM:
-                log.debug("浜鸿劯姣斿鎶ヨ淇℃伅");
+                log.debug("浜鸿劯姣斿鎶ヨ淇℃伅涓婃姤");
                 //region 浜鸿劯姣斿鎶ヨ淇℃伅
                 HCNetSDK.NET_VCA_FACESNAP_MATCH_ALARM struFaceMatchAlarm = new HCNetSDK.NET_VCA_FACESNAP_MATCH_ALARM();
                 struFaceMatchAlarm.write();
@@ -265,22 +262,13 @@
                 fmaInfo.write(0, pAlarmInfo.getByteArray(0, struFaceMatchAlarm.size()), 0, struFaceMatchAlarm.size());
                 struFaceMatchAlarm.read();
                 alarmTime = DateUtils.parseTime(struFaceMatchAlarm.struSnapInfo.dwAbsTime);//鎶ヨ鏃堕棿
-
+                chanNo = struFaceMatchAlarm.struSnapInfo.struDevInfo.byChannel;
                 int byMatchPicNum = struFaceMatchAlarm.byMatchPicNum;//鍖归厤鍥剧墖鏁伴噺
-                String picTransType = "";
-                switch (struFaceMatchAlarm.byPicTransType) {
-                    case 0:
-                        picTransType = "浜岃繘鍒跺浘鐗�";
-                        break;
-                    case 1:
-                        picTransType = "URL璺緞鍥剧墖";
-                        break;
-                }
+                int picTransType = struFaceMatchAlarm.byPicTransType;////鍥剧墖鏁版嵁浼犺緭鏂瑰紡: 0-浜岃繘鍒讹紱1-url
                 String contrastStatus = "";
                 switch (struFaceMatchAlarm.byContrastStatus) {
                     case 1:
                         contrastStatus = "姣斿鎴愬姛";
-
                         break;
                     case 2:
                         contrastStatus = "姣斿澶辫触";
@@ -289,104 +277,181 @@
                         contrastStatus = "鏈煡";
                         break;
                 }
+                String BlockType = "";
                 switch (struFaceMatchAlarm.struBlockListInfo.struBlockListInfo.byType) {
                     case 1:
-                        alarmType = "闄岀敓浜烘姤璀�";
+                        BlockType = "闄岀敓浜烘姤璀�";
                         break;
                     case 2:
-                        alarmType = "浜鸿劯姣斿鎶ヨ";
+                        BlockType = "浜鸿劯姣斿鎶ヨ";
                         break;
                     default:
-                        alarmType = "鏈煡";
+                        BlockType = "鏈煡";
                         break;
                 }
-                if (struFaceMatchAlarm.dwSnapPicLen > 0 && struFaceMatchAlarm.pSnapPicBuffer != null && struFaceMatchAlarm.byPicTransType == 0) {
-                    //灏嗗瓧鑺傚啓鍏ユ枃浠�
+                //浜鸿劯姣斿鎶ヨ鍥剧墖淇濆瓨锛屽浘鐗囨牸寮廢RL鏍煎紡
+                if ((struFaceMatchAlarm.dwSnapPicLen > 0) && (struFaceMatchAlarm.byPicTransType == 1)) {
+
                     long offset = 0;
                     ByteBuffer buffers = struFaceMatchAlarm.pSnapPicBuffer.getByteBuffer(offset, struFaceMatchAlarm.dwSnapPicLen);
                     byte[] bytes = new byte[struFaceMatchAlarm.dwSnapPicLen];
                     buffers.rewind();
                     buffers.get(bytes);
-                    InputStream input = new ByteArrayInputStream(bytes);
-                    try {
-                        String bucketName = "pic";
-                        String objectName = "alarm/" + IdUtils.simpleUUID() + ".jpeg";
-                        boolean uploadObject = MinioUtil.uploadObject(bucketName, objectName, input, input.available(), "image/JPEG");
-                        if (uploadObject) {
-                            picUrl = MinioUtil.getBucketObjectUrl(bucketName, objectName);
-                            //log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
-                        }
-                    } catch (Exception e) {
-                        log.error("浜鸿劯鎶撴媿鎶ヨ淇℃伅鍥剧墖淇濆瓨澶辫触" + e.getMessage());
-                    }
+                    picUrl = new String(bytes);
+                    //log.debug("鎶撴媿鍥綰RL锛�" + picUrl);
                 }
-                if (struFaceMatchAlarm.struBlockListInfo.dwBlockListPicLen > 0 && struFaceMatchAlarm.struBlockListInfo.pBuffer1 != null) {
-                    //灏嗗瓧鑺傚啓鍏ユ枃浠�
+                if ((struFaceMatchAlarm.struSnapInfo.dwSnapFacePicLen > 0) && (struFaceMatchAlarm.byPicTransType == 1)) {
+
+                    long offset = 0;
+                    ByteBuffer buffers = struFaceMatchAlarm.struSnapInfo.pBuffer1.getByteBuffer(offset, struFaceMatchAlarm.struSnapInfo.dwSnapFacePicLen);
+                    byte[] bytes = new byte[struFaceMatchAlarm.struSnapInfo.dwSnapFacePicLen];
+                    buffers.rewind();
+                    buffers.get(bytes);
+                    facePicUrl = new String(bytes);
+                    //System.out.println("鎶撴媿浜鸿劯瀛愬浘URL锛�" + SnapPicUrl);
+                }
+                if ((struFaceMatchAlarm.struBlockListInfo.dwBlockListPicLen > 0) && (struFaceMatchAlarm.byPicTransType == 1)) {
+
                     long offset = 0;
                     ByteBuffer buffers = struFaceMatchAlarm.struBlockListInfo.pBuffer1.getByteBuffer(offset, struFaceMatchAlarm.struBlockListInfo.dwBlockListPicLen);
                     byte[] bytes = new byte[struFaceMatchAlarm.struBlockListInfo.dwBlockListPicLen];
                     buffers.rewind();
                     buffers.get(bytes);
-                    InputStream input = new ByteArrayInputStream(bytes);
-                    try {
-                        String bucketName = "pic";
-                        String objectName = "alarm/" + IdUtils.simpleUUID() + ".jpeg";
-                        boolean uploadObject = MinioUtil.uploadObject(bucketName, objectName, input, input.available(), "image/JPEG");
-                        if (uploadObject) {
-                            picUrl = MinioUtil.getBucketObjectUrl(bucketName, objectName);
-                            //log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
-                        }
-                    } catch (Exception e) {
-                        log.error("浜鸿劯鎶撴媿鎶ヨ淇℃伅鍥剧墖淇濆瓨澶辫触" + e.getMessage());
+                    String faceLibUrl = new String(bytes);
+                    //System.out.println("浜鸿劯搴撲汉鑴稿浘鐨刄RL锛�" + SnapPicUrl);
+                }
+                //浜鸿劯姣斿鎶ヨ鍥剧墖淇濆瓨锛屽浘鐗囨牸寮忎簩杩涘埗
+                //if ((struFaceMatchAlarm.dwSnapPicLen > 0) && (struFaceMatchAlarm.byPicTransType == 0)) {
+                //    picUrl = saveBinPicToMinio(struFaceMatchAlarm.pSnapPicBuffer, struFaceMatchAlarm.dwSnapPicLen);
+                //}
+                //if ((struFaceMatchAlarm.struSnapInfo.dwSnapFacePicLen > 0) && (struFaceMatchAlarm.byPicTransType == 0)) {
+                //    facePicUrl = saveBinPicToMinio(struFaceMatchAlarm.struSnapInfo.pBuffer1, struFaceMatchAlarm.struSnapInfo.dwSnapFacePicLen);
+                //}
+                //if ((struFaceMatchAlarm.struBlockListInfo.dwBlockListPicLen > 0) && (struFaceMatchAlarm.byPicTransType == 0)) {
+                //    //String faceBlockPicUrl = saveBinPicToMinio(struFaceMatchAlarm.struBlockListInfo.pBuffer1, struFaceMatchAlarm.struBlockListInfo.dwBlockListPicLen);
+                //}
+                if (camera != null) {
+                    alarmName = "浜鸿劯姣斿妫�娴�";
+                    alarmType = BlockType + "[" + contrastStatus + "]";
+                    switch (camera.getGdType()) {
+                        case "0":
+                            cameraEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, "", "");
+                            break;
+                        case "3":
+                            superBrainEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, picUrl, facePicUrl);
+                            break;
                     }
                 }
-                String sAlarmType = "";
-                try {
-                    sAlarmType = "浜鸿劯榛戝悕鍗曟瘮瀵规姤璀︼紝鐩歌瘑搴︼細" + struFaceMatchAlarm.fSimilarity + "锛岄粦鍚嶅崟濮撳悕锛�" +
-                            new String(struFaceMatchAlarm.struBlockListInfo.struBlockListInfo.struAttribute.byName, "GBK").trim() + "锛岄粦鍚嶅崟璇佷欢淇℃伅锛�" +
-                            new String(struFaceMatchAlarm.struBlockListInfo.struBlockListInfo.struAttribute.byCertificateNumber).trim();
-                } catch (UnsupportedEncodingException e) {
-                    e.printStackTrace();
-                }
-                log.debug(sAlarmType);
-                log.debug("銆愪汉鑴告瘮瀵规姤璀︿俊鎭��:" + " 姣斿缁撴灉:" + contrastStatus + " 姣斿绫诲瀷:" + alarmType + " 鎶ヨ鏃堕棿:" + alarmTime + " 鍖归厤鍥剧墖鏁伴噺锛�" + byMatchPicNum + " 鍥剧墖绫诲瀷锛�" + picTransType + " 姣斿鍥剧墖:" + picUrl);
-                FaceMatchEventInfo faceMatchEventInfo = new FaceMatchEventInfo();
-                faceMatchEventInfo.setAlarmTime(alarmTime);
-                faceMatchEventInfo.setStatus(contrastStatus);
-                faceMatchEventInfo.setAlarmType(alarmType);
-                publishMqtt(faceMatchEventInfo, "faceMatch");
                 //endregion
                 break;
             case COMM_UPLOAD_AIOP_VIDEO:
-                log.debug("璁惧鏀寔AI寮�鏀惧钩鍙版帴鍏ワ紝涓婁紶瑙嗛妫�娴嬫暟鎹�(鏆備笉瑙f瀽)");
+                log.debug("AI瑙嗛妫�娴嬫姤璀︿笂浼�");
+                //region AI寮�鏀惧钩鍙版帴鍏ヨ棰戞娴�
+                HCNetSDK.NET_AIOP_VIDEO_HEAD struAIOPVideo = new HCNetSDK.NET_AIOP_VIDEO_HEAD();
+                struAIOPVideo.write();
+                Pointer pAIOPVideo = struAIOPVideo.getPointer();
+                pAIOPVideo.write(0, pAlarmInfo.getByteArray(0, struAIOPVideo.size()), 0, struAIOPVideo.size());
+                struAIOPVideo.read();
+                log.debug("瑙嗛浠诲姟ID" + new String(struAIOPVideo.szTaskID).trim());
+                log.debug("閫氶亾鍙凤細" + struAIOPVideo.dwChannel);
+                String szMPID = new String(struAIOPVideo.szMPID).trim();//妫�娴嬫ā鍨嬪寘ID
+                log.debug("妫�娴嬫ā鍨嬪寘ID" + szMPID);
+                alarmTime = String.format("%04d", struAIOPVideo.struTime.wYear) + "-" +
+                        String.format("%02d", struAIOPVideo.struTime.wMonth) + "-" +
+                        String.format("%02d", struAIOPVideo.struTime.wDay) + " " +
+                        String.format("%02d", struAIOPVideo.struTime.wHour) + ":" +
+                        String.format("%02d", struAIOPVideo.struTime.wMinute) + ":" +
+                        String.format("%02d", struAIOPVideo.struTime.wSecond);
+                // + "." + String.format("%03d", struAIOPVideo.struTime.wMilliSec);
+                chanNo = struAIOPVideo.dwChannel;
+                switch (szMPID) {
+                    case "H930_MODEL_SPD":
+                        alarmType = "鎶界儫鎵撶數璇�";
+                        break;
+                }
+                //鍥剧墖鏁版嵁淇濆瓨
+                if (struAIOPVideo.dwPictureSize > 0) {
+                    picUrl = saveBinPicToMinio(struAIOPVideo.pBufferPicture, struAIOPVideo.dwPictureSize);
+                }
+                if (camera != null) {
+                    alarmName = "AI瑙嗛妫�娴�";
+                    switch (camera.getGdType()) {
+                        case "3":
+                            superBrainEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, picUrl, facePicUrl);
+                            break;
+                    }
+                }
+                //endregion
                 break;
-            case COMM_ISAPI_ALARM:
-                log.debug("瀹夊叏甯芥娴嬫姤璀︿俊鎭�");
-                //region 瀹夊叏甯芥娴嬫姤璀︿俊鎭�
+            case COMM_ISAPI_ALARM://ISAPI鍗忚鎶ヨ淇℃伅
+                log.debug("ISAPI鍗忚鎶ヨ淇℃伅涓婃姤");
+                //region ISAPI鍗忚鎶ヨ淇℃伅
                 HCNetSDK.NET_DVR_ALARM_ISAPI_INFO struEventISAPI = new HCNetSDK.NET_DVR_ALARM_ISAPI_INFO();
                 struEventISAPI.write();
                 Pointer pEventISAPI = struEventISAPI.getPointer();
                 pEventISAPI.write(0, pAlarmInfo.getByteArray(0, struEventISAPI.size()), 0, struEventISAPI.size());
                 struEventISAPI.read();
-                int dwAlarmDataLen = struEventISAPI.dwAlarmDataLen;
-                int byDataType = struEventISAPI.byDataType;
-                int byPicturesNumber = struEventISAPI.byPicturesNumber;
+                int dwAlarmDataLen = struEventISAPI.dwAlarmDataLen;// 鎶ヨ鏁版嵁闀垮害
+                int byDataType = struEventISAPI.byDataType;// 0-invalid,1-xml,2-json
+                int byPicturesNumber = struEventISAPI.byPicturesNumber;// 鍥剧墖鏁伴噺
+                if (dwAlarmDataLen > 0) {//鎶ヨ鏁版嵁鎵撳嵃
+                    HCNetSDK.BYTE_ARRAY m_strISAPIData = new HCNetSDK.BYTE_ARRAY(struEventISAPI.dwAlarmDataLen);
+                    m_strISAPIData.write();
+                    Pointer pPlateInfo = m_strISAPIData.getPointer();
+                    pPlateInfo.write(0, struEventISAPI.pAlarmData.getByteArray(0, m_strISAPIData.size()), 0, m_strISAPIData.size());
+                    m_strISAPIData.read();
+                    String json = new String(m_strISAPIData.byValue).trim();
+                    // log.debug(new String(m_strISAPIData.byValue).trim() + "\n");
+                    //瑙f瀽JSON鏁版嵁
+                    if (byDataType == 2) {
+                        IsapiAlarm isapiAlarm = JSONObject.parseObject(json, IsapiAlarm.class);
+                        alarmName = "ISAPI鍗忚淇℃伅妫�娴�";
+                        switch (isapiAlarm.getEventType()) {
+                            //case "HFPD":
+                            //chanNo = isapiAlarm.getChannelID();
+                            //alarmType = "楂橀浜哄憳浜嬩欢鎶ヨ";
+                            //picUrl = isapiAlarm.getFaceCapture().get(0).getTargetAttrs().getBkgUrl();
+                            //facePicUrl = isapiAlarm.getFaceCapture().get(0).getFaces().get(0).getURL();
+                            // break;
+                            case "safetyHelmetDetection":
+                                chanNo = isapiAlarm.getChannelID();
+                                alarmType = "瀹夊叏甯戒簨浠舵姤璀�";
+                                alarmTime = fmt.format(isapiAlarm.getDateTime());
+                                //鍥剧墖淇濆瓨
+                                for (int i = 0; i < struEventISAPI.byPicturesNumber; i++) {
+                                    HCNetSDK.NET_DVR_ALARM_ISAPI_PICDATA struPicData = new HCNetSDK.NET_DVR_ALARM_ISAPI_PICDATA();
+                                    struPicData.write();
+                                    Pointer pPicData = struPicData.getPointer();
+                                    pPicData.write(0, struEventISAPI.pPicPackData.getByteArray(i * struPicData.size(), struPicData.size()), 0, struPicData.size());
+                                    struPicData.read();
+                                    switch (i) {
+                                        case 0:
+                                            picUrl = saveBinPicToMinio(struPicData.pPicData, struPicData.dwPicLen);
+                                            break;
+                                        case 1:
+                                            facePicUrl = saveBinPicToMinio(struPicData.pPicData, struPicData.dwPicLen);
+                                            break;
+                                    }
+                                }
+                                if (camera != null) {
+                                    switch (camera.getGdType()) {
+                                        case "3":
+                                            superBrainEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, picUrl, facePicUrl);
+                                            break;
+                                    }
+                                }
+                                break;
+                        }
 
-                //澶勭悊瀹夊叏甯芥娴嬩笂浼犵殑鐓х墖鏁版嵁
-                HCNetSDK.NET_DVR_ALARM_ISAPI_PICDATA struPicData = new HCNetSDK.NET_DVR_ALARM_ISAPI_PICDATA();
-                struPicData.write();
-                Pointer pPicData = struPicData.getPointer();
-                pPicData.write(0, struEventISAPI.pPicPackData.getByteArray(0, struPicData.size()), 0,
-                        struPicData.size());
-                struPicData.read();
-                log.debug("妫�娴嬪埌瀹夊叏甯戒簨浠�");
+                    }
+                }
                 //endregion
                 break;
             case COMM_GISINFO_UPLOAD:
                 log.debug("GPS鎶ヨ淇℃伅涓婃姤(鏆備笉瑙f瀽)");
                 break;
             case COMM_ALARMHOST_CID_ALARM:
-                log.debug("鎶ヨ涓绘満CID鎶ュ憡鎶ヨ涓婃姤");
+                log.debug("鎶ヨ涓绘満CID鎶ュ憡淇℃伅涓婃姤");
                 //region 鎶ヨ涓绘満鎶ヨ澶勭悊
                 HCNetSDK.NET_DVR_CID_ALARM netDvrCidAlarm = new HCNetSDK.NET_DVR_CID_ALARM();
                 netDvrCidAlarm.write();
@@ -464,7 +529,7 @@
                 //endregion
                 break;
             case HCNetSDK.COMM_ALARM_ACS:
-                log.debug("闂ㄧ涓绘満鎶ヨ涓婃姤");
+                log.debug("闂ㄧ涓绘満淇℃伅涓婃姤");
                 //region 闂ㄧ涓绘満鎶ヨ澶勭悊
                 HCNetSDK.NET_DVR_ACS_ALARM_INFO strACSInfo = new HCNetSDK.NET_DVR_ACS_ALARM_INFO();
                 strACSInfo.write();
@@ -495,26 +560,9 @@
                 alarmTime = DateUtils.convertDate(parseAlarmTime(strACSInfo.struTime), "yyyy-M-d H:m:s");
 
                 //浜嬩欢鍥剧墖澶勭悊
-                int dwPicDataLen = strACSInfo.dwPicDataLen;
+                dwPicDataLen = strACSInfo.dwPicDataLen;
                 if (dwPicDataLen > 0) {
-                    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/" + IdUtils.simpleUUID() + ".jpeg";
-                        boolean uploadObject = MinioUtil.uploadObject(bucketName, objectName, input, input.available(), "image/JPEG");
-                        if (uploadObject) {
-                            picUrl = MinioUtil.getBucketObjectUrl(bucketName, objectName);
-                            //log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
-                        }
-                    } catch (Exception e) {
-                        log.error("鍥剧墖淇濆瓨澶辫触");
-                    }
+                    picUrl = saveBinPicToMinio(strACSInfo.pPicData, strACSInfo.dwPicDataLen);
                 }
                 HCNetSDK.NET_DVR_ACS_EVENT_INFO struAcsEventInfo = strACSInfo.struAcsEventInfo;
                 int byType = struAcsEventInfo.byType;
@@ -571,12 +619,115 @@
                 publishMqtt(accessControlHostEventInfo, "accessControl");
                 //endregion
                 break;
+            case COMM_FIREDETECTION_ALARM: //鐏偣妫�娴嬫姤璀�
+                log.debug("鐏偣妫�娴嬩俊鎭笂鎶�");
+                //region 鐏偣妫�娴嬫姤璀�
+                HCNetSDK.NET_DVR_FIREDETECTION_ALARM struFireDecAlarm = new HCNetSDK.NET_DVR_FIREDETECTION_ALARM();
+                struFireDecAlarm.write();
+                Pointer pFireDecAlarm = struFireDecAlarm.getPointer();
+                pFireDecAlarm.write(0, pAlarmInfo.getByteArray(0, struFireDecAlarm.size()), 0, struFireDecAlarm.size());
+                struFireDecAlarm.read();
+                switch (struFireDecAlarm.byAlarmSubType) {
+                    case 0:
+                        alarmType = "鐏偣妫�娴嬫姤璀�";
+                        break;
+                    case 1:
+                        alarmType = "鐑熼浘妫�娴嬫姤璀�";
+                        break;
+                    case 2:
+                        alarmType = "鐑熺伀鎶ヨ ";
+                        break;
+                }
+                //String sFireDecAlarmInfo = "缁濆鏃堕棿锛�" + struFireDecAlarm.dwAbsTime + ",鎶ヨ瀛愮被鍨嬶細" + struFireDecAlarm.byAlarmSubType + ",鐏偣鏈�楂樻俯搴� :" +
+                //        struFireDecAlarm.wFireMaxTemperature + ",鐏偣鐩爣璺濈锛�" + struFireDecAlarm.wTargetDistance;
+                //System.out.println(sFireDecAlarmInfo);
+                //鍥剧墖淇濆瓨
+                if ((struFireDecAlarm.dwPicDataLen > 0) && (struFireDecAlarm.byPicTransType == 0)) {
+                    picUrl = saveBinPicToMinio(struFireDecAlarm.pBuffer, struFireDecAlarm.dwPicDataLen);
+                }
+                chanNo = struFireDecAlarm.dwVisibleChannel;
+                alarmTime = DateUtils.parseTime(struFireDecAlarm.dwAbsTime);//鎶ヨ鏃堕棿
+                if (camera != null) {
+                    alarmName = "鐏劙妫�娴嬩俊鎭笂鎶�";
+                    switch (camera.getGdType()) {
+                        case "3":
+                            superBrainEventHandler(camera, chanNo, alarmName, alarmType, alarmTime, picUrl, facePicUrl);
+                            break;
+                    }
+                }
+                //endregion
+                break;
+            case COMM_ITS_PLATE_RESULT://浜ら�氭姄鎷嶇殑缁堢鍥剧墖涓婁紶
+                log.debug("浜ら�氭姄鎷嶇殑缁堢鍥剧墖涓婃姤(鏆備笉瑙f瀽)");
+                break;
             default:
                 log.debug("鏈煡鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
                 break;
 
         }
         return true;
+    }
+
+    /**
+     * 鐩告満浜嬩欢澶勭悊
+     * 鍒樿嫃涔�
+     * 2023/12/5 12:56:47
+     */
+    public void cameraEventHandler(ArdCameras camera, Integer chanNo, String alarmName, String alarmType, String alarmTime, String picUrl, String faceUrl) {
+        CameraEventInfo cameraEventInfo = new CameraEventInfo();
+        cameraEventInfo.setAlarmName(alarmName);
+        cameraEventInfo.setAlarmTime(alarmTime);
+        cameraEventInfo.setCameraName(camera.getName());
+        cameraEventInfo.setCameraId(camera.getId());
+        cameraEventInfo.setCameraIp(camera.getIp());
+        cameraEventInfo.setCameraPort(camera.getPort());
+        cameraEventInfo.setCameraType(camera.getGdType());
+        cameraEventInfo.setCameraChannel(chanNo);
+        cameraEventInfo.setLongitude(camera.getLongitude());
+        cameraEventInfo.setLatitude(camera.getLatitude());
+        cameraEventInfo.setAlarmType(alarmType);
+        //鍥剧墖瀛樺叆minio
+        if (picUrl.equals("")) {
+            picUrl = snapPicture(cameraEventInfo);
+        }
+        cameraEventInfo.setPicUrl(picUrl);
+        log.debug("澶勭悊閫氱敤鍏夌數浜嬩欢鎶ヨ:銆怤ame銆�" + alarmName + "銆怲ype銆�" + alarmType + "銆怲ime銆�" + alarmTime + "銆怐evice銆�" + camera.getName() + "銆怳rl銆�" + picUrl);
+        publishMqtt(cameraEventInfo, "camera");
+    }
+
+    /**
+     * 瓒呰剳浜嬩欢澶勭悊
+     * 鍒樿嫃涔�
+     * 2023/12/5 12:56:47
+     */
+    public void superBrainEventHandler(ArdCameras camera, Integer chanNo, String alarmName, String alarmType, String alarmTime, String picUrl, String faceUrl) {
+
+        SuperBrainEventInfo superBrainEventInfo = new SuperBrainEventInfo();
+        superBrainEventInfo.setAlarmName(alarmName);
+        superBrainEventInfo.setAlarmType(alarmType);
+        superBrainEventInfo.setAlarmTime(alarmTime);
+        List<ChannelInfo> channelInfoList = GlobalVariable.deviceChanMap.get(camera.getId());//鑾峰彇瓒呰剳鐨勯�氶亾闆嗗悎
+        if (channelInfoList.size() > 0) {
+            if (chanNo > 0) {
+                ChannelInfo channelInfo = channelInfoList.get(chanNo - 1);//鏍规嵁閫氶亾鍙疯幏鍙栭�氶亾淇℃伅
+                if (channelInfo != null) {
+                    Optional<ArdCameras> foundCamera = findArdCameraByIpAndPort(channelInfo.getIp(), channelInfo.getPort());
+                    if (foundCamera.isPresent()) {
+                        camera = foundCamera.get();
+                        superBrainEventInfo.setDeviceId(camera.getId());
+                        superBrainEventInfo.setDeviceName(camera.getName());
+                        superBrainEventInfo.setLongitude(camera.getLongitude());
+                        superBrainEventInfo.setLatitude(camera.getLatitude());
+                        superBrainEventInfo.setAltitude(camera.getAltitude());
+                    }
+                }
+            }
+        }
+        superBrainEventInfo.setChanNo(chanNo);
+        superBrainEventInfo.setPicUrl(picUrl);
+        superBrainEventInfo.setFaceUrl(faceUrl);
+        log.debug("澶勭悊瓒呰剳浜嬩欢鎶ヨ:銆怤ame銆�" + alarmName + "銆怲ype銆�" + alarmType + "銆怲ime銆�" + alarmTime + "銆怐evice銆�" + camera.getName() + "銆怳rl銆�" + picUrl + "銆恌aceUrl銆�" + faceUrl);
+        publishMqtt(superBrainEventInfo, "superBrain");
     }
 
     /**
@@ -604,7 +755,6 @@
                 .filter(camera -> camera.getIp().equals(ip) && camera.getPort() == port)
                 .findFirst();
     }
-
 
     /**
      * 鐩告満鎴浘
@@ -689,4 +839,29 @@
         int bySecond = netDvrTimeEx.dwSecond;
         return wYear + "-" + byMonth + "-" + byDay + " " + byHour + ":" + byMinute + ":" + bySecond;
     }
+
+    //浜岃繘鍒跺浘鐗囨帴鏀跺啓鍏inio杩斿洖url
+    private String saveBinPicToMinio(Pointer picData, int picDataLen) {
+        String picUrl = "";
+        try {
+            //灏嗗瓧鑺傚啓鍏ユ枃浠�
+            long offset = 0;
+            ByteBuffer buffers = picData.getByteBuffer(offset, picDataLen);
+            byte[] bytes = new byte[picDataLen];
+            buffers.rewind();
+            buffers.get(bytes);
+            InputStream input = new ByteArrayInputStream(bytes);
+            String bucketName = "pic";
+            String objectName = "alarm/" + IdUtils.simpleUUID() + ".jpeg";
+            boolean uploadObject = MinioUtil.uploadObject(bucketName, objectName, input, picDataLen, "image/JPEG");
+            if (uploadObject) {
+                picUrl = MinioUtil.getBucketObjectUrl(bucketName, objectName);
+                //log.debug("涓婁紶鏂囦欢鎴愬姛!" + picUrl);
+            }
+        } catch (Exception e) {
+            log.error("鍥剧墖淇濆瓨澶辫触:" + e.getMessage());
+        }
+        return picUrl;
+    }
+
 }

--
Gitblit v1.9.3