From 81dd45819944baa8032d942e2e28c5c859c0cc81 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 15 六月 2023 10:37:46 +0800
Subject: [PATCH] 优化巡检

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java |  549 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 330 insertions(+), 219 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 5c9c6fc..46511ca 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
@@ -5,16 +5,19 @@
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.constant.sdkPriority;
 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.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.minioUtil.MinioUtil;
+import com.ruoyi.device.hiksdk.util.hikSdkUtil.LoginResultCallBack;
+import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.sun.jna.Native;
 import com.sun.jna.Platform;
@@ -33,6 +36,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static com.ruoyi.device.hiksdk.common.GlobalVariable.threadMap;
 import static com.ruoyi.device.hiksdk.util.hikSdkUtil.HCNetSDK.*;
 
 /**
@@ -40,14 +44,11 @@
  * @Description: 娴峰悍鎿嶄綔瀹㈡埛绔疄鐜扮被
  * @Author: Administrator
  * @Date: 2023骞�01鏈�17鏃� 11:25
- * @Version: 1.0
+ * @Version: 1.2
  **/
 @Slf4j(topic = "hikSdk")
 @Service
 public class HikClientServiceImpl implements IHikClientService {
-
-    @Resource
-    private MinioUtil minioUtil;
 
     @Resource
     ArdCamerasMapper ardCamerasMapper;
@@ -56,7 +57,6 @@
     SysUserMapper sysUserMapper;
 
     private static HCNetSDK hCNetSDK;
-    private static Map<Integer, recordInfo> user_real_Map = new HashMap<>();
 
     @Override
     public void loadHCNetSDKLib() {
@@ -75,20 +75,20 @@
                 //璁剧疆HCNetSDKCom缁勪欢搴撴墍鍦ㄨ矾寰�
                 //libhcnetsdk.so
                 String strPathCom = "/home/hiklib";
-                HCNetSDK.NET_DVR_LOCAL_SDK_PATH struComPath = new HCNetSDK.NET_DVR_LOCAL_SDK_PATH();
+                NET_DVR_LOCAL_SDK_PATH struComPath = new NET_DVR_LOCAL_SDK_PATH();
                 System.arraycopy(strPathCom.getBytes(), 0, struComPath.sPath, 0, strPathCom.length());
                 struComPath.write();
                 hCNetSDK.NET_DVR_SetSDKInitCfg(2, struComPath.getPointer());
 
                 //璁剧疆libcrypto.so鎵�鍦ㄨ矾寰�
-                HCNetSDK.BYTE_ARRAY ptrByteArrayCrypto = new HCNetSDK.BYTE_ARRAY(256);
+                BYTE_ARRAY ptrByteArrayCrypto = new BYTE_ARRAY(256);
                 String strPathCrypto = "/home/hiklib/libcrypto.so.1.1";
                 System.arraycopy(strPathCrypto.getBytes(), 0, ptrByteArrayCrypto.byValue, 0, strPathCrypto.length());
                 ptrByteArrayCrypto.write();
                 hCNetSDK.NET_DVR_SetSDKInitCfg(3, ptrByteArrayCrypto.getPointer());
 
                 //璁剧疆libssl.so鎵�鍦ㄨ矾寰�
-                HCNetSDK.BYTE_ARRAY ptrByteArraySsl = new HCNetSDK.BYTE_ARRAY(256);
+                BYTE_ARRAY ptrByteArraySsl = new BYTE_ARRAY(256);
                 String strPathSsl = "/home/hiklib/libssl.so.1.1";
                 System.arraycopy(strPathSsl.getBytes(), 0, ptrByteArraySsl.byValue, 0, strPathSsl.length());
                 ptrByteArraySsl.write();
@@ -100,15 +100,14 @@
     }
 
     /**
-     * @鎻忚堪 娉ㄥ唽鐧诲綍
+     * @鎻忚堪 娉ㄥ唽鐧诲綍 鍙敮鎸佸悓姝ョ櫥闄嗭紝涓斿畼鏂逛笉寤鸿鐩存帴鍦ㄦ鎺ュ彛涓嬪啓鑰楁椂鎿嶄綔
      * @鍙傛暟 [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鍒濆鍖栧け璐�");
@@ -116,9 +115,9 @@
         //鎵撳嵃娴峰悍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();
@@ -128,22 +127,75 @@
         hCNetSDK.NET_DVR_SetConnectTime(2000, 1);
         hCNetSDK.NET_DVR_SetReconnect(100000, true);
         //璁惧淇℃伅, 杈撳嚭鍙傛暟
-        HCNetSDK.NET_DVR_DEVICEINFO_V30 m_strDeviceInfo = new HCNetSDK.NET_DVR_DEVICEINFO_V30();
-        int lUserID = hCNetSDK.NET_DVR_Login_V30(m_sDeviceIP,m_sPort,m_sUsername,m_sPassword, m_strDeviceInfo);
+        NET_DVR_DEVICEINFO_V30 m_strDeviceInfo = new NET_DVR_DEVICEINFO_V30();
+        int lUserID = hCNetSDK.NET_DVR_Login_V30(m_sDeviceIP, m_sPort, m_sUsername, m_sPassword, m_strDeviceInfo);
         if (lUserID < 0) {
             //閲婃斁SDK璧勬簮
             hCNetSDK.NET_DVR_Cleanup();
             camera.setLoginId(-1);
         }
-        if(globalVariable.loginMap.containsKey(camera.getId()))
-        {
-            globalVariable.loginMap.remove(camera.getId());
+        if (GlobalVariable.loginMap.containsKey(camera.getId())) {
+            GlobalVariable.loginMap.remove(camera.getId());
         }
-        globalVariable.loginMap.put(camera.getId(), lUserID);
+        GlobalVariable.loginMap.put(camera.getId(), lUserID);
 
         camera.setLoginId(lUserID);
         camera.setChannel((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.info("鐧诲綍寮傚父锛�" + errorCode);
+        }
     }
 
     /**
@@ -155,32 +207,13 @@
      * @淇敼浜哄拰鍏跺畠淇℃伅
      */
     @Override
-    @Async("loginExecutor")
     public void loginAll() {
         try {
             log.debug("鍔犺浇lib瀹屾垚锛�");
-            List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
+            List<ArdCameras> ardCameras = ardCamerasMapper.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(100);
+                login(camera);
             }
         } catch (Exception ex) {
             log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
@@ -197,13 +230,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;
     }
@@ -216,13 +249,14 @@
     @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);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         boolean isOnLine = hCNetSDK.NET_DVR_RemoteControl(userId, HCNetSDK.NET_DVR_CHECK_USER_STATUS, null, 0);
         return isOnLine;
     }
