From 74c08a504d55ae137004cb44e0145010f62f9585 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 25 八月 2023 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java |  830 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 440 insertions(+), 390 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
index 8ffb5d9..4ed6415 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -1,31 +1,29 @@
 package com.ruoyi.device.hiksdk.service.impl;
 
 import com.ruoyi.common.annotation.SdkOperate;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.constant.sdkPriority;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.device.camera.domain.CameraCmd;
-import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
-import com.ruoyi.device.hiksdk.common.global.globalVariable;
+import com.ruoyi.device.camera.service.IArdCamerasService;
+import com.ruoyi.device.channel.domain.ArdChannel;
+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.domain.recordInfo;
 import com.ruoyi.device.hiksdk.util.hikSdkUtil.GisUtil;
 import com.ruoyi.device.hiksdk.util.hikSdkUtil.HCNetSDK;
 import com.ruoyi.device.hiksdk.service.IHikClientService;
-import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
-import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.device.hiksdk.util.hikSdkUtil.LoginResultCallBack;
+import com.ruoyi.storage.minio.utils.MinioUtils;
 import com.sun.jna.Native;
+import com.sun.jna.NativeLong;
 import com.sun.jna.Platform;
 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 sun.misc.BASE64Encoder;
 
+import java.util.Base64;
 import javax.annotation.Resource;
 import java.io.*;
 import java.math.BigDecimal;
@@ -47,14 +45,14 @@
 @Service
 public class HikClientServiceImpl implements IHikClientService {
 
+    @Value("${minio.endpoint}")
+    private static String endpoint;
     @Resource
-    ArdCamerasMapper ardCamerasMapper;
-
+    private IArdCamerasService ardCamerasService;
     @Resource
-    SysUserMapper sysUserMapper;
+    private MinioUtils minioUtil;
 
     private static HCNetSDK hCNetSDK;
-    private static Map<Integer, recordInfo> user_real_Map = new HashMap<>();
 
     @Override
     public void loadHCNetSDKLib() {
@@ -98,25 +96,25 @@
     }
 
     /**
-     * @鎻忚堪 娉ㄥ唽鐧诲綍
+     * @鎻忚堪 娉ㄥ唽鐧诲綍 鍙敮鎸佸悓姝ョ櫥闄嗭紝涓斿畼鏂逛笉寤鸿鐩存帴鍦ㄦ鎺ュ彛涓嬪啓鑰楁椂鎿嶄綔
      * @鍙傛暟 [dvrLogin]
      * @杩斿洖鍊� java.lang.Integer
      * @鍒涘缓浜� 鍒樿嫃涔�
      * @鍒涘缓鏃堕棿 2023/1/17 16:12
      * @淇敼浜哄拰鍏跺畠淇℃伅
      */
-    @Override
-    public ArdCameras login(ArdCameras camera) {
+    public ArdCameras login1(ArdCameras camera) {
         // 鍒濆鍖�
         if (!hCNetSDK.NET_DVR_Init()) {
             log.error("SDK鍒濆鍖栧け璐�");
         }
         //鎵撳嵃娴峰悍sdk鏃ュ織
         if (Platform.isWindows()) {
+
             String WIN_PATH = System.getProperty("user.dir") + File.separator + "ardLog" + File.separator + "logs" + File.separator;
-            hCNetSDK.NET_DVR_SetLogToFile(3, WIN_PATH, false);
+            hCNetSDK.NET_DVR_SetLogToFile(3, WIN_PATH, true);
         } else {
-            hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog", false);
+            hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog", true);
         }
         String m_sDeviceIP = camera.getIp();
         String m_sUsername = camera.getUsername();
@@ -133,14 +131,65 @@
             hCNetSDK.NET_DVR_Cleanup();
             camera.setLoginId(-1);
         }
-        if (globalVariable.loginMap.containsKey(camera.getId())) {
-            globalVariable.loginMap.remove(camera.getId());
-        }
-        globalVariable.loginMap.put(camera.getId(), lUserID);
-
+        GlobalVariable.loginMap.remove(camera.getId());
+        GlobalVariable.loginMap.put(camera.getId(), lUserID);
         camera.setLoginId(lUserID);
-        camera.setChannel((int) m_strDeviceInfo.byStartChan);
+        camera.setStartDChan((int) m_strDeviceInfo.byStartChan);
         return camera;
+    }
+
+    /**
+     * @鎻忚堪 娉ㄥ唽鐧诲綍 闆嗘垚浜嶯ET_DVR_Login_V30锛屾敮鎸佸悓姝ュ拰寮傛鐧诲綍
+     * @鍙傛暟 [dvrLogin]
+     * @杩斿洖鍊� java.lang.Integer
+     * @鍒涘缓浜� 鍒樿嫃涔�
+     * @鍒涘缓鏃堕棿 2023/1/17 16:12
+     * @淇敼浜哄拰鍏跺畠淇℃伅
+     */
+    @Override
+    public void login(ArdCameras camera) {
+        // 鍒濆鍖�
+        if (!hCNetSDK.NET_DVR_Init()) {
+            log.error("SDK鍒濆鍖栧け璐�");
+        }
+        //鎵撳嵃娴峰悍sdk鏃ュ織
+        if (Platform.isWindows()) {
+            String WIN_PATH = System.getProperty("user.dir") + File.separator + "ardLog" + File.separator + "logs" + File.separator;
+            hCNetSDK.NET_DVR_SetLogToFile(3, WIN_PATH, true);
+        } else {
+            hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog", true);
+        }
+        String m_sDeviceIP = camera.getIp();
+        String m_sUsername = camera.getUsername();
+        String m_sPassword = camera.getPassword();
+        short m_sPort = camera.getPort().shortValue();
+        //璁剧疆杩炴帴鏃堕棿涓庨噸杩炴椂闂�
+        hCNetSDK.NET_DVR_SetConnectTime(2000, 1);
+        hCNetSDK.NET_DVR_SetReconnect(100000, true);
+        //璁惧淇℃伅, 杈撳嚭鍙傛暟
+        HCNetSDK.NET_DVR_DEVICEINFO_V40 m_strDeviceInfo = new HCNetSDK.NET_DVR_DEVICEINFO_V40();
+        HCNetSDK.NET_DVR_USER_LOGIN_INFO m_strLoginInfo = new HCNetSDK.NET_DVR_USER_LOGIN_INFO();
+
+        // 娉ㄥ唽璁惧-鐧诲綍鍙傛暟锛屽寘鎷澶囧湴鍧�銆佺櫥褰曠敤鎴枫�佸瘑鐮佺瓑
+        m_strLoginInfo.sDeviceAddress = new byte[HCNetSDK.NET_DVR_DEV_ADDRESS_MAX_LEN];
+        System.arraycopy(m_sDeviceIP.getBytes(), 0, m_strLoginInfo.sDeviceAddress, 0, m_sDeviceIP.length());
+        m_strLoginInfo.sUserName = new byte[HCNetSDK.NET_DVR_LOGIN_USERNAME_MAX_LEN];
+        System.arraycopy(m_sUsername.getBytes(), 0, m_strLoginInfo.sUserName, 0, m_sUsername.length());
+        m_strLoginInfo.sPassword = new byte[HCNetSDK.NET_DVR_LOGIN_PASSWD_MAX_LEN];
+        System.arraycopy(m_sPassword.getBytes(), 0, m_strLoginInfo.sPassword, 0, m_sPassword.length());
+        m_strLoginInfo.wPort = m_sPort;
+        m_strLoginInfo.byVerifyMode = 0;
+        m_strLoginInfo.byLoginMode = 0;
+        //鏄惁寮傛鐧诲綍锛�0- 鍚︼紝1- 鏄�  windowsSDK閲屾槸true鍜宖alse
+        m_strLoginInfo.bUseAsynLogin = true;
+        //寮傛鐧诲綍鍥炶皟
+        m_strLoginInfo.cbLoginResult = new LoginResultCallBack(camera);
+        m_strLoginInfo.write();
+        int i = hCNetSDK.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo);
+        if (i < 0) {
+            int errorCode = hCNetSDK.NET_DVR_GetLastError();
+            log.error("鐧诲綍寮傚父锛�" + errorCode);
+        }
     }
 
     /**
@@ -152,32 +201,13 @@
      * @淇敼浜哄拰鍏跺畠淇℃伅
      */
     @Override
