From cb4a08d7d9fcaeeddb4bf2d2879fd50b028cc249 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 22 八月 2023 14:30:43 +0800
Subject: [PATCH] 图片路径优化
---
src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 d52f8ae..4711ad1 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
@@ -17,6 +17,7 @@
import com.ard.utils.other.DateUtils;
import com.ard.utils.other.SpringTool;
import com.ard.utils.mqtt.MqttConsumer;
+import com.ard.utils.uuid.IdUtils;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
@@ -111,7 +112,7 @@
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);
@@ -271,6 +272,7 @@
break;
case HCNetSDK.COMM_ALARM_ACS:
//region 闂ㄧ涓绘満鎶ヨ澶勭悊
+ log.debug("闂ㄧ涓绘満鎶ヨ涓婁紶");
ArdEquipExternal accessControlHost = new ArdEquipExternal();
accessControlHost.setIp(sDeviceIP);
accessControlHost.setPort(wLinkPort);
@@ -289,13 +291,12 @@
// log.debug("闈炰簨浠舵姤璀︽暟鎹笂鎶�(鏆備笉瑙ｆ瀽)");
break;
}
+
int dwMinor = strACSInfo.dwMinor;
if (dwMinor != 80 && dwMinor != 104) {
//鍙В鏋愮湡浜烘娴嬪け璐ュ拰浜鸿劯鎶撴媿澶辫触鐨勬绫诲瀷浜嬩欢
break;
}
-// log.info("闂ㄧ涓绘満鎶ヨ涓婁紶");
-// log.info("銆愪富绫诲瀷銆戜簨浠�");
String alarmType = "";
switch (dwMinor) {
case 104:
@@ -305,13 +306,12 @@
alarmType = "浜鸿劯鎶撴媿澶辫触";
break;
}
+ log.debug("銆愪富绫诲瀷銆戜簨浠�"+alarmType);
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;
@@ -321,7 +321,7 @@
buffers.get(bytes);
InputStream input = new ByteArrayInputStream(bytes);
String bucketName = "pic";
- String objectName = "alarm_" + newName + ".jpeg";
+ String objectName = "alarm/" + IdUtils.simpleUUID() + ".jpeg";
boolean uploadObject = MinioUtils.uploadObject(bucketName, objectName, input, "image/JPEG");
if (uploadObject) {
url = MinioClientSingleton.domainUrl + "/" + bucketName + "/" + objectName;
@@ -408,8 +408,7 @@
cmd.setCameraId(Cameras.getId());
cmd.setChannelNum(info.getCameraChannel());
cmd.setBucketName("pic");
- String UUID = java.util.UUID.randomUUID().toString().replace("-", "");
- String filename = info.getCameraName() + "/" + info.getAlarmType() + "/" + UUID + ".jpg";
+ String filename = "alarm" + "/" + IdUtils.simpleUUID() + ".jpg";
cmd.setObjectName(filename);
String url = HikClientUtil.picCutCate(cmd);
return url;
--
Gitblit v1.9.3