+
     /**
      * @鎻忚堪 甯﹂�熷害鐨勪簯鍙版帶鍒舵搷浣�
      * Code:1-宸︿笂 2-涓� 3-鍙充笂 4-宸� 5-宸¤埅 6-鍙� 7-宸︿笅 8-涓� 9-鍙充笅 10-鐒﹁窛鍙樺ぇ 11-鐒﹁窛鍙樺皬
@@ -235,46 +269,77 @@
      */
     @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)) {
+        Integer code = cmd.getCode();
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
         Integer dwStop;
         if (enable) {
             dwStop = 0;//寮�鍚�
         } else {
             dwStop = 1;//鍏抽棴
         }
-        Integer dwPTZCommand=-1;
-        switch (code)
-        {
+        Integer dwPTZCommand = -1;
+        switch (code) {
             /*鏂瑰悜*/
-            case 1:dwPTZCommand=HCNetSDK.UP_LEFT;break;
-            case 2:dwPTZCommand=HCNetSDK.TILT_UP;break;
-            case 3:dwPTZCommand=HCNetSDK.UP_RIGHT;break;
-            case 4:dwPTZCommand=HCNetSDK.PAN_LEFT;break;
-            case 5:dwPTZCommand=HCNetSDK.RUN_SEQ;break;
-            case 6:dwPTZCommand=HCNetSDK.PAN_RIGHT;break;
-            case 7:dwPTZCommand=HCNetSDK.DOWN_LEFT;break;
-            case 8:dwPTZCommand=HCNetSDK.TILT_DOWN;break;
-            case 9:dwPTZCommand=HCNetSDK.DOWN_RIGHT;break;
+            case 1:
+                dwPTZCommand = HCNetSDK.UP_LEFT;
+                break;
+            case 2:
+                dwPTZCommand = HCNetSDK.TILT_UP;
+                break;
+            case 3:
+                dwPTZCommand = HCNetSDK.UP_RIGHT;
+                break;
+            case 4:
+                dwPTZCommand = HCNetSDK.PAN_LEFT;
+                break;
+            case 5:
+                dwPTZCommand = HCNetSDK.RUN_SEQ;
+                break;
+            case 6:
+                dwPTZCommand = HCNetSDK.PAN_RIGHT;
+                break;
+            case 7:
+                dwPTZCommand = HCNetSDK.DOWN_LEFT;
+                break;
+            case 8:
+                dwPTZCommand = HCNetSDK.TILT_DOWN;
+                break;
+            case 9:
+                dwPTZCommand = HCNetSDK.DOWN_RIGHT;
+                break;
             /*鐒﹁窛*/
-            case 10:dwPTZCommand=HCNetSDK.ZOOM_IN;break;
-            case 11:dwPTZCommand=HCNetSDK.ZOOM_OUT;break;
+            case 10:
+                dwPTZCommand = HCNetSDK.ZOOM_IN;
+                break;
+            case 11:
+                dwPTZCommand = HCNetSDK.ZOOM_OUT;
+                break;
             /*鐒︾偣*/
-            case 12:dwPTZCommand=HCNetSDK.FOCUS_NEAR;break;
-            case 13:dwPTZCommand=HCNetSDK.FOCUS_FAR;break;
+            case 12:
+                dwPTZCommand = HCNetSDK.FOCUS_NEAR;
+                break;
+            case 13:
+                dwPTZCommand = HCNetSDK.FOCUS_FAR;
+                break;
             /*鍏夊湀*/
-            case 14:dwPTZCommand=HCNetSDK.IRIS_OPEN;break;
-            case 15:dwPTZCommand=HCNetSDK.IRIS_CLOSE;break;
+            case 14:
+                dwPTZCommand = HCNetSDK.IRIS_OPEN;
+                break;
+            case 15:
+                dwPTZCommand = HCNetSDK.IRIS_CLOSE;
+                break;
             /*闆ㄥ埛*/
-            case 16:dwPTZCommand=HCNetSDK.WIPER_PWRON;break;
+            case 16:
+                dwPTZCommand = HCNetSDK.WIPER_PWRON;
+                break;
         }
         boolean bool = hCNetSDK.NET_DVR_PTZControlWithSpeed_Other(userId, channelNum, dwPTZCommand, dwStop, speed);
         if (!bool) {
@@ -295,10 +360,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();
@@ -322,10 +387,10 @@
         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();
@@ -356,10 +421,10 @@
         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();
@@ -379,10 +444,10 @@
         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();
@@ -403,13 +468,13 @@
     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 = "";
-        HCNetSDK.NET_DVR_COMPRESSIONCFG_V30 resolution = new HCNetSDK.NET_DVR_COMPRESSIONCFG_V30();
+        NET_DVR_COMPRESSIONCFG_V30 resolution = new NET_DVR_COMPRESSIONCFG_V30();
         resolution.write();
         Pointer pioint = resolution.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
@@ -509,12 +574,12 @@
     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);
 
-        HCNetSDK.NET_DVR_PTZPOS m_ptzPosCurrent = new HCNetSDK.NET_DVR_PTZPOS();
+        NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
         Pointer pioint = m_ptzPosCurrent.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
         m_ptzPosCurrent.write();
@@ -560,12 +625,12 @@
     public boolean setPtz(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChannelNum();
-        Map<String,Double> ptz = cmd.getPtzMap();
-        if (!globalVariable.loginMap.containsKey(cameraId)) {
+        Map<String, Double> ptz = cmd.getPtzMap();
+        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
             return false;
         }
-        Integer userId = globalVariable.loginMap.get(cameraId);
-        HCNetSDK.NET_DVR_PTZPOS m_ptzPosCurrent = new HCNetSDK.NET_DVR_PTZPOS();
+        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));
@@ -593,19 +658,20 @@
     public boolean setTargetPosition(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);
-        HCNetSDK.NET_DVR_PTZPOS m_ptzPosCurrent = new HCNetSDK.NET_DVR_PTZPOS();
+        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 = ardCamerasMapper.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));
-            String t = String.valueOf((int) ( cameraPTZ[1] * 10));
-            String z = String.valueOf((int) (cameraPTZ[2]* 10));
+            String p = String.valueOf((int) (cameraPTZ[0] * 10));
+            String t = String.valueOf((int) (cameraPTZ[1] * 10));
+            String z = String.valueOf((int) (cameraPTZ[2] * 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));
@@ -618,10 +684,11 @@
             }
             return bool;
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error("寮曞寮傚父:" + ex.getMessage());
             return false;
         }
     }