-    @Async("loginExecutor")
     public void loginAll() {
         try {
             log.debug("鍔犺浇lib瀹屾垚锛�");
-            List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
+            List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
             for (ArdCameras camera : ardCameras) {
-                camera = login(camera);
-                if (camera.getLoginId() >= 0) {
-                    log.info("鐩告満" + camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛锛�" + camera.getLoginId());
-                    ardCamerasMapper.updateArdCameras(camera);
-                } else {
-                    log.info("鐩告満" + camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触锛�" + camera.getLoginId());
-                }
-//                if (!globalVariable.loginMap.containsKey(camera.getId())) {
-//                    camera = login(camera);
-//                    if (camera.getLoginId() >= 0) {
-//                        log.info("鐩告満" + camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛锛�" + camera.getLoginId());
-//                        globalVariable.loginMap.put(camera.getId(), camera.getLoginId());
-//                        ardCamerasService.updateArdCameras(camera);
-//                    } else {
-//                        log.info("鐩告満" + camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触锛�" + camera.getLoginId());
-//                    }
-//                } else {
-//                    Integer userid = globalVariable.loginMap.get(camera.getId());
-//                    log.info("褰撳墠鐩告満:" + camera.getId() + "宸茬櫥褰�,ID:" + userid);
-//                }
+                Thread.sleep(500);
+                login(camera);
             }
         } catch (Exception ex) {
             log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
@@ -194,13 +224,13 @@
      */
     @Override
     public boolean loginOut(String cameraId) {
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         boolean b = hCNetSDK.NET_DVR_Logout(userId);
         if (b) {
-            globalVariable.loginMap.remove(cameraId);
+            GlobalVariable.loginMap.remove(cameraId);
         }
         return b;
     }
@@ -208,17 +238,16 @@
     /**
      * 鏄惁鍦ㄧ嚎
      *
-     * @param cmd
+     * @param cmd 鐩告満鍛戒护
      */
     @Override
     public boolean isOnLine(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
-        boolean isOnLine = hCNetSDK.NET_DVR_RemoteControl(userId, HCNetSDK.NET_DVR_CHECK_USER_STATUS, null, 0);
-        return isOnLine;
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
+        return hCNetSDK.NET_DVR_RemoteControl(userId, HCNetSDK.NET_DVR_CHECK_USER_STATUS, null, 0);
     }
 
     /**
@@ -233,23 +262,23 @@
      */
     @Override
     @SdkOperate
-    public boolean PTZControlWithSpeed(CameraCmd cmd) {
+    public boolean pTZControlWithSpeed(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         boolean enable = cmd.isEnable();
         Integer channelNum = cmd.getChannelNum();
         Integer speed = cmd.getSpeed();
         Integer code = cmd.getCode();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
-        Integer dwStop;
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
+        int dwStop;
         if (enable) {
             dwStop = 0;//寮�鍚�
         } else {
             dwStop = 1;//鍏抽棴
         }
-        Integer dwPTZCommand = -1;
+        int dwPTZCommand = -1;
         switch (code) {
             /*鏂瑰悜*/
             case 1:
@@ -308,7 +337,7 @@
         boolean bool = hCNetSDK.NET_DVR_PTZControlWithSpeed_Other(userId, channelNum, dwPTZCommand, dwStop, speed);
         if (!bool) {
             int errorCode = hCNetSDK.NET_DVR_GetLastError();
-            log.info("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + errorCode);
+            log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + errorCode);
         }
         return bool;
     }
@@ -316,7 +345,7 @@
     /**
      * 璁剧疆鑱氱劍鍊�
      *
-     * @param cmd
+     * @param cmd 鐩告満鍛戒护
      */
     @Override
     @SdkOperate
@@ -324,10 +353,10 @@
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
         Integer dwFocusPos = cmd.getDwFocusPos();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
 
         NET_DVR_FOCUSMODE_CFG focusmodeCfg = new NET_DVR_FOCUSMODE_CFG();
         Pointer point = focusmodeCfg.getPointer();
@@ -336,7 +365,7 @@
         boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, focusmodeCfg.size(), ibrBytesReturned);
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("璁剧疆鑱氱劍鍊煎け璐�,璇风◢鍚庨噸璇�" + code);
+            log.error("璁剧疆鑱氱劍鍊煎け璐�,璇风◢鍚庨噸璇�" + code);
         }
         return bool;
     }
@@ -344,17 +373,17 @@
     /**
      * 鑾峰彇鑱氱劍鍊�
      *
-     * @param cmd
+     * @param cmd 鐩告満鍛戒护
      */
     @Override
     public Map<String, Object> getFocusPos(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
 
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return new HashMap<>();
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
 
         NET_DVR_FOCUSMODE_CFG focusmodeCfg = new NET_DVR_FOCUSMODE_CFG();
         Pointer point = focusmodeCfg.getPointer();
@@ -369,7 +398,7 @@
             return map;
         } else {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("鑾峰彇鑱氱劍鍊煎け璐�,璇风◢鍚庨噸璇�" + code);
+            log.debug("鑾峰彇鑱氱劍鍊煎け璐�,璇风◢鍚庨噸璇�" + code);
             return new HashMap<>();
         }
     }
@@ -377,7 +406,7 @@
     /**
      * 璁剧疆棰勭疆鐐�
      *
-     * @param cmd
+     * @param cmd 鐩告満鍛戒护
      */
     @Override
     @SdkOperate
@@ -385,14 +414,14 @@
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
         Integer PresetIndex = cmd.getPresetIndex();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         boolean bool = hCNetSDK.NET_DVR_PTZPreset_Other(userId, channelNum, SET_PRESET, PresetIndex);
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("棰勭疆鐐硅缃け璐�,璇风◢鍚庨噸璇�" + code);
+            log.error("棰勭疆鐐硅缃け璐�,璇风◢鍚庨噸璇�" + code);
         }
         return bool;
     }
@@ -400,7 +429,7 @@
     /**
      * 杞埌棰勭疆鐐�
      *
-     * @param cmd
+     * @param cmd 鐩告満鍛戒护
      */
     @Override
     @SdkOperate
@@ -408,14 +437,14 @@
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
         Integer PresetIndex = cmd.getPresetIndex();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         boolean bool = hCNetSDK.NET_DVR_PTZPreset_Other(userId, channelNum, GOTO_PRESET, PresetIndex);
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("棰勭疆鐐硅缃け璐�,璇风◢鍚庨噸璇�" + code);
+            log.error("棰勭疆鐐硅缃け璐�,璇风◢鍚庨噸璇�" + code);
         }
         return bool;
     }
