From 893c1ef4c42b9e158d95c22172d332d328efd829 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 19 九月 2023 10:10:13 +0800
Subject: [PATCH] 增加三场数字化推送mqtt
---
src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 4711ad1..9ee1b35 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
@@ -6,17 +6,16 @@
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.minio.MinioUtil;
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.util.hikSdkUtil.HCNetSDK;
-import com.ard.utils.hiksdk.util.minio.MinioUtils;
import com.ard.utils.other.DateUtils;
-import com.ard.utils.other.SpringTool;
import com.ard.utils.mqtt.MqttConsumer;
+import com.ard.utils.spring.SpringUtils;
import com.ard.utils.uuid.IdUtils;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
@@ -61,7 +60,7 @@
ArdCameras ardCameras = new ArdCameras();
ardCameras.setIp(sDeviceIP);
ardCameras.setPort(wLinkPort);
- IArdCamerasService ardCamerasService = SpringTool.getApplicationContext().getBean(IArdCamerasService.class);
+ IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
ArdCameras camera = ardCamerasService.selectArdCamerasList(ardCameras).get(0);
HCNetSDK.NET_DVR_ALARMINFO_V30 netDvrAlarminfoV30 = new HCNetSDK.NET_DVR_ALARMINFO_V30();
netDvrAlarminfoV30.write();
@@ -95,7 +94,7 @@
ardCameras = new ArdCameras();
ardCameras.setIp(sDeviceIP);
ardCameras.setPort(wLinkPort);
- ardCamerasService = SpringTool.getApplicationContext().getBean(IArdCamerasService.class);
+ ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
ArdCameras ardCamera = ardCamerasService.selectArdCamerasList(ardCameras).get(0);
HCNetSDK.NET_VCA_RULE_ALARM strVcaAlarm = new HCNetSDK.NET_VCA_RULE_ALARM();
@@ -190,7 +189,7 @@
ArdEquipExternal ardEquipExternal = new ArdEquipExternal();
ardEquipExternal.setIp(sDeviceIP);
ardEquipExternal.setPort(wLinkPort);
- IArdEquipExternalService ardEquipExternalService = SpringTool.getApplicationContext().getBean(IArdEquipExternalService.class);
+ IArdEquipExternalService ardEquipExternalService = SpringUtils.getBean(IArdEquipExternalService.class);
ardEquipExternal = ardEquipExternalService.selectArdEquipExternal(ardEquipExternal);
@@ -272,11 +271,11 @@
break;
case HCNetSDK.COMM_ALARM_ACS:
//region 闂ㄧ涓绘満鎶ヨ澶勭悊
- log.debug("闂ㄧ涓绘満鎶ヨ涓婁紶");
+
ArdEquipExternal accessControlHost = new ArdEquipExternal();
accessControlHost.setIp(sDeviceIP);
accessControlHost.setPort(wLinkPort);
- ardEquipExternalService = SpringTool.getApplicationContext().getBean(IArdEquipExternalService.class);
+ ardEquipExternalService = SpringUtils.getBean(IArdEquipExternalService.class);
accessControlHost = ardEquipExternalService.selectArdEquipExternal(accessControlHost);
HCNetSDK.NET_DVR_ACS_ALARM_INFO strACSInfo = new HCNetSDK.NET_DVR_ACS_ALARM_INFO();
@@ -306,7 +305,7 @@
alarmType = "浜鸿劯鎶撴媿澶辫触";
break;
}
- log.debug("銆愪富绫诲瀷銆戜簨浠�"+alarmType);
+ log.debug("闂ㄧ涓绘満鎶ヨ涓婁紶:"+alarmType);
String alarmTime = DateUtils.convertDate(parseAlarmTime(strACSInfo.struTime), "yyyy-M-d H:m:s");
//浜嬩欢鍥剧墖澶勭悊
@@ -322,9 +321,9 @@
InputStream input = new ByteArrayInputStream(bytes);
String bucketName = "pic";
String objectName = "alarm/" + IdUtils.simpleUUID() + ".jpeg";
- boolean uploadObject = MinioUtils.uploadObject(bucketName, objectName, input, "image/JPEG");
+ boolean uploadObject = MinioUtil.uploadObject(bucketName, objectName, input,input.available(), "image/JPEG");
if (uploadObject) {
- url = MinioClientSingleton.domainUrl + "/" + bucketName + "/" + objectName;
+ url = MinioUtil.getBucketObjectUrl(bucketName, objectName);
//log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
}
} catch (Exception e) {
--
Gitblit v1.9.3