+
     /**
      * @鎻忚堪 鎿嶆帶閿佸畾
      * @鍙傛暟 [userId, channelNum]
@@ -638,31 +705,27 @@
             return false;//鎵句笉鍒扮浉鏈烘嫆缁濇搷鎺�
         }
         Integer expired = cmd.getExpired();//鐢宠鎺у埗鏃堕暱
-        String operator=cmd.getOperator();//鐢宠鑰�
+        String operator = cmd.getOperator();//鐢宠鑰�
         String currentOperator = ardCameras.getOperatorId();//鐩告満褰撳墠鎺у埗鑰�
         Date currentExpired = ardCameras.getOperatorExpired();//鐩告満褰撳墠杩囨湡鏃堕棿
-        if(currentExpired==null)
-        {
+        if (currentExpired == null) {
             //璁剧疆褰撳墠鎿嶄綔鐢ㄦ埛ID
             ardCameras.setOperatorId(operator);
             //璁剧疆褰撳墠杩囨湡鏃堕棿
             Date now = new Date();
-            now.setTime(now.getTime() + expired * 1000*60);
+            now.setTime(now.getTime() + expired * 1000);
             ardCameras.setOperatorExpired(now);
             ardCamerasMapper.updateArdCameras(ardCameras);
-        }
-         else {
+        } else {
             //濡傛灉杩囨湡鏃堕棿鏈夊��
             //濡傛灉鏄湰浜虹洿鎺ヤ慨鏀�
-            if(currentOperator.equals(operator))
-            {
+            if (currentOperator.equals(operator)) {
                 //璁剧疆褰撳墠杩囨湡鏃堕棿
                 Date now = new Date();
-                now.setTime(now.getTime() + expired * 1000*60);
+                now.setTime(now.getTime() + expired * 1000);
                 ardCameras.setOperatorExpired(now);
                 ardCamerasMapper.updateArdCameras(ardCameras);
-            }
-            else {
+            } else {
                 //濡傛灉闈炴湰浜烘瘮杈冧紭鍏堢骇
                 Integer currentLevel = 0;//褰撳墠鎿嶄綔鑰呯殑浼樺厛绾�
                 if (sdkPriority.priorityMap.containsKey(currentOperator)) {
@@ -686,7 +749,7 @@
                 //鍒ゆ柇浼樺厛绾�
                 if (operatorLevel > currentLevel) {
                     Date now = new Date();
-                    now.setTime(now.getTime() + expired * 60 * 1000);
+                    now.setTime(now.getTime() + expired * 60);
                     ardCameras.setOperatorExpired(now);//璁剧疆褰撳墠杩囨湡鏃堕棿
                     ardCameras.setOperatorId(operator);//璁剧疆褰撳墠鐢ㄦ埛
                     ardCamerasMapper.updateArdCameras(ardCameras);
@@ -710,10 +773,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);
@@ -743,11 +806,11 @@
     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);
-        HCNetSDK.NET_DVR_INITIALPOSITIONCTRL initialpositionctrl = new HCNetSDK.NET_DVR_INITIALPOSITIONCTRL();
+        Integer userId = GlobalVariable.loginMap.get(cameraId);
+        NET_DVR_INITIALPOSITIONCTRL initialpositionctrl = new NET_DVR_INITIALPOSITIONCTRL();
 
         initialpositionctrl.dwSize = initialpositionctrl.size();
         initialpositionctrl.byWorkMode = 0;
@@ -775,10 +838,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);
@@ -824,10 +887,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);
@@ -871,10 +934,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);
@@ -920,10 +983,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_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
         Pointer point = struFocusMode.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
@@ -937,7 +1000,7 @@
         if (enable) {
             struFocusMode.byFocusMode = 1;//鎵嬪姩鑱氱劍
         } else {
-            struFocusMode.byAutoFocusMode=1;
+            struFocusMode.byAutoFocusMode = 1;
             struFocusMode.byFocusMode = 2;//鑷姩鑱氱劍
         }
         struFocusMode.byFocusDefinitionDisplay = 1;
@@ -967,10 +1030,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);
         Integer dwStop;
         if (enable) {
             dwStop = 0;//寮�鍚�
@@ -1001,10 +1064,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,10 +1102,10 @@
     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鍊硷紝鍒ゆ柇鏄惁鑾峰彇璁惧鑳藉姏
@@ -1063,7 +1126,7 @@
 
 
         BASE64Encoder encoder = new BASE64Encoder();
-        String png_base64 =  encoder.encodeBuffer(jpegBuffer);//杞崲鎴恇ase64涓�
+        String png_base64 = encoder.encodeBuffer(jpegBuffer);//杞崲鎴恇ase64涓�
         png_base64 = png_base64.replaceAll("\n", "").replaceAll("\r", "");//鍒犻櫎 \r\n
         log.info("-----------澶勭悊瀹屾垚鎴浘鏁版嵁----------");
         return png_base64;
@@ -1111,10 +1174,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();
         //璁剧疆鍥剧墖鍒嗚鲸鐜�
@@ -1147,9 +1210,9 @@
             InputStream input = new ByteArrayInputStream(array);
             String url = "";
             try {
-                boolean b = minioUtil.putObject(BucketName, ObjectName, input, input.available(), ContentType);
+                boolean b = MinioUtils.uploadObject(BucketName, ObjectName, input, input.available(), ContentType);
                 if (b) {
-                    url = minioUtil.presignedGetObject(BucketName, ObjectName, 5);
+                    url = MinioUtils.getBucketObjectUrl(BucketName, ObjectName);
                     log.info("涓婁紶鏂囦欢鎴愬姛!" + url);
                 }
             } catch (IOException ex) {
@@ -1172,99 +1235,147 @@
      * @淇敼浜哄拰鍏跺畠淇℃伅
      */
     @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))