@@ -432,10 +461,10 @@
     public String getVideoResolution(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return " ";
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
 
         String ResResolution = "";
         NET_DVR_COMPRESSIONCFG_V30 resolution = new NET_DVR_COMPRESSIONCFG_V30();
@@ -447,8 +476,8 @@
             if (bool) {
                 resolution.read();
                 //瑙嗛杈撳嚭鍙e垎杈ㄧ巼锛�0- 1024x768锛�1- 1280x720锛�2-1280x1024锛�3- 1680x1050锛�4- 1920x1080锛�5- 3840*2160
-                byte byStreamType = resolution.struNormHighRecordPara.byStreamType;
-                int dwVideoBitrate = resolution.struNormHighRecordPara.dwVideoBitrate;
+//                byte byStreamType = resolution.struNormHighRecordPara.byStreamType;
+//                int dwVideoBitrate = resolution.struNormHighRecordPara.dwVideoBitrate;
                 int byResolution = resolution.struNormHighRecordPara.byResolution;
                 switch (byResolution) {
                     case 0:
@@ -517,7 +546,7 @@
                 }
             } else {
                 int code = hCNetSDK.NET_DVR_GetLastError();
-                System.out.println("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + code);
+                log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + code);
             }
         } catch (Exception ex) {
             log.error(ex.getMessage());
@@ -526,7 +555,6 @@
     }
 
     /**
-     * @return
      * @鎻忚堪 鑾峰彇ptz淇℃伅
      * @鍙傛暟 [userId, channelNum]
      * @杩斿洖鍊� boolean
@@ -538,10 +566,10 @@
     public Map<String, Object> getPtz(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return null;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
 
         NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
         Pointer pioint = m_ptzPosCurrent.getPointer();
@@ -550,7 +578,7 @@
         boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, HCNetSDK.NET_DVR_GET_PTZPOS, channelNum, pioint, m_ptzPosCurrent.size(), ibrBytesReturned);
         if (bool) {
             m_ptzPosCurrent.read();
-            DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
+            // DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
             //16杩涘埗杞琁nteger鍚庨櫎10锛屼繚鐣欏皬鏁扮偣1浣�
             //瀹為檯鏄剧ず鐨凱TZ鍊兼槸鑾峰彇鍒扮殑鍗佸叚杩涘埗鍊肩殑鍗佸垎涔嬩竴锛�
             //濡傝幏鍙栫殑姘村钩鍙傛暟P鐨勫�兼槸0x1750锛屽疄闄呮樉绀虹殑P鍊间负175搴︼紱
@@ -562,7 +590,7 @@
             double p = b.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
             double t = c.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
             double z = d.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
-            log.debug("T鍨傜洿鍙傛暟涓�: " + p + "P姘村钩鍙傛暟涓�: " + t + "Z鍙樺�嶅弬鏁颁负: " + z);
+            //log.debug("T鍨傜洿鍙傛暟涓�: " + p + "P姘村钩鍙傛暟涓�: " + t + "Z鍙樺�嶅弬鏁颁负: " + z);
             Map<String, Object> ptzMap = new HashMap<>();
             ptzMap.put("p", p);
             ptzMap.put("t", t);
@@ -570,8 +598,8 @@
             return ptzMap;
         } else {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + code);
-            return null;
+            log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + code);
+            return new HashMap<>();
         }
 
     }
@@ -590,16 +618,16 @@
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
         Map<String, Double> ptz = cmd.getPtzMap();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
         m_ptzPosCurrent.wAction = 1;
         try {
-            String p = String.valueOf((int) ((double) ptz.get("p") * 10));
-            String t = String.valueOf((int) ((double) ptz.get("t") * 10));
-            String z = String.valueOf((int) ((double) ptz.get("z") * 10));
+            String p = String.valueOf((int) (ptz.get("p") * 10));
+            String t = String.valueOf((int) (ptz.get("t") * 10));
+            String z = String.valueOf((int) (ptz.get("z") * 10));
             m_ptzPosCurrent.wPanPos = (short) (Integer.parseInt(p, 16));
             m_ptzPosCurrent.wTiltPos = (short) (Integer.parseInt(t, 16));
             m_ptzPosCurrent.wZoomPos = (short) (Integer.parseInt(z, 16));
@@ -608,7 +636,7 @@
             boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_PTZPOS, channelNum, point, m_ptzPosCurrent.size());
             if (!bool) {
                 int code = hCNetSDK.NET_DVR_GetLastError();
-                log.info("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
+                log.error("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
             }
             return bool;
         } catch (Exception ex) {
@@ -619,17 +647,18 @@
 
     @Override
     @SdkOperate
-    public boolean setTargetPosition(CameraCmd cmd) {
+    public boolean guideTargetPosition(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
         m_ptzPosCurrent.wAction = 1;
         try {
-            double[] cameraPositon = cmd.getCamPosition();
+            ArdCameras cameras = ardCamerasService.selectArdCamerasById(cameraId);
+            double[] cameraPositon = new double[]{cameras.getLongitude(), cameras.getLatitude(), cameras.getAltitude()};
             double[] targetPositions = cmd.getTargetPosition();
             double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPositon, targetPositions, 20, 150);
             String p = String.valueOf((int) (cameraPTZ[0] * 10));
@@ -643,11 +672,11 @@
             boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_PTZPOS, channelNum, point, m_ptzPosCurrent.size());
             if (!bool) {
                 int code = hCNetSDK.NET_DVR_GetLastError();
-                log.info("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
+                log.error("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
             }
             return bool;
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error("寮曞寮傚父:" + ex.getMessage());
             return false;
         }
     }
@@ -661,64 +690,36 @@
      * @淇敼浜哄拰鍏跺畠淇℃伅 0-瑙i攣 1-閿佸畾
      */
     @Override
