From 0821887bbcfe49328dc676adab058f7e94d0e27d Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 13 九月 2023 14:56:37 +0800
Subject: [PATCH] 修复雷达报警投影距离 取消雷达坐标转84坐标
---
src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java | 7
src/main/java/com/ard/utils/minio/MinioConfig.java | 27 ++--
src/main/java/com/ard/utils/minio/MinioUtil.java | 240 +++++++++++++++++++++++++----------------------
src/main/java/com/ard/alarm/apponekey/controller/ArdAlarmApponekeyController.java | 6
src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java | 11 +-
5 files changed, 150 insertions(+), 141 deletions(-)
diff --git a/src/main/java/com/ard/alarm/apponekey/controller/ArdAlarmApponekeyController.java b/src/main/java/com/ard/alarm/apponekey/controller/ArdAlarmApponekeyController.java
index c9428ee..d01aafb 100644
--- a/src/main/java/com/ard/alarm/apponekey/controller/ArdAlarmApponekeyController.java
+++ b/src/main/java/com/ard/alarm/apponekey/controller/ArdAlarmApponekeyController.java
@@ -1,7 +1,7 @@
package com.ard.alarm.apponekey.controller;
import com.ard.utils.http.AjaxResult;
-import com.ard.utils.minio.MinioUtils;
+import com.ard.utils.minio.MinioUtil;
import org.springframework.web.bind.annotation.*;
import com.ard.alarm.apponekey.domain.ArdAlarmApponekey;
import com.ard.alarm.apponekey.service.IArdAlarmApponekeyService;
@@ -20,14 +20,12 @@
public class ArdAlarmApponekeyController {
@Resource
private IArdAlarmApponekeyService ardAlarmApponekeyService;
- @Resource
- private MinioUtils minioUtil;
/**
* 鏂板app涓�閿姤璀�
*/
@PostMapping
public AjaxResult add(String userId,String name, Double longitude,Double latitude,Double altitude,MultipartFile file) {
- String url = minioUtil.putObjectAndGetUrl("record", file);
+ String url = MinioUtil.putObjectAndGetUrl("record", file);
ArdAlarmApponekey ardAlarmApponekey =new ArdAlarmApponekey();
ardAlarmApponekey.setUserId(userId);
ardAlarmApponekey.setName(name);
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 d0cae9d..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,7 +6,7 @@
import com.ard.alarm.camera.service.IArdCamerasService;
import com.ard.alarm.external.domain.ArdEquipExternal;
import com.ard.alarm.external.service.IArdEquipExternalService;
-import com.ard.utils.minio.MinioUtils;
+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;
@@ -290,7 +290,7 @@
// log.debug("闈炰簨浠舵姤璀︽暟鎹笂鎶�(鏆備笉瑙ｆ瀽)");
break;
}
- log.debug("闂ㄧ涓绘満鎶ヨ涓婁紶");
+
int dwMinor = strACSInfo.dwMinor;
if (dwMinor != 80 && dwMinor != 104) {
//鍙В鏋愮湡浜烘娴嬪け璐ュ拰浜鸿劯鎶撴媿澶辫触鐨勬绫诲瀷浜嬩欢
@@ -305,7 +305,7 @@
alarmType = "浜鸿劯鎶撴媿澶辫触";
break;
}
- log.debug("銆愪富绫诲瀷銆戜簨浠�"+alarmType);
+ log.debug("闂ㄧ涓绘満鎶ヨ涓婁紶:"+alarmType);
String alarmTime = DateUtils.convertDate(parseAlarmTime(strACSInfo.struTime), "yyyy-M-d H:m:s");
//浜嬩欢鍥剧墖澶勭悊
@@ -321,10 +321,9 @@
InputStream input = new ByteArrayInputStream(bytes);
String bucketName = "pic";
String objectName = "alarm/" + IdUtils.simpleUUID() + ".jpeg";
- MinioUtils minioUtil = SpringUtils.getBean(MinioUtils.class);
- boolean uploadObject = minioUtil.uploadObject(bucketName, objectName, input,input.available(), "image/JPEG");
+ boolean uploadObject = MinioUtil.uploadObject(bucketName, objectName, input,input.available(), "image/JPEG");
if (uploadObject) {
- url = minioUtil.getBucketObjectUrl(bucketName, objectName);
+ url = MinioUtil.getBucketObjectUrl(bucketName, objectName);
//log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
}
} catch (Exception e) {
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 2bb03b3..143ccdc 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,7 +3,7 @@
import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.camera.domain.CameraCmd;
import com.ard.alarm.external.domain.ArdEquipExternal;
-import com.ard.utils.minio.MinioUtils;
+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.DeviceInfo;
@@ -434,10 +434,9 @@
InputStream input = new ByteArrayInputStream(array);
String url = "";
try {
- MinioUtils minioUtil = SpringUtils.getBean(MinioUtils.class);
- boolean b = minioUtil.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input,input.available(), ContentType);
+ boolean b = MinioUtil.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input,input.available(), ContentType);
if (b) {
- url = minioUtil.getBucketObjectUrl(cmd.getBucketName(), cmd.getObjectName());
+ url = MinioUtil.getBucketObjectUrl(cmd.getBucketName(), cmd.getObjectName());
// log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
}
} catch (Exception ex) {
diff --git a/src/main/java/com/ard/utils/minio/MinioConfig.java b/src/main/java/com/ard/utils/minio/MinioConfig.java
index d5dada5..db8f4aa 100644
--- a/src/main/java/com/ard/utils/minio/MinioConfig.java
+++ b/src/main/java/com/ard/utils/minio/MinioConfig.java
@@ -3,31 +3,30 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
+import org.springframework.context.annotation.Configuration;
/**
* @Description:
- * @ClassName: MinioClientSingleton
+ * @ClassName: MinioInit
* @Author: 鍒樿嫃涔�
- * @Date: 2023骞�05鏈�18鏃�9:32
- * @Version: 1.0
+ * @Date: 2023骞�08鏈�25鏃�14:03:45
**/
+
+@Configuration
@Slf4j(topic = "minio")
-@Component
public class MinioConfig {
+
@Value("${spring.minio.endpoint}")
- private String endpoint;
+ private String endpoint;
@Value("${spring.minio.accessKey}")
- private String accessKey;
+ private String accessKey;
@Value("${spring.minio.secretKey}")
- private String secretKey;
+ private String secretKey;
@Bean
- public io.minio.MinioClient getMinioClient() {
- return io.minio.MinioClient.builder()
- .endpoint(endpoint)
- .credentials(accessKey, secretKey)
- .build();
+ MinioUtil getMinioUtil()
+ {
+ log.info("鍒濆鍖杕inio閰嶇疆"+"銆�"+endpoint+"("+accessKey+"/"+secretKey+")銆�");
+ return new MinioUtil(endpoint,accessKey,secretKey);
}
}
-
diff --git a/src/main/java/com/ard/utils/minio/MinioUtils.java b/src/main/java/com/ard/utils/minio/MinioUtil.java
similarity index 76%
rename from src/main/java/com/ard/utils/minio/MinioUtils.java
rename to src/main/java/com/ard/utils/minio/MinioUtil.java
index d7e5e27..0976a20 100644
--- a/src/main/java/com/ard/utils/minio/MinioUtils.java
+++ b/src/main/java/com/ard/utils/minio/MinioUtil.java
@@ -6,9 +6,7 @@
import io.minio.http.Method;
import io.minio.messages.*;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -19,30 +17,58 @@
import java.util.concurrent.TimeUnit;
/**
- * @Description: Minio瀹㈡埛绔伐鍏风被
- * @ClassName: MinioUtils
+ * @Description: minio宸ュ叿绫�
+ * @ClassName: MinioUtil
* @Author: 鍒樿嫃涔�
- * @Date: 2023骞�05鏈�18鏃�9:34
- * @Version: 1.0
+ * @Date: 2023骞�08鏈�25鏃�14:03:00
**/
-@SuppressWarnings("ALL")
@Slf4j(topic = "minio")
-@Component
-public class MinioUtils {
+public class MinioUtil {
- @Resource
- MinioClient minioClient;
+ private volatile static MinioClient minioClient;
+ public static String domainUrl;
+ public static String accessKey;
+ public static String secretKey;
+
+ private MinioUtil() {
+ }
+
+ public MinioUtil(String domainUrl, String accessKey, String secretKey) {
+ this.domainUrl = domainUrl;
+ this.accessKey = accessKey;
+ this.secretKey = secretKey;
+ creatMinioClient();
+ }
+
+ /**
+ * 鑾峰彇minio瀹㈡埛绔疄渚�
+ *
+ * @return {@link MinioClient}
+ */
+ public static MinioClient creatMinioClient() {
+ if (minioClient == null) {
+ synchronized (MinioUtil.class) {
+ if (minioClient == null) {
+ minioClient = MinioClient.builder()
+ .endpoint(domainUrl)
+ .credentials(accessKey, secretKey)
+ .build();
+ }
+ }
+ }
+ return minioClient;
+ }
/**
* 鍒ゆ柇妗舵槸鍚﹀瓨鍦�
*/
- public boolean exitsBucket(String bucketName) {
+ public static boolean exitsBucket(String bucket) {
boolean found = false;
try {
- if (StringUtils.isEmpty(bucketName)) {
+ if (StringUtils.isEmpty(bucket)) {
return false;
}
- BucketExistsArgs bucketExistsArgs = BucketExistsArgs.builder().bucket(bucketName).build();
+ BucketExistsArgs bucketExistsArgs = BucketExistsArgs.builder().bucket(bucket).build();
found = minioClient.bucketExists(bucketExistsArgs);
} catch (Exception ex) {
@@ -54,23 +80,23 @@
/**
* 鍒涘缓妗�,骞惰缃《绛栫暐涓哄叕鍏�
*/
- public boolean createBucket(String bucketName) {
+ public static boolean createBucket(String bucket) {
try {
- if (StringUtils.isEmpty(bucketName)) {
+ if (StringUtils.isEmpty(bucket)) {
return false;
}
/*鍒涘缓妗�*/
- MakeBucketArgs makeBucketArgs = MakeBucketArgs.builder().bucket(bucketName).build();
+ MakeBucketArgs makeBucketArgs = MakeBucketArgs.builder().bucket(bucket).build();
minioClient.makeBucket(makeBucketArgs);
/*璁剧疆绛栫暐*/
String sb = "{\"Version\":\"2012-10-17\"," +
"\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":" +
"{\"AWS\":[\"*\"]},\"Action\":[\"s3:ListBucket\",\"s3:ListBucketMultipartUploads\"," +
- "\"s3:GetBucketLocation\"],\"Resource\":[\"arn:aws:s3:::" + bucketName +
+ "\"s3:GetBucketLocation\"],\"Resource\":[\"arn:aws:s3:::" + bucket +
"\"]},{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":[\"*\"]},\"Action\":[\"s3:PutObject\",\"s3:AbortMultipartUpload\",\"s3:DeleteObject\",\"s3:GetObject\",\"s3:ListMultipartUploadParts\"],\"Resource\":[\"arn:aws:s3:::" +
- bucketName + "/*\"]}]}";
+ bucket + "/*\"]}]}";
SetBucketPolicyArgs setBucketPolicyArgs = SetBucketPolicyArgs.builder()
- .bucket(bucketName)
+ .bucket(bucket)
.config(sb)
.build();
/*璁剧疆閫氱煡mqtt*/
@@ -89,7 +115,7 @@
queueConfigurations.add(queueConfiguration);
config.setQueueConfigurationList(queueConfigurations);
SetBucketNotificationArgs setBucketNotificationArgs = SetBucketNotificationArgs.builder()
- .bucket(bucketName)
+ .bucket(bucket)
.config(config).build();
minioClient.setBucketPolicy(setBucketPolicyArgs);
minioClient.setBucketNotification(setBucketNotificationArgs);
@@ -106,7 +132,7 @@
*
* @param bucket 妗跺悕绉�
*/
- public boolean removeBucket(String bucket) {
+ public static boolean removeBucket(String bucket) {
try {
boolean found = exitsBucket(bucket);
if (found) {
@@ -134,7 +160,7 @@
*
* @return
*/
- public List<Bucket> getListBuckets() {
+ public static List<Bucket> getListBuckets() {
try {
return minioClient.listBuckets();
} catch (Exception e) {
@@ -147,19 +173,19 @@
* 鐢熸垚涓�涓狦ET璇锋眰鐨勫甫鏈夊け鏁堟椂闂寸殑鍒嗕韩閾炬帴銆�
* 澶辨晥鏃堕棿榛樿鏄�7澶┿��
*
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param objectName 瀛樺偍妗堕噷鐨勫璞″悕绉�
- * @param expires 澶辨晥鏃堕棿锛堜互绉掍负鍗曚綅锛夛紝榛樿鏄�7澶╋紝涓嶅緱澶т簬涓冨ぉ
+ * @param bucket 瀛樺偍妗跺悕绉�
+ * @param object 瀛樺偍妗堕噷鐨勫璞″悕绉�
+ * @param expires 澶辨晥鏃堕棿锛堜互绉掍负鍗曚綅锛夛紝榛樿鏄�7澶╋紝涓嶅緱澶т簬涓冨ぉ
* @return
*/
- public String getObjectWithExpired(String bucketName, String objectName, Integer expires, TimeUnit timeUnit) {
+ public static String getObjectWithExpired(String bucket, String object, Integer expires, TimeUnit timeUnit) {
String url = "";
- if (exitsBucket(bucketName)) {
+ if (exitsBucket(bucket)) {
try {
GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs.builder()
.method(Method.GET)
- .bucket(bucketName)
- .object(objectName)
+ .bucket(bucket)
+ .object(object)
.expiry(expires, timeUnit)
.build();
url = minioClient.getPresignedObjectUrl(getPresignedObjectUrlArgs);
@@ -167,7 +193,7 @@
log.error("minio鐢熸垚澶辨晥url寮傚父", ex.getMessage());
}
} else {
- createBucket(bucketName);
+ createBucket(bucket);
}
return url;
}
@@ -180,20 +206,13 @@
* @鍒涘缓鏃堕棿 2023/5/18 12:16
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
- public String putObjectAndGetUrl(String bucketName, MultipartFile file) {
- if (!exitsBucket(bucketName)) {
- createBucket(bucketName);
+ public static String putObjectAndGetUrl(String bucket, MultipartFile file) {
+ if (!exitsBucket(bucket)) {
+ createBucket(bucket);
}
//鍒ゆ柇鏂囦欢鏄惁涓虹┖
if (null == file || 0 == file.getSize()) {
log.error("涓婁紶minio鏂囦欢鏈嶅姟鍣ㄩ敊璇紝涓婁紶鏂囦欢涓虹┖");
- }
- boolean exsit = exitsBucket(bucketName);
- if (!exsit) {
- boolean bucket = createBucket(bucketName);
- if (bucket) {
- log.info(bucketName + "-妗朵笉瀛樺湪,鎴愬姛鍒涘缓妗�");
- }
}
//鏂囦欢鍚�
String originalFilename = file.getOriginalFilename();
@@ -204,7 +223,7 @@
/*涓婁紶瀵硅薄*/
PutObjectArgs putObjectArgs = PutObjectArgs
.builder()
- .bucket(bucketName)
+ .bucket(bucket)
.object(fileName)
.stream(inputStream, file.getSize(), -1)
.contentType(file.getContentType())
@@ -214,7 +233,7 @@
/*鑾峰彇url*/
GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs
.builder()
- .bucket(bucketName)
+ .bucket(bucket)
.object(fileName)
.method(Method.GET)
.build();
@@ -235,20 +254,13 @@
* @鍒涘缓鏃堕棿 2023/5/18 12:16
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
- public String putObjectAndGetUrl(String bucketName, String folder, MultipartFile file) {
- if (!exitsBucket(bucketName)) {
- createBucket(bucketName);
+ public static String putObjectAndGetUrl(String bucket, String folder, MultipartFile file) {
+ if (!exitsBucket(bucket)) {
+ createBucket(bucket);
}
//鍒ゆ柇鏂囦欢鏄惁涓虹┖
if (null == file || 0 == file.getSize()) {
log.error("涓婁紶minio鏂囦欢鏈嶅姟鍣ㄩ敊璇紝涓婁紶鏂囦欢涓虹┖");
- }
- boolean exsit = exitsBucket(bucketName);
- if (!exsit) {
- boolean bucket = createBucket(bucketName);
- if (bucket) {
- log.info(bucketName + "-妗朵笉瀛樺湪,鎴愬姛鍒涘缓妗�");
- }
}
//鏂囦欢鍚�
String originalFilename = file.getOriginalFilename();
@@ -259,7 +271,7 @@
/*涓婁紶瀵硅薄*/
PutObjectArgs putObjectArgs = PutObjectArgs
.builder()
- .bucket(bucketName)
+ .bucket(bucket)
.object(fileName)
.stream(inputStream, file.getSize(), -1)
.contentType(file.getContentType())
@@ -269,7 +281,7 @@
/*鑾峰彇url*/
GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs
.builder()
- .bucket(bucketName)
+ .bucket(bucket)
.object(fileName)
.method(Method.GET)
.build();
@@ -285,15 +297,15 @@
/**
* 鍒犻櫎鏂囦欢
*
- * @param bucket 妗跺悕绉�
- * @param objectName 瀵硅薄鍚嶇О
+ * @param bucket 妗跺悕绉�
+ * @param object 瀵硅薄鍚嶇О
* @return boolean
*/
- public boolean removeObject(String bucket, String objectName) {
+ public static boolean removeObject(String bucket, String object) {
try {
boolean exsit = exitsBucket(bucket);
if (exsit) {
- RemoveObjectArgs removeObjectArgs = RemoveObjectArgs.builder().bucket(bucket).object(objectName).build();
+ RemoveObjectArgs removeObjectArgs = RemoveObjectArgs.builder().bucket(bucket).object(object).build();
minioClient.removeObject(removeObjectArgs);
return true;
}
@@ -306,14 +318,14 @@
/**
* 鎵归噺鍒犻櫎鏂囦欢
*
- * @param objectNames 瀵硅薄鍚嶇О
+ * @param objectList 瀵硅薄鍚嶇О鍒楄〃
* @return boolean
*/
- public boolean removeObjects(String bucket, List<String> objectNames) {
+ public static boolean removeObjects(String bucket, List<String> objectList) {
if (exitsBucket(bucket)) {
try {
List<DeleteObject> objects = new LinkedList<>();
- for (String str : objectNames) {
+ for (String str : objectList) {
objects.add(new DeleteObject(str));
}
RemoveObjectsArgs removeObjectsArgs = RemoveObjectsArgs.builder().bucket(bucket).objects(objects).build();
@@ -338,7 +350,7 @@
* @param bucket 妗跺悕绉�
* @return {@link List}<{@link String}>
*/
- public List<String> getBucketObjectName(String bucket) {
+ public static List<String> getBucketObjectName(String bucket) {
boolean exsit = exitsBucket(bucket);
if (exsit) {
List<String> listObjetcName = new ArrayList<>();
@@ -359,10 +371,12 @@
/**
* 鑾峰彇鍗曚釜妗朵腑鐨勬墍鏈夋枃浠跺璞″悕绉�
- * @param [bucket,prefix]
+ *
+ * @param bucket 妗跺悕绉�
+ * @param prefix 鍓嶇紑
* @return {@link List}<{@link String}>
*/
- public List<String> getBucketObjectName(String bucket, String prefix) {
+ public static List<String> getBucketObjectName(String bucket, String prefix) {
boolean exsit = exitsBucket(bucket);
if (exsit) {
List<String> listObjetcName = new ArrayList<>();
@@ -384,19 +398,19 @@
/**
* 鑾峰彇鏌愪釜妗朵笅鏌愪釜瀵硅薄鐨刄RL
*
- * @param bucket 妗跺悕绉�
- * @param objectName 瀵硅薄鍚� (鏂囦欢澶瑰悕 + 鏂囦欢鍚�)
+ * @param bucket 妗跺悕绉�
+ * @param object 瀵硅薄鍚� (鏂囦欢澶瑰悕 + 鏂囦欢鍚�)
* @return
*/
- public String getBucketObjectUrl(String bucketName, String objectName) {
+ public static String getBucketObjectUrl(String bucket, String object) {
try {
- if (!exitsBucket(bucketName)) {
+ if (!exitsBucket(bucket)) {
return "";
}
GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs
.builder()
- .bucket(bucketName)
- .object(objectName)
+ .bucket(bucket)
+ .object(object)
.method(Method.GET)
.build();
String presignedObjectUrl = minioClient.getPresignedObjectUrl(getPresignedObjectUrlArgs);
@@ -411,20 +425,20 @@
/**
* 涓婁紶瀵硅薄-stream
*
- * @param bucketName bucket鍚嶇О
- * @param objectName 饨備欢鍚嶇О
+ * @param bucket bucket鍚嶇О
+ * @param object 饨備欢鍚嶇О
* @param stream 饨備欢娴�
* @param size 饧も缉
* @param contextType 绫诲瀷 Image/jpeg 娴忚鍣ㄥ彲浠ョ洿鎺ユ墦寮�锛屽惁鍒欎笅杞�
*/
- public boolean uploadObject(String bucketName, String objectName, InputStream stream, long size, String contextType) {
+ public static boolean uploadObject(String bucket, String object, InputStream stream, long size, String contextType) {
try {
- if (!exitsBucket(bucketName)) {
- createBucket(bucketName);
+ if (!exitsBucket(bucket)) {
+ createBucket(bucket);
}
PutObjectArgs putObjectArgs = PutObjectArgs.builder()
- .bucket(bucketName)
- .object(objectName)
+ .bucket(bucket)
+ .object(object)
.stream(stream, size, -1)
.contentType(contextType)
.build();
@@ -439,20 +453,20 @@
/**
* 涓婁紶瀵硅薄-File
*
- * @param bucketName bucket鍚嶇О
- * @param objectName 饨備欢鍚嶇О
+ * @param bucket bucket鍚嶇О
+ * @param object 饨備欢鍚嶇О
* @param file 饨備欢
* @param contextType 绫诲瀷 Image/jpeg 娴忚鍣ㄥ彲浠ョ洿鎺ユ墦寮�锛屽惁鍒欎笅杞�
*/
- public boolean uploadObject(String bucketName, String objectName, File file, String contextType) {
+ public static boolean uploadObject(String bucket, String object, File file, String contextType) {
try {
- if (!exitsBucket(bucketName)) {
- createBucket(bucketName);
+ if (!exitsBucket(bucket)) {
+ createBucket(bucket);
}
FileInputStream fileInputStream = new FileInputStream(file);
PutObjectArgs putObjectArgs = PutObjectArgs.builder()
- .bucket(bucketName)
- .object(objectName)
+ .bucket(bucket)
+ .object(object)
.stream(fileInputStream, file.length(), -1)
.contentType(contextType)
.build();
@@ -467,20 +481,20 @@
/**
* 涓婁紶瀵硅薄-MultipartFile
*
- * @param bucketName bucket鍚嶇О
- * @param objectName 饨備欢鍚嶇О
- * @param MultipartFile 饨備欢
+ * @param bucket bucket鍚嶇О
+ * @param object 饨備欢鍚嶇О
+ * @param multipartFile 饨備欢
* @param contextType 绫诲瀷 Image/jpeg 娴忚鍣ㄥ彲浠ョ洿鎺ユ墦寮�锛屽惁鍒欎笅杞�
*/
- public boolean uploadObject(String bucketName, String objectName, MultipartFile multipartFile, String contextType) {
+ public static boolean uploadObject(String bucket, String object, MultipartFile multipartFile, String contextType) {
try {
- if (!exitsBucket(bucketName)) {
- createBucket(bucketName);
+ if (!exitsBucket(bucket)) {
+ createBucket(bucket);
}
InputStream inputStream = multipartFile.getInputStream();
PutObjectArgs putObjectArgs = PutObjectArgs.builder()
- .bucket(bucketName)
- .object(objectName)
+ .bucket(bucket)
+ .object(object)
.stream(inputStream, multipartFile.getSize(), -1)
.contentType(contextType)
.build();
@@ -495,15 +509,14 @@
/**
* 涓婁紶瀵硅薄,鐢╩ultipartFile鍚嶇О浣滀负瀵硅薄鍚�
*
- * @param bucketName bucket鍚嶇О
- * @param objectName 饨備欢鍚嶇О
- * @param MultipartFile 饨備欢
+ * @param bucket bucket鍚嶇О
+ * @param multipartFile 饨備欢
* @param contextType 绫诲瀷 Image/jpeg 娴忚鍣ㄥ彲浠ョ洿鎺ユ墦寮�锛屽惁鍒欎笅杞�
*/
- public boolean uploadObject(String bucketName, MultipartFile multipartFile, String contextType) {
+ public static boolean uploadObject(String bucket, MultipartFile multipartFile, String contextType) {
try {
- if (!exitsBucket(bucketName)) {
- createBucket(bucketName);
+ if (!exitsBucket(bucket)) {
+ createBucket(bucket);
}
if (multipartFile == null) {
log.error("涓婁紶鏂囦欢涓虹┖");
@@ -512,7 +525,7 @@
String objectName = multipartFile.getOriginalFilename();
InputStream inputStream = multipartFile.getInputStream();
PutObjectArgs putObjectArgs = PutObjectArgs.builder()
- .bucket(bucketName)
+ .bucket(bucket)
.object(objectName)
.stream(inputStream, multipartFile.getSize(), -1)
.contentType(contextType)
@@ -528,15 +541,15 @@
/**
* 涓婁紶瀵硅薄-閫氳繃鏈湴璺緞
*
- * @param bulkName
- * @param objectName
- * @param localFilePathName
- * @return
+ * @param bucket 妗跺悕绉�
+ * @param object 瀵硅薄鍚嶇О
+ * @param localFilePathName 鏂囦欢璺緞
+ * @return boolean
*/
- public boolean uploadObject(String bucketName, String objectName, String localFilePathName, String contextType) {
+ public static boolean uploadObject(String bucket, String object, String localFilePathName, String contextType) {
try {
- if (!exitsBucket(bucketName)) {
- createBucket(bucketName);
+ if (!exitsBucket(bucket)) {
+ createBucket(bucket);
}
File file = new File(localFilePathName);
if (!file.exists()) {
@@ -544,8 +557,8 @@
return false;
}
UploadObjectArgs uploadObjectArgs = UploadObjectArgs.builder()
- .bucket(bucketName)
- .object(objectName)
+ .bucket(bucket)
+ .object(object)
.filename(localFilePathName)
.contentType(contextType)
.build();
@@ -565,7 +578,7 @@
* @鍒涘缓鏃堕棿 2023/2/6 10:32
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
- public Iterable<Result<Item>> getObjectsByBucket(String bucketName) {
+ public static Iterable<Result<Item>> getObjectsByBucket(String bucketName) {
Iterable<Result<Item>> listObjects = minioClient.listObjects(ListObjectsArgs.builder()
.bucket(bucketName)
.recursive(true)
@@ -575,13 +588,13 @@
/**
* @鎻忚堪 鑾峰彇妗朵腑鎵�鏈夊璞�
- * @鍙傛暟 [bucketName,prefix]
+ * @鍙傛暟 [bucketName, prefix]
* @杩斿洖鍊� java.lang.Iterable<io.minio.Result < io.minio.messages.Item>>
* @鍒涘缓浜� 鍒樿嫃涔�
* @鍒涘缓鏃堕棿 2023/2/6 10:32
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
- public Iterable<Result<Item>> getObjectsByBucket(String bucketName, String prefix) {
+ public static Iterable<Result<Item>> getObjectsByBucket(String bucketName, String prefix) {
Iterable<Result<Item>> listObjects = minioClient.listObjects(ListObjectsArgs.builder()
.bucket(bucketName)
.prefix(prefix)
@@ -589,4 +602,5 @@
.build());
return listObjects;
}
-}
\ No newline at end of file
+
+}
--
Gitblit v1.9.3