-            {
+        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 "";
             }
-            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 = time + "/" + uuid + ".mp4";
-            String ContentType = "video/MP4";
-            FileInputStream stream = null;
-            try {
-                stream = new FileInputStream(info.getRecordPath());
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
+            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();
             String url = "";
-            try {
-                boolean b = minioUtil.putObject(BucketName, ObjectName, stream, stream.available(), ContentType);
-                if (b) {
-                    url = minioUtil.presignedGetObject(BucketName, ObjectName, 5);
-                    log.info("涓婁紶鏂囦欢鎴愬姛!" + url);
+            if (enable) {
+                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 "";
+                    }
+                    log.info("鍙栨祦鎴愬姛");
+                    GlobalVariable.previewMap.put(cameraId, lRealHandle);
                 }
-            } catch (IOException ex) {
-                log.error("涓婁紶鏂囦欢寮傚父锛�" + ex.getMessage());
+                if (!hCNetSDK.NET_DVR_SaveRealData_V30(GlobalVariable.previewMap.get(cameraId), 2, path)) {
+                    log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
+                    return "";
+                }
+                log.info("褰曞儚寮�濮�");
+            } else {
+                if (GlobalVariable.previewMap.containsKey(cameraId)) {
+                    Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
+                    hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
+                    GlobalVariable.previewMap.remove(cameraId);
+                }
+                log.info("褰曞儚鍋滄");
+                //瀛樺叆minio
+                String BucketName = cmd.getRecordBucketName();
+                String ObjectName = cmd.getRecordObjectName();
+                String ContentType = "video/MP4";
+                FileInputStream stream = new FileInputStream(path);
+                boolean b = MinioUtils.uploadObject(BucketName, ObjectName, stream, stream.available(), ContentType);
+                if (b) {
+                    url = MinioUtils.getBucketObjectUrl(BucketName, ObjectName);
+                    log.info("涓婁紶鏂囦欢鎴愬姛!" + MinioClientSingleton.domainUrl + "/" + BucketName + "/" + ObjectName);
+                }
             }
-            user_real_Map.remove(userId);
             return url;
+        } catch (Exception ex) {
+            log.error("褰曞儚寮傚父" + ex.getMessage());
+            return "";
+        }
+    }
+
+    @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;
+            }
+            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 (enable) {
+                if (GlobalVariable.previewMap.containsKey(cameraId)) {
+                    Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
+                    hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
+                    GlobalVariable.previewMap.remove(cameraId);
+                    log.info("褰曞儚鍋滄");
+                }
+                int lRealHandle = hCNetSDK.NET_DVR_RealPlay_V40(userId, previewinfo, null, null);
+                if (lRealHandle == -1) {
+                    log.error("鍙栨祦澶辫触" + hCNetSDK.NET_DVR_GetLastError());
+                    return;
+                }
+                log.info("鍙栨祦鎴愬姛");
+                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.info("褰曞儚寮�濮�");
+            } else {
+                if (GlobalVariable.previewMap.containsKey(cameraId)) {
+                    Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
+                    hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
+                    GlobalVariable.previewMap.remove(cameraId);
+                }
+                log.info("褰曞儚鍋滄");
+                //瀛樺叆minio
+                String BucketName = cmd.getRecordBucketName();
+                String ObjectName = cmd.getRecordObjectName();
+                String ContentType = "video/MP4";
+                FileInputStream stream = new FileInputStream(path);
+                boolean b = MinioUtils.uploadObject(BucketName, ObjectName, stream, stream.available(), ContentType);
+                if (b) {
+                    log.info("涓婁紶鏂囦欢鎴愬姛!" + MinioClientSingleton.domainUrl + "/" + BucketName + "/" + ObjectName);
+                }
+            }
+        } catch (Exception ex) {
+            log.error("褰曞儚寮傚父" + ex.getMessage());
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3