+    @SdkOperate
     public boolean controlLock(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();//鐢宠閿佺殑鐩告満
-        ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(cameraId);
-        if (StringUtils.isNull(ardCameras)) {
-            return false;//鎵句笉鍒扮浉鏈烘嫆缁濇搷鎺�
-        }
-        Integer expired = cmd.getExpired();//鐢宠鎺у埗鏃堕暱
+        ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
+        Date now = new Date();
+        now.setTime(now.getTime() + cmd.getExpired() * 1000);
+        ardCameras.setOperatorExpired(now);//璁剧疆褰撳墠杩囨湡鏃堕棿
+        ardCamerasService.updateArdCameras(ardCameras);
+        return true;
+    }
+
+    /**
+     * @鎻忚堪 鎿嶆帶瑙i攣
+     * @鍙傛暟 [userId, channelNum]
+     * @杩斿洖鍊� boolean
+     * @鍒涘缓浜� 鍒樿嫃涔�
+     * @鍒涘缓鏃堕棿 2023/6/30 15:36
+     * @淇敼浜哄拰鍏跺畠淇℃伅
+     */
+    @Override
+    public boolean controlUnLock(CameraCmd cmd) {
+        String cameraId = cmd.getCameraId();//鐢宠瑙i攣鐨勭浉鏈�
         String operator = cmd.getOperator();//鐢宠鑰�
-        String currentOperator = ardCameras.getOperatorId();//鐩告満褰撳墠鎺у埗鑰�
-        Date currentExpired = ardCameras.getOperatorExpired();//鐩告満褰撳墠杩囨湡鏃堕棿
-        if (currentExpired == null) {
-            //璁剧疆褰撳墠鎿嶄綔鐢ㄦ埛ID
-            ardCameras.setOperatorId(operator);
-            //璁剧疆褰撳墠杩囨湡鏃堕棿
-            Date now = new Date();
-            now.setTime(now.getTime() + expired * 1000 * 60);
-            ardCameras.setOperatorExpired(now);
-            ardCamerasMapper.updateArdCameras(ardCameras);
-        } else {
-            //濡傛灉杩囨湡鏃堕棿鏈夊��
-            //濡傛灉鏄湰浜虹洿鎺ヤ慨鏀�
-            if (currentOperator.equals(operator)) {
-                //璁剧疆褰撳墠杩囨湡鏃堕棿
-                Date now = new Date();
-                now.setTime(now.getTime() + expired * 1000 * 60);
-                ardCameras.setOperatorExpired(now);
-                ardCamerasMapper.updateArdCameras(ardCameras);
-            } else {
-                //濡傛灉闈炴湰浜烘瘮杈冧紭鍏堢骇
-                Integer currentLevel = 0;//褰撳墠鎿嶄綔鑰呯殑浼樺厛绾�
-                if (sdkPriority.priorityMap.containsKey(currentOperator)) {
-                    /*褰撳墠鎺у埗鑰呬负绯荤粺鎶ヨ鐢ㄦ埛*/
-                    currentLevel = (Integer) sdkPriority.priorityMap.get(currentOperator);
-                } else {
-                    /*褰撳墠鎺у埗鑰呬负鏅�氱敤鎴�*/
-                    SysUser sysUser = sysUserMapper.selectUserById(currentOperator);
-                    currentLevel = sysUser.getCameraPriority();
-                }
-                Integer operatorLevel = 0;//鑾峰彇鐢宠鑰呯殑浼樺厛绾�
-                if (sdkPriority.priorityMap.containsKey(operator)) {
-                    /*鍖呭惈璇存槑褰撳墠鐢宠鎺у埗鑰呬负绯荤粺鎶ヨ鐢ㄦ埛*/
-                    operatorLevel = (Integer) sdkPriority.priorityMap.get(operator);
-                } else {
-                    /*鍚﹀垯鐢宠鎺у埗鑰呬负褰撳墠鐧诲綍鐢ㄦ埛*/
-                    LoginUser loginUser = SecurityUtils.getLoginUser();
-                    SysUser user = loginUser.getUser();//鑾峰彇鐧诲綍鐢ㄦ埛鐨勪俊鎭�
-                    operatorLevel = user.getCameraPriority();
-                }
-                //鍒ゆ柇浼樺厛绾�
-                if (operatorLevel > currentLevel) {
-                    Date now = new Date();
-                    now.setTime(now.getTime() + expired * 60 * 1000);
-                    ardCameras.setOperatorExpired(now);//璁剧疆褰撳墠杩囨湡鏃堕棿
-                    ardCameras.setOperatorId(operator);//璁剧疆褰撳墠鐢ㄦ埛
-                    ardCamerasMapper.updateArdCameras(ardCameras);
-                } else {
-                    return false;//浼樺厛绾т綆鏃犳硶涓婇攣
-                }
+        ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
+        if (ardCameras.getOperatorId().equals(operator)) {
+            //濡傛灉瑙i攣鐩告満鐨勫綋鍓嶇敤鎴锋槸鐢宠鑰咃紝鍒欐竻绌鸿鐩告満鐨勮繃鏈熸椂闂�
+            ardCameras.setOperatorExpired(null);
+            int i = ardCamerasService.updateArdCameras(ardCameras);
+            if (i > 0) {
+                log.debug(cameraId + "--瑙i攣鎴愬姛");
             }
         }
         return true;
@@ -736,10 +737,10 @@
     public int getPTZLockInfo(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return -1;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_PTZ_LOCKCFG netDvrPtzLockcfg = new NET_DVR_PTZ_LOCKCFG();
         Pointer point = netDvrPtzLockcfg.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
@@ -747,12 +748,11 @@
         boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_PTZLOCKCFG, channelNum, point, netDvrPtzLockcfg.size(), ibrBytesReturned);
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("鑾峰彇ptz閿佸畾淇℃伅澶辫触,璇风◢鍚庨噸璇�" + code);
+            log.error("鑾峰彇ptz閿佸畾淇℃伅澶辫触,璇风◢鍚庨噸璇�" + code);
             return -1;
         } else {
             netDvrPtzLockcfg.read();
-            int byWorkMode = netDvrPtzLockcfg.byWorkMode;
-            return byWorkMode;
+            return netDvrPtzLockcfg.byWorkMode;
         }
     }
 
@@ -769,10 +769,10 @@
     public boolean setZeroPtz(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_INITIALPOSITIONCTRL initialpositionctrl = new NET_DVR_INITIALPOSITIONCTRL();
 
         initialpositionctrl.dwSize = initialpositionctrl.size();
@@ -801,10 +801,10 @@
     public Map<String, Object> getPtzScope(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return new HashMap<>();
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_PTZSCOPE m_ptzPosCurrent = new NET_DVR_PTZSCOPE();
         Pointer point = m_ptzPosCurrent.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
@@ -812,7 +812,7 @@
         boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_PTZSCOPE, channelNum, point, m_ptzPosCurrent.size(), ibrBytesReturned);
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
+            log.error("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
             return new HashMap<>();
         } else {
             m_ptzPosCurrent.read();
@@ -850,10 +850,10 @@
         String cameraId = cmd.getCameraId();
         boolean enable = cmd.isEnable();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_CAMERAPARAMCFG_EX struCameraParam = new NET_DVR_CAMERAPARAMCFG_EX();
         Pointer point = struCameraParam.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
@@ -862,7 +862,7 @@
             log.error("鑾峰彇鍓嶇鍙傛暟澶辫触锛岄敊璇爜锛�" + hCNetSDK.NET_DVR_GetLastError());
         }
         struCameraParam.read();
-        log.info("鏄惁寮�鍚�忛浘锛�" + struCameraParam.struDefogCfg.byMode);
+        log.debug("鏄惁寮�鍚�忛浘锛�" + struCameraParam.struDefogCfg.byMode);
 
         NET_DVR_DEFOGCFG defogcfg = new NET_DVR_DEFOGCFG();
         if (enable) {
@@ -876,10 +876,9 @@
         boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, channelNum, point, struCameraParam.size());
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("璁剧疆閫忛浘澶辫触,璇风◢鍚庨噸璇�" + code);
-            return false;
+            log.error("璁剧疆閫忛浘澶辫触,璇风◢鍚庨噸璇�" + code);
         }
-        log.info("璁剧疆閫忛浘鎴愬姛");
+        log.debug("璁剧疆閫忛浘鎴愬姛");
         return bool;
     }
 
@@ -897,10 +896,10 @@
         String cameraId = cmd.getCameraId();
         boolean enable = cmd.isEnable();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_CAMERAPARAMCFG_EX struDayNigh = new NET_DVR_CAMERAPARAMCFG_EX();
         Pointer point = struDayNigh.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
@@ -909,7 +908,7 @@
             log.error("鑾峰彇鍓嶇鍙傛暟澶辫触锛岄敊璇爜锛�" + hCNetSDK.NET_DVR_GetLastError());
         }
         struDayNigh.read();
-        log.info("鏄惁寮�鍚瑙嗭細" + struDayNigh.struDayNight.byDayNightFilterType);
+        log.debug("鏄惁寮�鍚瑙嗭細" + struDayNigh.struDayNight.byDayNightFilterType);
 
         NET_DVR_DAYNIGHT daynight = new NET_DVR_DAYNIGHT();
         if (enable) {
@@ -925,10 +924,9 @@
         boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, channelNum, point, struDayNigh.size());
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("璁剧疆澶滆澶辫触,璇风◢鍚庨噸璇�" + code);
-            return false;
+            log.error("璁剧疆澶滆澶辫触,璇风◢鍚庨噸璇�" + code);
         }
-        log.info("璁剧疆澶滆鎴愬姛");
+        log.debug("璁剧疆澶滆鎴愬姛");
         return bool;
     }
 
@@ -946,19 +944,19 @@
         String cameraId = cmd.getCameraId();
         boolean enable = cmd.isEnable();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
         Pointer point = struFocusMode.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
         boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, struFocusMode.size(), ibrBytesReturned);
         if (!b_GetCameraParam) {
-            System.out.println("鑾峰彇鍓嶇鍙傛暟澶辫触锛岄敊璇爜锛�" + hCNetSDK.NET_DVR_GetLastError());
+            log.error("鑾峰彇鍓嶇鍙傛暟澶辫触锛岄敊璇爜锛�" + hCNetSDK.NET_DVR_GetLastError());
         }
         struFocusMode.read();
