From 6f34a6a7e99d4015cd5e8bc3669eea9107ac5837 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 24 八月 2023 10:42:50 +0800
Subject: [PATCH] 开启防盗电定时器
---
src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java b/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
index 02e1fe5..2bb03b3 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
@@ -3,12 +3,12 @@
import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.camera.domain.CameraCmd;
import com.ard.alarm.external.domain.ArdEquipExternal;
-import com.ard.config.MinioClientSingleton;
+import com.ard.utils.minio.MinioUtils;
import com.ard.utils.other.ByteUtils;
import com.ard.utils.hiksdk.common.GlobalVariable;
import com.ard.utils.hiksdk.domain.DeviceInfo;
import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
-import com.ard.utils.hiksdk.util.minio.MinioUtils;
+import com.ard.utils.spring.SpringUtils;
import com.sun.jna.Native;
import com.sun.jna.Platform;
import com.sun.jna.Pointer;
@@ -434,12 +434,11 @@
InputStream input = new ByteArrayInputStream(array);
String url = "";
try {
- boolean b = MinioUtils.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input, ContentType);
+ MinioUtils minioUtil = SpringUtils.getBean(MinioUtils.class);
+ boolean b = minioUtil.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input,input.available(), ContentType);
if (b) {
- // url = MinioUtils.getBucketObjectUrl(cmd.getBucketName(), cmd.getObjectName());
- // url = url.indexOf('?') != -1 ? url.substring(0, url.indexOf('?')) : url;
- url = MinioClientSingleton.domainUrl + "/" + cmd.getBucketName() + "/" + cmd.getObjectName();
- log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
+ url = minioUtil.getBucketObjectUrl(cmd.getBucketName(), cmd.getObjectName());
+ // log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
}
} catch (Exception ex) {
log.error("涓婁紶鏂囦欢寮傚父锛�" + ex.getMessage());
--
Gitblit v1.9.3