From 38f29e38fcc668171dc05c53d40a36b895c86102 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 10 十月 2024 13:34:28 +0800
Subject: [PATCH] init

---
 ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java |  594 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 339 insertions(+), 255 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
index 3f8969b..9a205a6 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
@@ -4,18 +4,19 @@
 import com.ruoyi.alarm.global.domain.GuideTask;
 import com.ruoyi.alarm.global.service.impl.QueueHandler;
 import com.ruoyi.common.annotation.SdkOperate;
+import com.ruoyi.common.config.ARDConfig;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.device.camera.service.IArdCamerasService;
-import com.ruoyi.device.camera.factory.CameraSDK;
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.camera.factory.CameraSDK;
+import com.ruoyi.device.camera.service.IArdCamerasService;
+import com.ruoyi.device.camera.service.ICameraSdkService;
 import com.ruoyi.device.channel.domain.ArdChannel;
 import com.ruoyi.device.channel.service.IArdChannelService;
-import com.ruoyi.media.domain.Vtdu;
 import com.ruoyi.media.service.IVtduService;
 import com.ruoyi.utils.gis.GisUtil;
 import com.ruoyi.utils.minio.MinioUtil;
@@ -31,16 +32,18 @@
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.io.*;
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.PriorityBlockingQueue;
 
 import static com.ruoyi.utils.sdk.hiksdk.lib.HCNetSDK.*;
-import static com.ruoyi.utils.sdk.hiksdk.lib.HCNetSDK.NET_DVR_GET_GISINFO;
 
 /**
  * @Description: 娴峰悍sdk绛栫暐
@@ -59,10 +62,39 @@
     private IVtduService vtduService;
     @Resource
     private QueueHandler queueHandler;
+    @Resource
+    ICameraSdkService cameraSdkService;
 
-    public Object _lock = new Object();
     public static HCNetSDK hCNetSDK = HCNetSDK.hCNetSDK;
     private static HCNetSDK.FExceptionCallBack fExceptionCallBack;//寮傚父鍥炶皟
+
+    @PostConstruct
+    public void initSdk() {
+        log.info("鍒濆鍖栨捣搴穝dk");
+        // 鍒濆鍖�
+        if (!hCNetSDK.NET_DVR_Init()) {
+            log.debug("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);
+        }
+        if (fExceptionCallBack == null) {
+            fExceptionCallBack = new ExceptionCallBack();//寮傚父鍥炶皟
+            //璁剧疆寮傚父鍥炶皟鍑芥暟(鍙湪鍥炶皟鍑芥暟涓幏鍙栬澶囦笂涓嬬嚎鐘舵�佺瓑)
+            if (!hCNetSDK.NET_DVR_SetExceptionCallBack_V30(0, 0, fExceptionCallBack, null)) {
+                log.debug("Set fExceptionCallBack function fail");
+            } else {
+                log.debug("Set fExceptionCallBack function successfully!");
+            }
+        }
+        //璁剧疆杩炴帴鏃堕棿涓庨噸杩炴椂闂�
+        hCNetSDK.NET_DVR_SetConnectTime(2000, 1);
+        hCNetSDK.NET_DVR_SetReconnect(5000, true);
+    }
 
     /**
      * @鎻忚堪 娉ㄥ唽鐧诲綍 鍙敮鎸佸悓姝ョ櫥闄嗭紝涓斿畼鏂逛笉寤鸿鐩存帴鍦ㄦ鎺ュ彛涓嬪啓鑰楁椂鎿嶄綔
@@ -75,24 +107,11 @@
     @Override
     public AjaxResult login(ArdCameras camera) {
         try {
-            // 鍒濆鍖�
-            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(5000, 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();
@@ -110,62 +129,52 @@
             //鏄惁寮傛鐧诲綍锛�0- 鍚︼紝1- 鏄�  windowsSDK閲屾槸true鍜宖alse
             m_strLoginInfo.bUseAsynLogin = false;
             m_strLoginInfo.write();
+
             //鍚屾鐧诲綍
             int lUserID = hCNetSDK.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo);
             if (lUserID < 0) {
                 int errorCode = hCNetSDK.NET_DVR_GetLastError();
                 camera.setChanNum(0);
-                camera.setLoginId(-1);
+                camera.setLoginId(-1l);
                 camera.setState("0");
                 //鍒犻櫎绠$悊閫氶亾
                 ardChannelService.deleteArdChannelByDeviceId(camera.getId());
                 ardCamerasService.updateArdCameras(camera);
-                log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
-                return AjaxResult.error("璁惧鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+                log.warn("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
+                return AjaxResult.warn("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
             }
 
             log.debug("Login Success [ " + camera.getIp() + ":" + camera.getPort() + " ]");
-            if (fExceptionCallBack == null) {
-                fExceptionCallBack = new ExceptionCallBack();//寮傚父鍥炶皟
-                //璁剧疆寮傚父鍥炶皟鍑芥暟(鍙湪鍥炶皟鍑芥暟涓幏鍙栬澶囦笂涓嬬嚎鐘舵�佺瓑)
-                if (!hCNetSDK.NET_DVR_SetExceptionCallBack_V30(0, 0, fExceptionCallBack, null)) {
-                    log.debug("Set fExceptionCallBack function fail");
-                } else {
-                    log.debug("Set fExceptionCallBack function successfully!");
-                }
-            }
 
-            if (GlobalVariable.loginMap.containsKey(camera.getId())) {
-                GlobalVariable.loginMap.remove(camera.getId());
-            }
-
-            //鍒犻櫎绠$悊閫氶亾
-            ardChannelService.deleteArdChannelByDeviceId(camera.getId());
             GlobalVariable.loginMap.put(camera.getId(), lUserID);
             GlobalVariable.loginCameraMap.put(lUserID, camera);
-
-            camera.setLoginId(lUserID);
+            camera.setLoginId((long) lUserID);
             camera.setState("1");
-            camera.setChanNum((int) m_strDeviceInfo.struDeviceV30.byChanNum);
-            camera.setStartDChan((int) m_strDeviceInfo.struDeviceV30.byStartDChan);
-            //鑾峰彇鏈�鏂伴�氶亾
-            List<ArdChannel> cameraChannelList = getIPChannelInfo(camera);
-            if (cameraChannelList.size() > 0) {
-                camera.setChannelList(cameraChannelList);
-                for (ArdChannel channel : cameraChannelList) {
-                    channel.setId(IdUtils.simpleUUID());
-                    ardChannelService.insertArdChannel(channel);
-                }
-                //娣诲姞鍒版祦濯掍綋
-                addVtdu(camera);
+            int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
+            int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
+            if (camera.getGdtype().equals("2")) {
+                chanNum = m_strDeviceInfo.struDeviceV30.byIPChanNum;
+                startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
             }
-            //鍒涘缓寮曞闃熷垪
-            if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
-                Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
-                PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
-                GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
+            camera.setChanNum(chanNum);
+            camera.setStartChan(startDchan);
+            //鑾峰彇鏈�鏂伴�氶亾
+            List<ArdChannel> cameraChannelList = getChannels(camera);
+            if (cameraChannelList.size() > 0) {
+                ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+                cameraChannelList.stream().forEach(channel -> {
+                    ardChannelService.insertArdChannel(channel);
+                });
+                camera.setChannelList(cameraChannelList);
+                //camera.setChanNum(cameraChannelList.size());
+                //閫氶亾鎵归噺娣诲姞鍒版祦濯掍綋
+                batchAddVtdu(camera);
             }
             ardCamerasService.updateArdCameras(camera);
+            //鍒涘缓寮曞闃熷垪
+            createGuideQueue(camera);
+            //鍔犲叆宸茬櫥褰曡澶囬泦鍚�
+            GlobalVariable.loginedSet.add(camera);
             return AjaxResult.success("璁惧鐧诲綍鎴愬姛");
         } catch (Exception ex) {
             log.error("璁惧鐧诲綍寮傚父", ex);
@@ -182,32 +191,16 @@
      * @淇敼浜哄拰鍏跺畠淇℃伅
      */
     @Override