-        log.info("褰撳墠鑱氱劍妯″紡锛�" + struFocusMode.byFocusMode);
+        log.debug("褰撳墠鑱氱劍妯″紡锛�" + struFocusMode.byFocusMode);
 
         if (enable) {
             struFocusMode.byFocusMode = 1;//鎵嬪姩鑱氱劍
@@ -972,11 +970,29 @@
         boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_FOCUSMODECFG, channelNum, point, struFocusMode.size());
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("璁剧疆鑱氱劍妯″紡澶辫触,璇风◢鍚庨噸璇�" + code);
-            return false;
+            log.error("璁剧疆鑱氱劍妯″紡澶辫触,璇风◢鍚庨噸璇�" + code);
         }
-        log.info("璁剧疆鑱氱劍妯″紡鎴愬姛");
+        log.debug("璁剧疆鑱氱劍妯″紡鎴愬姛");
         return bool;
+    }
+
+    public String getFocusMode(CameraCmd cmd) {
+        String cameraId = cmd.getCameraId();
+        Integer channelNum = cmd.getChannelNum();
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+            return "";
+        }
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
+        NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
+        Pointer point = struFocusMode.getPointer();
+        IntByReference ibrBytesReturned = new IntByReference(0);
+        boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, struFocusMode.size(), ibrBytesReturned);
+        if (!b_GetCameraParam) {
+            log.error("鑾峰彇鍓嶇鍙傛暟澶辫触锛岄敊璇爜锛�" + hCNetSDK.NET_DVR_GetLastError());
+        }
+        struFocusMode.read();
+        log.debug("褰撳墠鑱氱劍妯″紡锛�" + struFocusMode.byFocusMode);
+        return String.valueOf(struFocusMode.byFocusMode);
     }
 
     /**
@@ -993,11 +1009,11 @@
         String cameraId = cmd.getCameraId();
         boolean enable = cmd.isEnable();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
-        Integer dwStop;
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
+        int dwStop;
         if (enable) {
             dwStop = 0;//寮�鍚�
         } else {
@@ -1006,10 +1022,9 @@
         boolean bool = hCNetSDK.NET_DVR_PTZControl_Other(userId, channelNum, HEATER_PWRON, dwStop);
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("璁剧疆浜戝彴鍔犵儹澶辫触,璇风◢鍚庨噸璇�" + code);
-            return false;
+            log.error("璁剧疆浜戝彴鍔犵儹澶辫触,璇风◢鍚庨噸璇�" + code);
         }
-        log.info("璁剧疆浜戝彴鍔犵儹鎴愬姛");
+        log.debug("璁剧疆浜戝彴鍔犵儹鎴愬姛");
         return bool;
     }
 
@@ -1027,10 +1042,10 @@
         String cameraId = cmd.getCameraId();
         boolean enable = cmd.isEnable();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_DEVSERVER_CFG struDeicing = new NET_DVR_DEVSERVER_CFG();
         Pointer point = struDeicing.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
@@ -1039,7 +1054,7 @@
             log.error("鑾峰彇鍓嶇鍙傛暟澶辫触锛岄敊璇爜锛�" + hCNetSDK.NET_DVR_GetLastError());
         }
         struDeicing.read();
-        log.info("鏄惁寮�鍚櫎鍐帮細" + struDeicing.byEnableDeicing);
+        log.debug("鏄惁寮�鍚櫎鍐帮細" + struDeicing.byEnableDeicing);
 
         if (enable) {
             struDeicing.byEnableDeicing = 1;//寮�鍚�
@@ -1050,25 +1065,24 @@
         boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_DEVSERVER_CFG, channelNum, point, struDeicing.size());
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("璁剧疆闀滃ご闄ゅ啺澶辫触,璇风◢鍚庨噸璇�" + code);
-            return false;
+            log.error("璁剧疆闀滃ご闄ゅ啺澶辫触,璇风◢鍚庨噸璇�" + code);
         }
-        log.info("璁剧疆闀滃ご闄ゅ啺鎴愬姛");
+        log.debug("璁剧疆闀滃ご闄ゅ啺鎴愬姛");
         return bool;
     }
 
     /**
      * 鎴浘 杩旂粰鍓嶇
      *
-     * @param cmd
+     * @param cmd 鐩告満鍛戒护
      */
     public String captureJPEGPicture(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return "";
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         NET_DVR_WORKSTATE_V30 devwork = new NET_DVR_WORKSTATE_V30();
         if (!hCNetSDK.NET_DVR_GetDVRWorkState_V30(userId, devwork)) {
             // 杩斿洖Boolean鍊硷紝鍒ゆ柇鏄惁鑾峰彇璁惧鑳藉姏
@@ -1085,43 +1099,14 @@
         ByteBuffer jpegBuffer = ByteBuffer.allocate(1024 * 1024);
         // 鎶撳浘鍒板唴瀛橈紝鍗曞抚鏁版嵁鎹曡幏骞朵繚瀛樻垚JPEG瀛樻斁鍦ㄦ寚瀹氱殑鍐呭瓨绌洪棿涓�
         boolean is = hCNetSDK.NET_DVR_CaptureJPEGPicture_NEW(userId, channelNum, jpeg, jpegBuffer, 1024 * 1024, a);
-        log.info("-----------杩欓噷寮�濮嬪浘鐗囧瓨鍏ュ唴瀛�----------" + is);
+        log.debug("-----------杩欓噷寮�濮嬪浘鐗囧瓨鍏ュ唴瀛�----------" + is);
 
-
-        BASE64Encoder encoder = new BASE64Encoder();
-        String png_base64 = encoder.encodeBuffer(jpegBuffer);//杞崲鎴恇ase64涓�
+        Base64.Encoder decoder = Base64.getEncoder();
+        //  BASE64Encoder encoder = new BASE64Encoder();
+        String png_base64 = decoder.encodeToString(jpegBuffer.array());//杞崲鎴恇ase64涓�
         png_base64 = png_base64.replaceAll("\n", "").replaceAll("\r", "");//鍒犻櫎 \r\n
-        log.info("-----------澶勭悊瀹屾垚鎴浘鏁版嵁----------");
+        log.debug("-----------澶勭悊瀹屾垚鎴浘鏁版嵁----------");
         return png_base64;
-
-//        ByteArrayInputStream in = new ByteArrayInputStream(jpegBuffer.array(), 0, a.getValue());
-//        OutputStream outputStream = null;
-//        try {
-//            //1銆佽缃畆esponse 鍝嶅簲澶� //璁剧疆椤甸潰涓嶇紦瀛�,娓呯┖buffer
-//            response.reset();
-//            //瀛楃缂栫爜
-//            response.setCharacterEncoding("UTF-8");
-//            //浜岃繘鍒朵紶杈撴暟鎹�
-//            response.setContentType("multipart/form-data");
-//            //璁剧疆鍝嶅簲澶�
-//            response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".jpeg", "UTF-8"));
-//
-//            outputStream = response.getOutputStream();
-//            // LoginUser loginUser = LoginContext.me().getLoginUser();
-//            waterMarkUtil.markImageByIO("", in, outputStream, null, "jpeg");
-//            outputStream.flush();
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            log.error("鎶撳浘澶辫触锛岃绋嶅悗閲嶈瘯");
-//        } finally {
-//            try {
-//                outputStream.close();
-//            } catch (IOException e) {
-//                log.error("鎶撳浘澶辫触锛岃绋嶅悗閲嶈瘯");
-//            }
-//        }
-
-
     }
 
     /**
@@ -1137,10 +1122,10 @@
     public String picCutCate(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return "";
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         //鍥剧墖淇℃伅
         NET_DVR_JPEGPARA jpeg = new NET_DVR_JPEGPARA();
         //璁剧疆鍥剧墖鍒嗚鲸鐜�
@@ -1158,25 +1143,22 @@
         //璁剧疆鍥剧墖澶у皬
         ByteBuffer jpegBuffer = ByteBuffer.allocate(1024 * 1024);
         // 鎶撳浘鍒板唴瀛橈紝鍗曞抚鏁版嵁鎹曡幏骞朵繚瀛樻垚JPEG瀛樻斁鍦ㄦ寚瀹氱殑鍐呭瓨绌洪棿涓�
-        log.info("-----------杩欓噷寮�濮嬪皝瑁� NET_DVR_CaptureJPEGPicture_NEW---------");
+        log.debug("-----------杩欓噷寮�濮嬪皝瑁� NET_DVR_CaptureJPEGPicture_NEW---------");
         boolean is = hCNetSDK.NET_DVR_CaptureJPEGPicture_NEW(userId, channelNum, jpeg, jpegBuffer, 1024 * 1024, a);
-        log.info("-----------杩欓噷寮�濮嬪浘鐗囧瓨鍏ュ唴瀛�----------" + is);
+        log.debug("-----------杩欓噷寮�濮嬪浘鐗囧瓨鍏ュ唴瀛�----------" + is);
         if (is) {
-            log.info("hksdk(鎶撳浘)-缁撴灉鐘舵�佸��(0琛ㄧず鎴愬姛):" + hCNetSDK.NET_DVR_GetLastError());
+            log.debug("hksdk(鎶撳浘)-缁撴灉鐘舵�佸��(0琛ㄧず鎴愬姛):" + hCNetSDK.NET_DVR_GetLastError());
             byte[] array = jpegBuffer.array();
             //瀛樺偍鍒癿inio
             String BucketName = "pic";
-            String uuid = UUID.randomUUID().toString().replace("-", "");
-            String time = new SimpleDateFormat("yyyyMMdd").format(new Date());
-            String ObjectName = time + "/" + uuid + ".jpeg";
-            String ContentType = "image/JPEG";
+            String ObjectName = "capture/" + IdUtils.simpleUUID() + ".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(), MimeTypeUtils.IMAGE_JPEG);
                 if (b) {
-                    url = MinioUtils.getBucketObjectUrl(BucketName, ObjectName);
-                    log.info("涓婁紶鏂囦欢鎴愬姛!" + url);
+                    url = minioUtil.getBucketObjectUrl(BucketName, ObjectName);
+                    log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
                 }
             } catch (IOException ex) {
                 log.error("涓婁紶鏂囦欢寮傚父锛�" + ex.getMessage());
@@ -1184,7 +1166,7 @@
             return url;
         } else {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.info("鎶撳浘澶辫触,璇风◢鍚庨噸璇�" + code);
+            log.error("鎶撳浘澶辫触,璇风◢鍚庨噸璇�" + code);
             return "";
         }
     }
@@ -1198,121 +1180,24 @@
      * @淇敼浜哄拰鍏跺畠淇℃伅
      */
     @Override
-    @SdkOperate
     public String record(CameraCmd cmd) {
-        String cameraId = cmd.getCameraId();
-        Integer channelNum = cmd.getChannelNum();
-        boolean enable = cmd.isEnable();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
-            return "";
-        }
-        Integer userId = globalVariable.loginMap.get(cameraId);
-        String path = "";
-        //棰勮鍙傛暟
-        NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
-        previewinfo.read();
-        previewinfo.lChannel = channelNum;
-        previewinfo.dwStreamType = 0;//鐮佹祦绫诲瀷锛�0-涓荤爜娴侊紝1-瀛愮爜娴侊紝2-涓夌爜娴侊紝3-铏氭嫙鐮佹祦锛屼互姝ょ被鎺�
-        previewinfo.dwLinkMode = 0;//杩炴帴鏂瑰紡锛�0-TCP鏂瑰紡锛�1-UDP鏂瑰紡锛�2-澶氭挱鏂瑰紡锛�3-RTP鏂瑰紡锛�4-RTP/RTSP锛�5-RTP/HTTP锛�6-HRUDP锛堝彲闈犱紶杈擄級锛�7-RTSP/HTTPS锛�8-NPQ
-        previewinfo.hPlayWnd = null;//鎾斁绐楀彛鐨勫彞鏌勶紝涓篘ULL琛ㄧず涓嶈В鐮佹樉绀恒��
-        previewinfo.bBlocked = 0;//0- 闈為樆濉炲彇娴侊紝1-闃诲鍙栨祦
-        previewinfo.byNPQMode = 0;//NPQ妯″紡锛�0-鐩磋繛妯″紡锛�1-杩囨祦濯掍綋妯″紡
-        previewinfo.write();
-        int lRealHandle;
-        if (enable) {
-            if (!user_real_Map.containsKey(userId)) {
-                lRealHandle = hCNetSDK.NET_DVR_RealPlay_V40(userId, previewinfo, null, null);
-                if (lRealHandle == -1) {
-                    int iErr = hCNetSDK.NET_DVR_GetLastError();
-                    log.error("鍙栨祦澶辫触" + iErr);
-                    return "";
-                }
-                log.info("鍙栨祦鎴愬姛");
-
-                File file = new File("D:/record/temp.mp4");
-                if (!file.exists()) {
-                    try {
-                        File fileParent = file.getParentFile();
-                        if (!fileParent.exists()) {
-                            fileParent.mkdirs();
-                        }
-                        file.createNewFile();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-                try {
-                    path = file.getCanonicalPath();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                recordInfo info = new recordInfo();
-                info.setLRealHandle(lRealHandle);
-                info.setRecordPath(path);
-                user_real_Map.put(userId, info);
-            }
-            recordInfo info = user_real_Map.get(userId);
-            if (!hCNetSDK.NET_DVR_SaveRealData_V30(info.getLRealHandle(), 1, info.getRecordPath())) {
-                log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
-                return "淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负:" + hCNetSDK.NET_DVR_GetLastError();
-            }
-            log.info("褰曞儚寮�濮�");
-            //return info.getRecordPath();
-            return "";
-        } else {
-            recordInfo info = user_real_Map.get(userId);
-            if (StringUtils.isNull(info)) {
-                return "";
-            }
-            hCNetSDK.NET_DVR_StopRealPlay(info.getLRealHandle());
-            log.info("褰曞儚鍋滄");
-            //瀛樺叆minio
-            String BucketName = "record";
-            String uuid = UUID.randomUUID().toString().replace("-", "");
-            String time = new SimpleDateFormat("yyyyMMdd").format(new Date());
-            String ObjectName = cameraId + "/" + time + "/" + uuid + ".mp4";
-            String ContentType = "video/MP4";
-            FileInputStream stream = null;
-            try {
-                stream = new FileInputStream(info.getRecordPath());
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-            String url = "";
-            try {
-                boolean b = MinioUtils.uploadObject(BucketName, ObjectName, stream, stream.available(), ContentType);
-                if (b) {
-                    url = MinioUtils.getBucketObjectUrl(BucketName, ObjectName);
-                    log.info("涓婁紶鏂囦欢鎴愬姛!" + url);
-                }
-            } catch (IOException ex) {
-                log.error("涓婁紶鏂囦欢寮傚父锛�" + ex.getMessage());
-            }
-            user_real_Map.remove(userId);
-            return url;
-        }
-    }
-
-    @Override
-    public void recordToMinio(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             Integer channelNum = cmd.getChannelNum();
+            String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
             boolean enable = cmd.isEnable();
-            if (!globalVariable.loginMap.containsKey(cameraId)) {
-                return;
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return "";
             }
-            Integer userId = globalVariable.loginMap.get(cameraId);
-            String path = "";
+            Integer userId = GlobalVariable.loginMap.get(cameraId);
             //寮哄埗I甯х粨鏋勪綋瀵硅薄
             HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME();   //鏂板缓缁撴瀯浣撳璞�
             netDvrIFrame.read();
-            netDvrIFrame.dwChannel = channelNum;          //鍥犱负涓婃枃浠g爜涓缃簡閫氶亾鍙凤紝鎸夌収涓婃枃涓殑璁剧疆
+            netDvrIFrame.dwChannel = channelNum;//鍥犱负涓婃枃浠g爜涓缃簡閫氶亾鍙凤紝鎸夌収涓婃枃涓殑璁剧疆
             netDvrIFrame.byStreamType = 0;
             netDvrIFrame.dwSize = netDvrIFrame.size();
             netDvrIFrame.write();
-
-            if(!hCNetSDK.NET_DVR_RemoteControl(userId,3402,netDvrIFrame.getPointer(),netDvrIFrame.dwSize)){
+            if (!hCNetSDK.NET_DVR_RemoteControl(userId, 3402, netDvrIFrame.getPointer(), netDvrIFrame.dwSize)) {
                 log.error("寮哄埗I甯� 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
             }
             //棰勮鍙傛暟
@@ -1325,55 +1210,220 @@
             previewinfo.bBlocked = 0;//0- 闈為樆濉炲彇娴侊紝1-闃诲鍙栨祦
             previewinfo.byNPQMode = 0;//NPQ妯″紡锛�0-鐩磋繛妯″紡锛�1-杩囨祦濯掍綋妯″紡
             previewinfo.write();
-            int lRealHandle;
+            String url = "";
             if (enable) {
-                if (!user_real_Map.containsKey(userId)) {
-                    lRealHandle = hCNetSDK.NET_DVR_RealPlay_V40(userId, previewinfo, null, null);
+                if (!GlobalVariable.previewMap.containsKey(cameraId)) {
+                    int lRealHandle = hCNetSDK.NET_DVR_RealPlay_V40(userId, previewinfo, null, null);
                     if (lRealHandle == -1) {
                         log.error("鍙栨祦澶辫触" + hCNetSDK.NET_DVR_GetLastError());
-                        return;
+                        return "";
                     }
-                    log.info("鍙栨祦鎴愬姛");
-                    File file = new File("D:/recordTemp/" + cameraId + ".mp4");
-                    if (!file.exists()) {
-                        File fileParent = file.getParentFile();
-                        if (!fileParent.exists()) {
-                            fileParent.mkdirs();
-                        }
-                        file.createNewFile();
-                    }
-                    path = file.getCanonicalPath();
-                    recordInfo info = new recordInfo();
-                    info.setLRealHandle(lRealHandle);
-                    info.setRecordPath(path);
-                    user_real_Map.put(userId, info);
+                    log.debug("鍙栨祦鎴愬姛");
+                    GlobalVariable.previewMap.put(cameraId, lRealHandle);
                 }
-                recordInfo info = user_real_Map.get(userId);
-                if (!hCNetSDK.NET_DVR_SaveRealData_V30(info.getLRealHandle(), 2, info.getRecordPath())) {
+                if (!hCNetSDK.NET_DVR_SaveRealData_V30(GlobalVariable.previewMap.get(cameraId), 2, path)) {
                     log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
-                    return;
+                    return "";
                 }
-                log.info("褰曞儚寮�濮�");
+                log.debug("褰曞儚寮�濮�");
             } else {
-                recordInfo info = user_real_Map.get(userId);
-                if (StringUtils.isNull(info)) {
-                    return;
+                if (GlobalVariable.previewMap.containsKey(cameraId)) {
+                    Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
+                    hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
+                    GlobalVariable.previewMap.remove(cameraId);
                 }
-                hCNetSDK.NET_DVR_StopRealPlay(info.getLRealHandle());
-                log.info("褰曞儚鍋滄");
-                //瀛樺叆minio
-                String BucketName = cmd.getRecordBucketName();
-                String ObjectName = cmd.getRecordObjectName();
-                String ContentType = "video/MP4";
-                FileInputStream stream = new FileInputStream(info.getRecordPath());
-                boolean b = MinioUtils.uploadObject(BucketName, ObjectName, stream, stream.available(), ContentType);
-                if (b) {
-                    log.info("涓婁紶鏂囦欢鎴愬姛!" + MinioClientSingleton.domainUrl + "/"+ BucketName + "/" + ObjectName);
-                    user_real_Map.remove(userId);
+                log.debug("褰曞儚鍋滄");
+            }
+            return url;
+        } catch (Exception ex) {
+            log.error("褰曞儚寮傚父" + ex.getMessage());
+            return "";
+        }
+    }
+
+    @Override
+    public void recordStart(CameraCmd cmd) {
+        try {
+            String cameraId = cmd.getCameraId();
+            Integer channelNum = cmd.getChannelNum();
+            String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return;
+            }
+            Integer userId = GlobalVariable.loginMap.get(cameraId);
+            //寮哄埗I甯х粨鏋勪綋瀵硅薄
+            HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME();   //鏂板缓缁撴瀯浣撳璞�
+            netDvrIFrame.read();
+            netDvrIFrame.dwChannel = channelNum;//鍥犱负涓婃枃浠g爜涓缃簡閫氶亾鍙凤紝鎸夌収涓婃枃涓殑璁剧疆
+            netDvrIFrame.byStreamType = 0;
+            netDvrIFrame.dwSize = netDvrIFrame.size();
+            netDvrIFrame.write();
+            if (!hCNetSDK.NET_DVR_RemoteControl(userId, 3402, netDvrIFrame.getPointer(), netDvrIFrame.dwSize)) {
+                log.error("寮哄埗I甯� 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
+            }
+            //棰勮鍙傛暟
+            NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
+            previewinfo.read();
+            previewinfo.lChannel = channelNum;
+            previewinfo.dwStreamType = 0;//鐮佹祦绫诲瀷锛�0-涓荤爜娴侊紝1-瀛愮爜娴侊紝2-涓夌爜娴侊紝3-铏氭嫙鐮佹祦锛屼互姝ょ被鎺�
+            previewinfo.dwLinkMode = 0;//杩炴帴鏂瑰紡锛�0-TCP鏂瑰紡锛�1-UDP鏂瑰紡锛�2-澶氭挱鏂瑰紡锛�3-RTP鏂瑰紡锛�4-RTP/RTSP锛�5-RTP/HTTP锛�6-HRUDP锛堝彲闈犱紶杈擄級锛�7-RTSP/HTTPS锛�8-NPQ
+            previewinfo.hPlayWnd = null;//鎾斁绐楀彛鐨勫彞鏌勶紝涓篘ULL琛ㄧず涓嶈В鐮佹樉绀恒��
+            previewinfo.bBlocked = 0;//0- 闈為樆濉炲彇娴侊紝1-闃诲鍙栨祦
+            previewinfo.byNPQMode = 0;//NPQ妯″紡锛�0-鐩磋繛妯″紡锛�1-杩囨祦濯掍綋妯″紡
+            previewinfo.write();
+            if (GlobalVariable.previewMap.containsKey(cameraId)) {
+                Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
+                hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
+                GlobalVariable.previewMap.remove(cameraId);
+                log.debug("鍋滄褰撳墠褰曞儚");
+            }
+            int lRealHandle = hCNetSDK.NET_DVR_RealPlay_V40(userId, previewinfo, null, null);
+            if (lRealHandle == -1) {
+                log.error("鍙栨祦澶辫触" + hCNetSDK.NET_DVR_GetLastError());
+                return;
+            }
+            log.debug("鍙栨祦鎴愬姛");
+            GlobalVariable.threadMap.put(cameraId, Thread.currentThread().getName());
+            GlobalVariable.previewMap.put(cameraId, lRealHandle);
+            if (!hCNetSDK.NET_DVR_SaveRealData_V30(GlobalVariable.previewMap.get(cameraId), 2, path)) {
+                log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
+                return;
+            }
+            log.debug("褰曞儚寮�濮�");
+        } catch (Exception ex) {
+            log.error("寮�濮嬪綍鍍忓紓甯�" + ex.getMessage());
+        }
+    }
+
+    @Override
+    public String recordStopToMinio(CameraCmd cmd) {
+        String url = "";
+        try {
+            String cameraId = cmd.getCameraId();
+            Integer channelNum = cmd.getChannelNum();
+            String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return "";
+            }
+            Integer userId = GlobalVariable.loginMap.get(cameraId);
+            //region 寮哄埗I甯�
+            HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME();   //鏂板缓缁撴瀯浣撳璞�
+            netDvrIFrame.read();
+            netDvrIFrame.dwChannel = channelNum;//鍥犱负涓婃枃浠g爜涓缃簡閫氶亾鍙凤紝鎸夌収涓婃枃涓殑璁剧疆
+            netDvrIFrame.byStreamType = 0;
+            netDvrIFrame.dwSize = netDvrIFrame.size();
+            netDvrIFrame.write();
+            if (!hCNetSDK.NET_DVR_RemoteControl(userId, 3402, netDvrIFrame.getPointer(), netDvrIFrame.dwSize)) {
+                log.error("寮哄埗I甯� 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
+            }
+            //endregion
+            //region 棰勮鍙傛暟
+            NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
+            previewinfo.read();
+            previewinfo.lChannel = channelNum;
+            previewinfo.dwStreamType = 0;//鐮佹祦绫诲瀷锛�0-涓荤爜娴侊紝1-瀛愮爜娴侊紝2-涓夌爜娴侊紝3-铏氭嫙鐮佹祦锛屼互姝ょ被鎺�
+            previewinfo.dwLinkMode = 0;//杩炴帴鏂瑰紡锛�0-TCP鏂瑰紡锛�1-UDP鏂瑰紡锛�2-澶氭挱鏂瑰紡锛�3-RTP鏂瑰紡锛�4-RTP/RTSP锛�5-RTP/HTTP锛�6-HRUDP锛堝彲闈犱紶杈擄級锛�7-RTSP/HTTPS锛�8-NPQ
+            previewinfo.hPlayWnd = null;//鎾斁绐楀彛鐨勫彞鏌勶紝涓篘ULL琛ㄧず涓嶈В鐮佹樉绀恒��
+            previewinfo.bBlocked = 0;//0- 闈為樆濉炲彇娴侊紝1-闃诲鍙栨祦
+            previewinfo.byNPQMode = 0;//NPQ妯″紡锛�0-鐩磋繛妯″紡锛�1-杩囨祦濯掍綋妯″紡
+            previewinfo.write();
+            //endregion
+            if (GlobalVariable.previewMap.containsKey(cameraId)) {
+                Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
+                hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
+                GlobalVariable.previewMap.remove(cameraId);
+            }
+            log.debug("褰曞儚鍋滄");
+            //瀛樺叆minio
+            String BucketName = cmd.getRecordBucketName();
+            String ObjectName = cmd.getRecordObjectName()+".mp4";
+            FileInputStream stream = new FileInputStream(path);
+            boolean b = minioUtil.uploadObject(BucketName, ObjectName, stream, stream.available(), "video/MP4");
+            if (b) {
+                url = minioUtil.getBucketObjectUrl(BucketName, ObjectName);
+                log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
+            }
+            return url;
+        } catch (Exception ex) {
+            log.error("褰曞儚寮傚父" + ex.getMessage());
+            return "";
+        }
+    }
+
+    @Override
+    public void recordStopNotToMinio(CameraCmd cmd) {
+        try {
+            String cameraId = cmd.getCameraId();
+            Integer channelNum = cmd.getChannelNum();
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return;
+            }
+            Integer userId = GlobalVariable.loginMap.get(cameraId);
+            //寮哄埗I甯х粨鏋勪綋瀵硅薄
+            HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME();   //鏂板缓缁撴瀯浣撳璞�
+            netDvrIFrame.read();
+            netDvrIFrame.dwChannel = channelNum;//鍥犱负涓婃枃浠g爜涓缃簡閫氶亾鍙凤紝鎸夌収涓婃枃涓殑璁剧疆
+            netDvrIFrame.byStreamType = 0;
+            netDvrIFrame.dwSize = netDvrIFrame.size();
+            netDvrIFrame.write();
+            if (!hCNetSDK.NET_DVR_RemoteControl(userId, 3402, netDvrIFrame.getPointer(), netDvrIFrame.dwSize)) {
+                log.error("寮哄埗I甯� 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
+            }
+            //棰勮鍙傛暟
+            NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
+            previewinfo.read();
+            previewinfo.lChannel = channelNum;
+            previewinfo.dwStreamType = 0;//鐮佹祦绫诲瀷锛�0-涓荤爜娴侊紝1-瀛愮爜娴侊紝2-涓夌爜娴侊紝3-铏氭嫙鐮佹祦锛屼互姝ょ被鎺�
+            previewinfo.dwLinkMode = 0;//杩炴帴鏂瑰紡锛�0-TCP鏂瑰紡锛�1-UDP鏂瑰紡锛�2-澶氭挱鏂瑰紡锛�3-RTP鏂瑰紡锛�4-RTP/RTSP锛�5-RTP/HTTP锛�6-HRUDP锛堝彲闈犱紶杈擄級锛�7-RTSP/HTTPS锛�8-NPQ
+            previewinfo.hPlayWnd = null;//鎾斁绐楀彛鐨勫彞鏌勶紝涓篘ULL琛ㄧず涓嶈В鐮佹樉绀恒��
+            previewinfo.bBlocked = 0;//0- 闈為樆濉炲彇娴侊紝1-闃诲鍙栨祦
+            previewinfo.byNPQMode = 0;//NPQ妯″紡锛�0-鐩磋繛妯″紡锛�1-杩囨祦濯掍綋妯″紡
+            previewinfo.write();
+            if (GlobalVariable.previewMap.containsKey(cameraId)) {
+                Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
+                hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
+                GlobalVariable.previewMap.remove(cameraId);
+            }
+            log.debug("褰曞儚鍋滄");
+        } catch (Exception ex) {
+            log.error("褰曞儚鍋滄寮傚父" + ex.getMessage());
+        }
+    }
+
+    //鑾峰彇IP閫氶亾
+    @Override
+    public List<ArdChannel> getCameraChannelList(ArdCameras camera) {
+        /*鑾峰彇閫氶亾*/
+        List<ArdChannel> channelList = new ArrayList<>();
+        try {
+            Integer chanNum = camera.getChanNum();
+            Integer startDChan = camera.getStartDChan();
+            if (chanNum > 0) {
+                // 鑾峰彇閫氶亾鍙�
+                for (int iChannum = 0; iChannum < chanNum; iChannum++) {
+                    ArdChannel ardChannel = new ArdChannel();
+                    int channum = iChannum + startDChan+1;
+                    HCNetSDK.NET_DVR_PICCFG_V40 strPicCfg = new HCNetSDK.NET_DVR_PICCFG_V40();
+                    strPicCfg.dwSize = strPicCfg.size();
+                    strPicCfg.write();
+                    Pointer pStrPicCfg = strPicCfg.getPointer();
+                    NativeLong lChannel = new NativeLong(channum);
+                    IntByReference pInt = new IntByReference(0);
+                    boolean b_GetPicCfg = hCNetSDK.NET_DVR_GetDVRConfig(camera.getLoginId(), HCNetSDK.NET_DVR_GET_PICCFG_V40, lChannel.intValue(),
+                            pStrPicCfg, strPicCfg.size(), pInt);
+                    if (b_GetPicCfg) {
+                        strPicCfg.read();
+                        String channelName = new String(strPicCfg.sChanName, "GBK").trim();
+                        ardChannel.setName(channelName);
+                    }
+                    ardChannel.setDeviceId(camera.getId());
+                    ardChannel.setChanNo(iChannum + 1);
+                    channelList.add(ardChannel);
                 }
             }
         } catch (Exception ex) {
-            log.error("褰曞儚寮傚父" + ex.getMessage());
+            log.error("鑾峰彇鐩告満閫氶亾寮傚父:" + ex.getMessage());
         }
+        return channelList;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3