Merge remote-tracking branch 'origin/master'

Administrator

2023-08-23 f97d74f9f851ef70048fab599d7bc54d7932afc7

 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java

@@ -1,15 +1,13 @@
package com.ruoyi.device.hiksdk.service.impl;

import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.annotation.SdkOperate;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.channel.domain.ArdChannel;
import com.ruoyi.device.channel.service.IArdChannelService;
import com.ruoyi.device.hiksdk.common.GlobalVariable;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
import com.ruoyi.device.hiksdk.util.hikSdkUtil.GisUtil;
import com.ruoyi.device.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.ruoyi.device.hiksdk.service.IHikClientService;
@@ -21,7 +19,7 @@
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.util.Base64;
@@ -32,7 +30,6 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

import static com.ruoyi.device.hiksdk.util.hikSdkUtil.HCNetSDK.*;

@@ -47,8 +44,12 @@
@Service
public class HikClientServiceImpl implements IHikClientService {

    @Value("${minio.endpoint}")
    private static String endpoint;
    @Resource
    IArdCamerasService ardCamerasService;
    private IArdCamerasService ardCamerasService;
    @Resource
    private MinioUtils minioUtil;

    private static HCNetSDK hCNetSDK;

@@ -1149,16 +1150,14 @@
            byte[] array = jpegBuffer.array();
            //存储到minio
            String BucketName = "pic";
            String uuid = UUID.randomUUID().toString().replace("-", "");
            String time = new SimpleDateFormat("yyyyMMdd").format(new Date());
            String ObjectName = time + "/" + uuid + ".jpeg";
            String ObjectName = "capture/" + IdUtils.simpleUUID() + ".jpeg";
            String ContentType = "image/JPEG";
            InputStream input = new ByteArrayInputStream(array);
            String url = "";
            try {
                boolean b = MinioUtils.uploadObject(BucketName, ObjectName, input, input.available(), ContentType);
                boolean b = minioUtil.uploadObject(BucketName, ObjectName, input, input.available(), ContentType);
                if (b) {
                    url = MinioUtils.getBucketObjectUrl(BucketName, ObjectName);
                    url = minioUtil.getBucketObjectUrl(BucketName, ObjectName);
                    log.debug("上传文件成功!" + url);
                }
            } catch (IOException ex) {
@@ -1342,9 +1341,9 @@
            FileInputStream stream = new FileInputStream(path);
            String time = new SimpleDateFormat("yyyyMMdd").format(new Date());
            String recordName = cameraId + "/" + time + "/" + ObjectName + ".mp4";
            boolean b = MinioUtils.uploadObject(BucketName, recordName, stream, stream.available(), ContentType);
            boolean b = minioUtil.uploadObject(BucketName, recordName, stream, stream.available(), ContentType);
            if (b) {
                url = MinioClientSingleton.domainUrl + "/" + BucketName + "/" + recordName;
                url = endpoint + "/" + BucketName + "/" + recordName;
                log.debug("上传文件成功!" + url);
            }
            return url;