-    @Async("loginExecutor")
+    @Async("globalExecutor")
     public AjaxResult asyncLogin(ArdCameras camera) {
         try {
-            // 鍒濆鍖�
-            if (!hCNetSDK.NET_DVR_Init()) {
-                log.error("SDK鍒濆鍖栧け璐�");
-                return AjaxResult.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(5000, 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());
@@ -226,55 +219,45 @@
             if (lUserID < 0) {
                 int errorCode = hCNetSDK.NET_DVR_GetLastError();
                 camera.setChanNum(0);
-                camera.setLoginId(-1);
+                camera.setLoginId(-1l);
                 camera.setState("0");
                 //鍒犻櫎绠$悊閫氶亾
                 ardChannelService.deleteArdChannelByDeviceId(camera.getId());
                 ardCamerasService.updateArdCameras(camera);
-                log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
-                return AjaxResult.error("璁惧鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+                log.warn("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
+                return AjaxResult.warn("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
             }
             log.debug("Login Success 銆� " + camera.getIp() + ":" + camera.getPort() + " 銆�");
-            synchronized (_lock) {
-                if (fExceptionCallBack == null) {
-                    fExceptionCallBack = new ExceptionCallBack();//寮傚父鍥炶皟
-                    //璁剧疆寮傚父鍥炶皟鍑芥暟(鍙湪鍥炶皟鍑芥暟涓幏鍙栬澶囦笂涓嬬嚎鐘舵�佺瓑)
-                    if (!hCNetSDK.NET_DVR_SetExceptionCallBack_V30(0, 0, fExceptionCallBack, null)) {
-                        log.debug("Set fExceptionCallBack function fail");
-                    } else {
-                        log.debug("Set fExceptionCallBack function successfully!");
-                    }
-                }
-            }
-            if (GlobalVariable.loginMap.containsKey(camera.getId())) {
-                GlobalVariable.loginMap.remove(camera.getId());
-            }
 
-            //鍒犻櫎绠$悊閫氶亾
-            ardChannelService.deleteArdChannelByDeviceId(camera.getId());
             GlobalVariable.loginMap.put(camera.getId(), lUserID);
             GlobalVariable.loginCameraMap.put(lUserID, camera);
-
-            camera.setLoginId(lUserID);
+            camera.setLoginId((long) lUserID);
             camera.setState("1");
-            camera.setChanNum((int) m_strDeviceInfo.struDeviceV30.byChanNum);
-            camera.setStartDChan((int) m_strDeviceInfo.struDeviceV30.byStartDChan);
-
+            int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
+            int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
+            if (camera.getGdtype().equals("2")) {
+                chanNum = m_strDeviceInfo.struDeviceV30.byIPChanNum;
+                startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
+            }
+            camera.setChanNum(chanNum);
+            camera.setStartChan(startDchan);
             //鑾峰彇鏈�鏂伴�氶亾
-            List<ArdChannel> cameraChannelList = getIPChannelInfo(camera);
+            List<ArdChannel> cameraChannelList = getChannels(camera);
             if (cameraChannelList.size() > 0) {
-                camera.setChannelList(cameraChannelList);
-                camera.setChanNum(cameraChannelList.size());
-                for (ArdChannel channel : cameraChannelList) {
-                    channel.setId(IdUtils.simpleUUID());
+                ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+                cameraChannelList.stream().forEach(channel -> {
                     ardChannelService.insertArdChannel(channel);
-                }
+                });
+                camera.setChannelList(cameraChannelList);
+                //camera.setChanNum(cameraChannelList.size());
+                //閫氶亾鎵归噺娣诲姞鍒版祦濯掍綋
+                batchAddVtdu(camera);
             }
             ardCamerasService.updateArdCameras(camera);
-            //娣诲姞鍒版祦濯掍綋
-            addVtdu(camera);
             //鍒涘缓寮曞闃熷垪
             createGuideQueue(camera);
+            //鍔犲叆宸茬櫥褰曡澶囬泦鍚�
+            GlobalVariable.loginedSet.add(camera);
             return AjaxResult.success("璁惧鐧诲綍鎴愬姛");
         } catch (Exception ex) {
             log.error("娉ㄥ唽璁惧寮傚父", ex);
@@ -284,49 +267,29 @@
 
     //鍒涘缓寮曞闃熷垪
     private void createGuideQueue(ArdCameras camera) {
-        if (camera.getCamAlarmGuideEnable() != null) {
-            if (camera.getCamAlarmGuideEnable() == 1) {
-                if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
-                    Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
-                    PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
-                    GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
-                    //鍚姩闃熷垪澶勭悊鍣�
-                    queueHandler.process(camera.getId());
-                }
+        if (camera.getGdtype().equals("1")) {
+            if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
+                Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
+                PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
+                GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
+                //鍚姩闃熷垪澶勭悊鍣�
+                queueHandler.process(camera.getId());
             }
         }
     }
 
-    //娣诲姞鍒版祦濯掍綋
-    private void addVtdu(ArdCameras camera) {
+    //閫氶亾鎵归噺娣诲姞鍒版祦濯掍綋
+    public void batchAddVtdu(ArdCameras camera) {
         try {
-            for (ArdChannel channel : camera.getChannelList()) {
-                String name = camera.getId() + "_" + channel.getChanNo();
-                String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/h264/ch" + channel.getChanNo() + "/main/av_stream";
-                Vtdu vtdu = vtduService.selectVtduByName(name);
-                if (vtdu != null) {
-                    vtduService.deleteVtduByName(name);
-                }
-                //娣诲姞鍒版祦濯掍綋
-                vtdu = new Vtdu();
-                vtdu.setRtspSource(rtspSource);
-                vtdu.setName(camera.getId() + "_" + channel.getChanNo());
-                CameraCmd cmd = new CameraCmd(camera.getId(), channel.getChanNo());
-                Map<String, Object> videoCompressionCfg = getVideoCompressionCfg(cmd);
-                if (videoCompressionCfg.get("videoEncType").equals("鏍囧噯h264")) {
-                    vtdu.setIsCode("0");//榛樿涓嶈浆鐮�
-                } else {
-                    vtdu.setIsCode("1");//榛樿杞爜
-                }
-                vtdu.setMode("1");//榛樿CPU杞В鐮�
-                vtdu.setCameraId(camera.getId());
-                vtduService.insertVtdu(vtdu);
-            }
+            camera.getChannelList().stream().forEach(channel -> {
+                vtduService.addChanToVtdu(camera, channel);
+            });
         } catch (Exception ex) {
             log.error("閫氶亾娣诲姞鍒版祦濯掍綋寮傚父锛�" + ex.getMessage());
         }
 
     }
+
 
     /**
      * @鎻忚堪 娉ㄩ攢鐧诲綍
@@ -388,7 +351,7 @@
         Integer speed = cmd.getSpeed();
         Integer code = cmd.getCode();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         int dwStop;
@@ -457,7 +420,7 @@
         if (!bool) {
             int errorCode = hCNetSDK.NET_DVR_GetLastError();
             log.error("鎺у埗澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
-            return AjaxResult.error("鎺у埗澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+            return AjaxResult.warn("鎺у埗澶辫触:" + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
         }
         return AjaxResult.success("鎺у埗鎴愬姛");
     }
@@ -473,7 +436,7 @@
         Integer channelNum = cmd.getChanNo();
         Integer dwFocusPos = cmd.getDwFocusPos();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         // 鑾峰彇鍙傛暟
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
@@ -491,7 +454,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("璁剧疆GIS淇℃伅鏁版嵁澶辫触,璇风◢鍚庨噸璇�" + code);
-            return AjaxResult.error("璁剧疆GIS淇℃伅鏁版嵁澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("璁剧疆GIS淇℃伅鏁版嵁澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         return AjaxResult.success("璁剧疆GIS淇℃伅鏁版嵁鎴愬姛");
     }
@@ -523,7 +486,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("鑾峰彇鑱氱劍鍊煎け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇鑱氱劍鍊煎け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇鑱氱劍鍊煎け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         struGisInfo.read();
         int result = struGisInfo.struPtzPosEx.dwFocus;
@@ -548,7 +511,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("棰勭疆鐐硅缃け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("棰勭疆鐐硅缃け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("棰勭疆鐐硅缃け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         return AjaxResult.success("棰勭疆鐐硅缃垚鍔�");
     }
@@ -571,7 +534,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("璋冪敤棰勭疆鐐瑰け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("璋冪敤棰勭疆鐐瑰け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("璋冪敤棰勭疆鐐瑰け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         return AjaxResult.success("璋冪敤棰勭疆鐐规垚鍔�");
     }
@@ -900,7 +863,7 @@
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
 
@@ -912,7 +875,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("鑾峰彇ptz澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇ptz澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇ptz澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         m_ptzPosCurrent.read();
         // DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
@@ -950,7 +913,7 @@
             String cameraId = cmd.getCameraId();
             Integer chanNo = cmd.getChanNo();
             if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-                return AjaxResult.error("璁惧鏈櫥褰�");
+                return AjaxResult.warn("璁惧鏈櫥褰�");
             }
             IntByReference pchannel = new IntByReference(chanNo);
             Pointer pChannelNum = pchannel.getPointer();
@@ -967,8 +930,8 @@
             boolean res = hCNetSDK.NET_DVR_GetSTDConfig(lUserID, HCNetSDK.NET_DVR_GET_PTZABSOLUTEEX, lpConfigParam6696);
             if (!res) {
                 int code = hCNetSDK.NET_DVR_GetLastError();
-                log.error("鑾峰彇楂樼簿搴TZ缁濆浣嶇疆閰嶇疆澶辫触: errorCde" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
-                return AjaxResult.error("鑾峰彇楂樼簿搴TZ缁濆浣嶇疆閰嶇疆澶辫触: errorCde" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+                log.error("鑾峰彇楂樼簿搴TZ澶辫触: errorCode" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+                return AjaxResult.warn("鑾峰彇楂樼簿搴TZ澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
             }
             lpPTZAbsoluteEX_cfg.read();
             //log.debug("P锛�" + lpPTZAbsoluteEX_cfg.struPTZCtrl.fPan + " T锛�" + lpPTZAbsoluteEX_cfg.struPTZCtrl.fTilt + " Z锛�" + lpPTZAbsoluteEX_cfg.struPTZCtrl.fZoom
@@ -1003,7 +966,7 @@
         Integer channelNum = cmd.getChanNo();
         Map<String, Double> ptz = cmd.getPtzMap();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
@@ -1019,9 +982,9 @@
             m_ptzPosCurrent.write();
             boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_PTZPOS, channelNum, point, m_ptzPosCurrent.size());
             if (!bool) {
-                int errorCode = hCNetSDK.NET_DVR_GetLastError();
-                log.error("璁剧疆PTZ鍙傛暟澶辫触:" + errorCode);
-                return AjaxResult.error("璁剧疆PTZ鍙傛暟澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+                int code = hCNetSDK.NET_DVR_GetLastError();
+                log.error("璁剧疆PTZ鍙傛暟澶辫触: errorCode" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+                return AjaxResult.warn("璁剧疆PTZ鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
             }
             return AjaxResult.success("璁剧疆PTZ鍙傛暟鎴愬姛");
         } catch (Exception ex) {
@@ -1046,7 +1009,7 @@
             Integer chanNo = cmd.getChanNo();
             Map<String, Double> ptz = cmd.getPtzMap();
             if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-                return AjaxResult.error("璁惧鏈櫥褰�");
+                return AjaxResult.warn("璁惧鏈櫥褰�");
             }
             Integer lUserID = (Integer) GlobalVariable.loginMap.get(cameraId);
             IntByReference pchannel = new IntByReference(chanNo);
@@ -1069,8 +1032,8 @@
             lpPTZAbsoluteEX_cfgInfo.struPTZCtrl.fZoom = new Double(ptz.get("z")).floatValue();
             lpPTZAbsoluteEX_cfgInfo.struPTZCtrl.dwFocus = 399;
             lpPTZAbsoluteEX_cfgInfo.dwFocalLen = 1250;
-            lpPTZAbsoluteEX_cfgInfo.fHorizontalSpeed = (float) 10;
-            lpPTZAbsoluteEX_cfgInfo.fVerticalSpeed = (float) 10;
+            lpPTZAbsoluteEX_cfgInfo.fHorizontalSpeed = (float) 1000;
+            lpPTZAbsoluteEX_cfgInfo.fVerticalSpeed = (float) 1000;
             lpPTZAbsoluteEX_cfgInfo.byZoomType = 0;
             lpPTZAbsoluteEX_cfgInfo.write();
             lpConfigParam6697.lpInBuffer = lpPTZAbsoluteEX_cfgInfo.getPointer();
@@ -1078,9 +1041,9 @@
             lpConfigParam6697.write();
             boolean bool = hCNetSDK.NET_DVR_SetSTDConfig(lUserID, NET_DVR_SET_PTZABSOLUTEEX, lpConfigParam6697);
             if (!bool) {
-                int errorCode = hCNetSDK.NET_DVR_GetLastError();
-                log.error("璁剧疆楂樼簿搴TZ鍙傛暟澶辫触:" + errorCode);
-                return AjaxResult.error("璁剧疆楂樼簿搴TZ鍙傛暟澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+                int code = hCNetSDK.NET_DVR_GetLastError();
+                log.error("璁剧疆楂樼簿搴TZ澶辫触:" + code);
+                return AjaxResult.warn("璁剧疆楂樼簿搴TZ澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
             }
             return AjaxResult.success("璁剧疆楂樼簿搴TZ鍙傛暟鎴愬姛");
 
@@ -1096,7 +1059,7 @@
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
@@ -1107,7 +1070,10 @@
             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));
+            //淇淇话
+            double correctPitch = cameraSdkService.correctPitch(cmd);
+            double newt = cameraPTZ[1] + correctPitch;
+            String t = String.valueOf((int) (newt * 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));
@@ -1118,9 +1084,9 @@
             if (!bool) {
                 int code = hCNetSDK.NET_DVR_GetLastError();
                 log.error("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
-                return AjaxResult.error("璁剧疆ptz澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+                return AjaxResult.warn("璁剧疆ptz澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
             }
-            return AjaxResult.success("寮曞鍧愭爣鎴愬姛");
+            return AjaxResult.success("寮曞鍧愭爣鎴愬姛", correctPitch);
         } catch (Exception ex) {
             log.error("寮曞鍧愭爣寮傚父:" + ex.getMessage());
             return AjaxResult.error("寮曞鍧愭爣寮傚父:" + ex.getMessage());
@@ -1140,7 +1106,7 @@
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         NET_DVR_PTZ_LOCKCFG netDvrPtzLockcfg = new NET_DVR_PTZ_LOCKCFG();
@@ -1150,8 +1116,8 @@
         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.error("鑾峰彇ptz閿佸畾淇℃伅澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇ptz閿佸畾淇℃伅澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            log.error("鑾峰彇ptz閿佸畾澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇ptz閿佸畾澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         } else {
             netDvrPtzLockcfg.read();
             int byWorkMode = netDvrPtzLockcfg.byWorkMode;
@@ -1188,7 +1154,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("璁剧疆闆舵柟浣嶈澶辫触:" + code);
-            return AjaxResult.error("璁剧疆闆舵柟浣嶈澶辫触: errorCode:" + code + "errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("璁剧疆闆舵柟浣嶈澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         return AjaxResult.success();
     }
@@ -1217,7 +1183,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("鑾峰彇ptz鑼冨洿澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇ptz鑼冨洿澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇ptz鑼冨洿澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         } else {
             m_ptzPosCurrent.read();
             DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
@@ -1250,20 +1216,20 @@
     @Override
     public AjaxResult controlDefogcfg(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
+        Integer chanNo = cmd.getChanNo();
         boolean enable = cmd.isEnable();
-        Integer channelNum = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         NET_DVR_CAMERAPARAMCFG_EX struCameraParam = new NET_DVR_CAMERAPARAMCFG_EX();
         Pointer point = struCameraParam.getPointer();
         IntByReference ibrBytesReturned = new IntByReference(0);
-        boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_CCDPARAMCFG_EX, channelNum, point, struCameraParam.size(), ibrBytesReturned);
+        boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_CCDPARAMCFG_EX, chanNo, point, struCameraParam.size(), ibrBytesReturned);
         if (!b_GetCameraParam) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         struCameraParam.read();
         log.debug("鏄惁寮�鍚�忛浘锛�" + struCameraParam.struDefogCfg.byMode);
@@ -1277,11 +1243,11 @@
         }
         struCameraParam.struDefogCfg = defogcfg;
         struCameraParam.write();
-        boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, channelNum, point, struCameraParam.size());
+        boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, chanNo, point, struCameraParam.size());
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.error("鍒囨崲閫忛浘澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鍒囨崲閫忛浘澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            log.error("鍒囨崲閫忛浘澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鍒囨崲閫忛浘澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         log.debug("鍒囨崲閫忛浘鎴愬姛");
         return AjaxResult.success("鍒囨崲閫忛浘鎴愬姛");
@@ -1301,7 +1267,7 @@
         boolean enable = cmd.isEnable();
         Integer chanNo = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         NET_DVR_CAMERAPARAMCFG_EX struDayNigh = new NET_DVR_CAMERAPARAMCFG_EX();
@@ -1311,7 +1277,7 @@
         if (!b_GetCameraParam) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         struDayNigh.read();
         String current = struDayNigh.struDayNight.byDayNightFilterType == 1 ? "寮�鍚�" : "鍏抽棴";
@@ -1331,7 +1297,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("鍒囨崲绾㈠澶辫触 ErrorCode:{},ErrorInfo:{}", code, SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鍒囨崲绾㈠澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鍒囨崲绾㈠澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         log.debug("鍒囨崲绾㈠鎴愬姛");
         return AjaxResult.success("鍒囨崲绾㈠鎴愬姛");
@@ -1351,7 +1317,7 @@
         boolean enable = cmd.isEnable();
         Integer channelNum = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
@@ -1361,7 +1327,7 @@
         if (!b_GetCameraParam) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         struFocusMode.read();
         log.debug("褰撳墠鑱氱劍妯″紡锛�" + struFocusMode.byFocusMode);
@@ -1379,7 +1345,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("璁剧疆鑱氱劍妯″紡澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("璁剧疆鑱氱劍妯″紡澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("璁剧疆鑱氱劍妯″紡澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         log.debug("璁剧疆鑱氱劍妯″紡鎴愬姛");
         return AjaxResult.success("璁剧疆鑱氱劍妯″紡鎴愬姛");
@@ -1397,7 +1363,7 @@
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
@@ -1406,8 +1372,8 @@
         boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, struFocusMode.size(), ibrBytesReturned);
         if (!b_GetCameraParam) {
             int code = hCNetSDK.NET_DVR_GetLastError();
-            log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            log.error("鑾峰彇鑱氱劍妯″紡澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇鑱氱劍妯″紡澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         struFocusMode.read();
         log.debug("褰撳墠鑱氱劍妯″紡锛�" + struFocusMode.byFocusMode);
@@ -1428,7 +1394,7 @@
         boolean enable = cmd.isEnable();
         Integer channelNum = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         int dwStop;
@@ -1441,7 +1407,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("璁剧疆浜戝彴鍔犵儹澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("璁剧疆浜戝彴鍔犵儹澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("璁剧疆浜戝彴鍔犵儹澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         log.debug("璁剧疆浜戝彴鍔犵儹鎴愬姛");
         return AjaxResult.success("璁剧疆浜戝彴鍔犵儹鎴愬姛");
@@ -1461,7 +1427,7 @@
         boolean enable = cmd.isEnable();
         Integer channelNum = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
         NET_DVR_DEVSERVER_CFG struDeicing = new NET_DVR_DEVSERVER_CFG();
@@ -1471,7 +1437,7 @@
         if (!b_GetCameraParam) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         struDeicing.read();
         log.debug("鏄惁寮�鍚櫎鍐帮細" + struDeicing.byEnableDeicing);
@@ -1486,7 +1452,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("璁剧疆闀滃ご闄ゅ啺澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("璁剧疆闀滃ご闄ゅ啺澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("璁剧疆闀滃ご闄ゅ啺澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         log.debug("璁剧疆闀滃ご闄ゅ啺鎴愬姛");
         return AjaxResult.success("璁剧疆闀滃ご闄ゅ啺鎴愬姛");
@@ -1497,38 +1463,45 @@
      *
      * @param cmd 鐩告満鍛戒护
      */
-    public AjaxResult captureJPEGPicture(CameraCmd cmd) {
-        String cameraId = cmd.getCameraId();
-        Integer channelNum = cmd.getChanNo();
-        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+    @Override
+    public AjaxResult localCapture(CameraCmd cmd) {
+        try {
+            String cameraId = cmd.getCameraId();
+            Integer channelNum = cmd.getChanNo();
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return AjaxResult.warn("璁惧鏈櫥褰�");
+            }
+            Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
+            NET_DVR_WORKSTATE_V30 devwork = new NET_DVR_WORKSTATE_V30();
+            if (!hCNetSDK.NET_DVR_GetDVRWorkState_V30(userId, devwork)) {
+                int code = hCNetSDK.NET_DVR_GetLastError();
+                log.error("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+                return AjaxResult.warn("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
+            }
+            //鍥剧墖璐ㄩ噺
+            NET_DVR_JPEGPARA jpeg = new NET_DVR_JPEGPARA();
+            //璁剧疆鍥剧墖鍒嗚鲸鐜�
+            jpeg.wPicSize = 0;
+            //璁剧疆鍥剧墖璐ㄩ噺
+            jpeg.wPicQuality = 0;
+            IntByReference a = new IntByReference();
+            //璁剧疆鍥剧墖澶у皬
+            ByteBuffer jpegBuffer = ByteBuffer.allocate(1024 * 1024);
+            // 鎶撳浘鍒板唴瀛橈紝鍗曞抚鏁版嵁鎹曡幏骞朵繚瀛樻垚JPEG瀛樻斁鍦ㄦ寚瀹氱殑鍐呭瓨绌洪棿涓�
+            boolean is = hCNetSDK.NET_DVR_CaptureJPEGPicture_NEW(userId, channelNum, jpeg, jpegBuffer, 1024 * 1024, a);
+            //log.debug("-----------杩欓噷寮�濮嬪浘鐗囧瓨鍏ュ唴瀛�----------" + is);
+            // OutputStream outputStream = response.getOutputStream();
+            //outputStream.write(jpegBuffer.array());
+            //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.debug("-----------澶勭悊瀹屾垚鎴浘鏁版嵁----------");
+            return AjaxResult.success(jpegBuffer.array());
+        } catch (Exception ex) {
+            log.error("-----------鎴浘澶辫触----------");
+            return AjaxResult.error(ex.getMessage());
         }
-        Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
-        NET_DVR_WORKSTATE_V30 devwork = new NET_DVR_WORKSTATE_V30();
-        if (!hCNetSDK.NET_DVR_GetDVRWorkState_V30(userId, devwork)) {
-            int code = hCNetSDK.NET_DVR_GetLastError();
-            log.error("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
-        }
-        //鍥剧墖璐ㄩ噺
-        NET_DVR_JPEGPARA jpeg = new NET_DVR_JPEGPARA();
-        //璁剧疆鍥剧墖鍒嗚鲸鐜�
-        jpeg.wPicSize = 0;
-        //璁剧疆鍥剧墖璐ㄩ噺
-        jpeg.wPicQuality = 0;
-        IntByReference a = new IntByReference();
-        //璁剧疆鍥剧墖澶у皬
-        ByteBuffer jpegBuffer = ByteBuffer.allocate(1024 * 1024);
-        // 鎶撳浘鍒板唴瀛橈紝鍗曞抚鏁版嵁鎹曡幏骞朵繚瀛樻垚JPEG瀛樻斁鍦ㄦ寚瀹氱殑鍐呭瓨绌洪棿涓�
-        boolean is = hCNetSDK.NET_DVR_CaptureJPEGPicture_NEW(userId, channelNum, jpeg, jpegBuffer, 1024 * 1024, a);
-        log.debug("-----------杩欓噷寮�濮嬪浘鐗囧瓨鍏ュ唴瀛�----------" + is);
-
-        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.debug("-----------澶勭悊瀹屾垚鎴浘鏁版嵁----------");
-        return AjaxResult.success(png_base64);
     }
 
     /**
@@ -1604,8 +1577,10 @@
     public String record(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
-            Integer channelNum = cmd.getChanNo();
-            String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
+            Integer chanNo = cmd.getChanNo();
+            // 鏈湴涓存椂褰曞儚鍦板潃
+            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+            String path = FileUtils.createFile(tempPath + "/" + cameraId + ".mp4");
             boolean enable = cmd.isEnable();
             if (!GlobalVariable.loginMap.containsKey(cameraId)) {
                 return "";
@@ -1614,7 +1589,7 @@
             //寮哄埗I甯х粨鏋勪綋瀵硅薄
             HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME();   //鏂板缓缁撴瀯浣撳璞�
             netDvrIFrame.read();
-            netDvrIFrame.dwChannel = channelNum;//鍥犱负涓婃枃浠g爜涓缃簡閫氶亾鍙凤紝鎸夌収涓婃枃涓殑璁剧疆
+            netDvrIFrame.dwChannel = chanNo;//鍥犱负涓婃枃浠g爜涓缃簡閫氶亾鍙凤紝鎸夌収涓婃枃涓殑璁剧疆
             netDvrIFrame.byStreamType = 0;
             netDvrIFrame.dwSize = netDvrIFrame.size();
             netDvrIFrame.write();
@@ -1624,7 +1599,7 @@
             //棰勮鍙傛暟
             NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
             previewinfo.read();
-            previewinfo.lChannel = channelNum;
+            previewinfo.lChannel = chanNo;
             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琛ㄧず涓嶈В鐮佹樉绀恒��
@@ -1647,6 +1622,7 @@
                     return "";
                 }
                 log.debug("褰曞儚寮�濮�");
+
             } else {
                 if (GlobalVariable.previewMap.containsKey(cameraId)) {
                     Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
@@ -1676,7 +1652,9 @@
         try {
             String cameraId = cmd.getCameraId();
             Integer channelNum = cmd.getChanNo();
-            String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
+            // 鏈湴涓存椂褰曞儚鍦板潃
+            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+            String path = FileUtils.createFile(tempPath + "/" + cameraId + ".mp4");
             if (!GlobalVariable.loginMap.containsKey(cameraId)) {
                 return false;
             }
@@ -1689,7 +1667,8 @@
             netDvrIFrame.dwSize = netDvrIFrame.size();
             netDvrIFrame.write();
             if (!hCNetSDK.NET_DVR_RemoteControl(userId, 3402, netDvrIFrame.getPointer(), netDvrIFrame.dwSize)) {
-                log.error("寮哄埗I甯� 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
+                int code = hCNetSDK.NET_DVR_GetLastError();
+                log.error("璁剧疆寮哄埗I甯ч敊璇�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
             }
             //棰勮鍙傛暟
             NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
@@ -1733,7 +1712,9 @@
         try {
             String cameraId = cmd.getCameraId();
             Integer channelNum = cmd.getChanNo();
-            String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
+            // 鏈湴涓存椂褰曞儚鍦板潃
+            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+            String path = FileUtils.createFile(tempPath + "/" + cameraId + ".mp4");
             if (!GlobalVariable.loginMap.containsKey(cameraId)) {
                 return "";
             }
@@ -1827,34 +1808,28 @@
     }
 
     //鑾峰彇IP閫氶亾
-    public List<ArdChannel> getIPChannelInfo(ArdCameras camera) {
-
+    public List<ArdChannel> getChannels(ArdCameras camera) {
         //鑾峰彇閫氶亾
         List<ArdChannel> channelList = new ArrayList<>();
         try {
-            if (camera.getGdtype().equals("3")) {
-                camera.setChanNum(64);//瓒呰剳鑾峰彇鍦ㄧ嚎閫氶亾鏁�
-                camera.setStartDChan(0);//瓒呰剳鍒濆閫氶亾涓�0
-            }
             IntByReference ibrBytesReturned = new IntByReference(0);//鑾峰彇IP鎺ュ叆閰嶇疆鍙傛暟
             HCNetSDK.NET_DVR_IPPARACFG_V40 m_strIpparaCfg = new HCNetSDK.NET_DVR_IPPARACFG_V40();
             m_strIpparaCfg.write();
             //lpIpParaConfig 鎺ユ敹鏁版嵁鐨勭紦鍐叉寚閽�
             Pointer lpIpParaConfig = m_strIpparaCfg.getPointer();
-            boolean bRet = hCNetSDK.NET_DVR_GetDVRConfig(camera.getLoginId(), HCNetSDK.NET_DVR_GET_IPPARACFG_V40, 0, lpIpParaConfig, m_strIpparaCfg.size(), ibrBytesReturned);
+            boolean bRet = hCNetSDK.NET_DVR_GetDVRConfig(camera.getLoginId().intValue(), HCNetSDK.NET_DVR_GET_IPPARACFG_V40, 0, lpIpParaConfig, m_strIpparaCfg.size(), ibrBytesReturned);
             m_strIpparaCfg.read();
             //log.debug("璧峰鏁板瓧閫氶亾鍙凤細" + m_strIpparaCfg.dwStartDChan);//m_strIpparaCfg.dwDChanNum
             for (int iChannum = 0; iChannum < camera.getChanNum(); iChannum++) {
-                ArdChannel ardChannel = new ArdChannel();
-                int channum = iChannum + camera.getStartDChan() + 1;
+                ArdChannel channel = new ArdChannel();
+                int chanNo = iChannum + camera.getStartChan();
                 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);
+                NativeLong lChannel = new NativeLong(chanNo);
                 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);
+                boolean b_GetPicCfg = hCNetSDK.NET_DVR_GetDVRConfig(camera.getLoginId().intValue(), HCNetSDK.NET_DVR_GET_PICCFG_V40, lChannel.intValue(), pStrPicCfg, strPicCfg.size(), pInt);
                 if (!b_GetPicCfg) {
                     // log.error("鑾峰彇鍥惧儚鍙傛暟澶辫触锛岄敊璇爜锛�" + hCNetSDK.NET_DVR_GetLastError());
                 }
@@ -1863,20 +1838,19 @@
                 if (m_strIpparaCfg.struStreamMode[iChannum].byGetStreamType == 0) {
                     m_strIpparaCfg.struStreamMode[iChannum].uGetStream.setType(HCNetSDK.NET_DVR_IPCHANINFO.class);
                     m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.read();
-                    int channel = m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPID + m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPIDHigh * 256;
+                    int channelNo = m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPID + m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPIDHigh * 256;
                     String channelName = new String(strPicCfg.sChanName, "GBK").trim();
-                    ardChannel.setDeviceId(camera.getId());
-                    ardChannel.setName(channelName);
-                    ardChannel.setChanNo(channum);
-                    if (camera.getGdtype().equals("3")) {
-                        //瓒呰剳鍙幏鍙栧湪绾块�氶亾
-                        if (m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byEnable == 1) {
-                            //log.debug("IP閫氶亾" + channum + "鍦ㄧ嚎");
-                            channelList.add(ardChannel);
+                    channelName = channelName.equals("") ? "閫氶亾" + chanNo : channelName;
+                    channel.setDeviceId(camera.getId());
+                    channel.setName(channelName);
+                    channel.setChanNo(chanNo);
+                    if (camera.getGdtype().equals("3") || camera.getGdtype().equals("2")) {
+                        //NVR杩囨护绂荤嚎閫氶亾
+                        if (m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byEnable != 1) {
+                            continue;
                         }
-                    } else {
-                        channelList.add(ardChannel);
                     }
+                    channelList.add(channel);
                 }
             }
         } catch (Exception ex) {
@@ -1898,7 +1872,7 @@
         String cameraId = cmd.getCameraId();
         Integer channelNum = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return AjaxResult.error("璁惧鏈櫥褰�");
+            return AjaxResult.warn("璁惧鏈櫥褰�");
         }
         // 鑾峰彇鍙傛暟
         Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
@@ -1915,7 +1889,7 @@
         if (!bool) {
             int code = hCNetSDK.NET_DVR_GetLastError();
             log.error("鑾峰彇GIS淇℃伅鏁版嵁澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
-            return AjaxResult.error("鑾峰彇GIS淇℃伅鏁版嵁澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+            return AjaxResult.warn("鑾峰彇GIS淇℃伅鏁版嵁澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
         }
         struGisInfo.read();
         Map<String, Object> map = new HashMap<>();
@@ -1927,4 +1901,114 @@
         return AjaxResult.success(map);
 
     }
+
+    //鏈湴褰曞儚寮�濮�
+    @Override
+    public AjaxResult localRecordStart(CameraCmd cmd) {
+        try {
+            String operator = cmd.getOperator();
+            String cameraId = cmd.getCameraId();
+            Integer channelNum = cmd.getChanNo();
+            // 鏈湴涓存椂褰曞儚鍦板潃
+            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+            String path = FileUtils.createFile(tempPath + "/" + operator + "/" + cameraId + ".mp4");
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return AjaxResult.warn("璁惧鏈櫥褰�");
+            }
+            Integer userId = (Integer) 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) {
+                int code = hCNetSDK.NET_DVR_GetLastError();
+                log.error("鏈湴褰曞儚鍙栨祦澶辫触" + hCNetSDK.NET_DVR_GetLastError());
+                return AjaxResult.warn("鏈湴褰曞儚鍙栨祦澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
+            }
+            log.debug("鏈湴褰曞儚鍙栨祦鎴愬姛");
+            //GlobalVariable.threadMap.put(cameraId, Thread.currentThread().getName());
+            //GlobalVariable.previewMap.put(cameraId, lRealHandle);
+            if (!hCNetSDK.NET_DVR_SaveRealData_V30(lRealHandle, 2, path)) {
+                int code = hCNetSDK.NET_DVR_GetLastError();
+                log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负:  " + hCNetSDK.NET_DVR_GetLastError());
+                return AjaxResult.warn("鏈湴褰曞儚鍙栨祦澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
+            }
+            log.debug("鏈湴褰曞儚寮�濮�");
+            return AjaxResult.success("褰曞儚寮�濮�", lRealHandle);
+        } catch (Exception ex) {
+            log.error("鏈湴褰曞儚寮�濮嬪紓甯�" + ex.getMessage());
+            return AjaxResult.error("鏈湴褰曞儚寮�濮嬪紓甯�" + ex.getMessage());
+        }
+    }
+
+    //鏈湴褰曞儚鍋滄
+    @Override
+    public AjaxResult localRecordStop(CameraCmd cmd) {
+        try {
+            String operator = cmd.getOperator();
+            String cameraId = cmd.getCameraId();
+            Integer channelNum = cmd.getChanNo();
+            Integer lRealHandle = cmd.getRecordId().intValue();
+
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return AjaxResult.warn("璁惧鏈櫥褰�");
+            }
+            Integer userId = (Integer) 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
+            hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
+            log.debug("鏈湴褰曞儚鍋滄");
+            // 鏈湴涓存椂褰曞儚鍦板潃
+            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+            String recordPath = FileUtils.createFile(tempPath + "/" + operator + "/" + cameraId + ".mp4");
+            byte[] recordBytes = Files.readAllBytes(Paths.get(recordPath));
+            return AjaxResult.success(recordBytes);
+        } catch (Exception ex) {
+            log.error("鏈湴褰曞儚鍋滄寮傚父" + ex.getMessage());
+            return AjaxResult.error("鏈湴褰曞儚鍋滄寮傚父" + ex.getMessage());
+        }
+    }
 }

--
Gitblit v1.9.3