From 1ca9656140c41165459dfb6f6b7606b3aa6a8747 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Wed, 24 Jul 2024 15:05:13 +0800
Subject: [PATCH] 三一车辆查询加入关联后bug修改提交

---
 ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java |  701 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 405 insertions(+), 296 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
index 2eb90d2..fe9af52 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
@@ -3,44 +3,49 @@
 import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
 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.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;
 import com.ruoyi.utils.sdk.common.GlobalVariable;
+import com.ruoyi.utils.sdk.dhsdk.common.ErrorCode;
 import com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib;
 import com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NEW_CONFIG;
 import com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE;
+import com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_INFRARED_INFO;
 import com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_VIDEO_IN_FOCUS;
 import com.ruoyi.utils.sdk.dhsdk.lib.structure.DH_OUT_PTZ_VIEW_RANGE_STATUS;
 import com.ruoyi.utils.sdk.dhsdk.module.*;
 import com.sun.jna.Pointer;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.text.DecimalFormat;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.PriorityBlockingQueue;
 
 import static com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.*;
-import static com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_DEVSTATE_PTZ_VIEW_RANGE;
 import static com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_MOVE_CONTROL;
 import static com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_SET_CONTROL;
 import static com.ruoyi.utils.sdk.dhsdk.lib.ToolKits.getErrorCodePrint;
@@ -62,6 +67,9 @@
     private IArdChannelService ardChannelService;
     @Resource
     private IVtduService vtduService;
+
+    @Resource
+    ICameraSdkService cameraSdkService;
     @Value("${minio.endpoint}")
     private String minioEndPoint;
     @Resource
@@ -81,190 +89,141 @@
      * @return
      */
     @Override
-
-    public boolean login(ArdCameras camera) {
-        LoginModule.init(disConnect, haveReConnect);
-        NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
-        NetSDKLib.LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword(), m_stDeviceInfo);
-        if (loginId.longValue() <= 0) {
-            camera.setChanNum(0);
-            camera.setLoginId(-1);
-            camera.setState("0");
+    public AjaxResult login(ArdCameras camera) {
+        try {
+            LoginModule.init(disConnect, haveReConnect);
+            NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
+            NetSDKLib.LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword(), m_stDeviceInfo);
+            if (loginId.longValue() <= 0) {
+                camera.setChanNum(0);
+                camera.setLoginId(-1l);
+                camera.setState("0");
+                ardCamerasService.updateArdCameras(camera);
+                //删除管理通道
+                ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+                log.error("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录失败:" + getErrorCodePrint());
+                return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
+            }
+            log.debug("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录成功:" + (int) loginId.longValue());
+            camera.setState("1");
+            camera.setChanNum(m_stDeviceInfo.byChanNum);
+            camera.setStartChan(1);
+            camera.setLoginId(loginId.longValue());
+            GlobalVariable.loginMap.put(camera.getId(), loginId);
+            //获取最新通道
+            List<ArdChannel> ardChannelList = getChannels(camera);
+            if (ardChannelList.size() > 0) {
+                ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+                ardChannelList.stream().forEach(channel -> {
+                    ardChannelService.insertArdChannel(channel);
+                });
+                camera.setChannelList(ardChannelList);
+                //通道批量添加到流媒体
+                batchAddVtdu(camera);
+            }
             ardCamerasService.updateArdCameras(camera);
-            //删除管理通道
-            ardChannelService.deleteArdChannelByDeviceId(camera.getId());
-            return false;
+            //创建引导队列
+            createGuideQueue(camera);
+            //加入已登录设备集合
+            GlobalVariable.loginedSet.add(camera);
+            return AjaxResult.success("设备登录成功");
+        } catch (Exception ex) {
+            log.error("设备登录异常:" + ex.getMessage());
+            return AjaxResult.error("设备登录异常:" + ex.getMessage());
         }
-        if (GlobalVariable.loginMap.containsKey(camera.getId())) {
-            GlobalVariable.loginMap.remove(camera.getId());
-        }
-        //删除管理通道
-        ardChannelService.deleteArdChannelByDeviceId(camera.getId());
-        camera.setState("1");
-        camera.setChanNum(m_stDeviceInfo.byChanNum);
-        camera.setStartDChan(1);
-        camera.setLoginId((int) loginId.longValue());
-        ardCamerasService.updateArdCameras(camera);
-        GlobalVariable.loginMap.put(camera.getId(), loginId);
-
-        //获取最新通道
-        for (int i = 1; i < m_stDeviceInfo.byChanNum + 1; i++) {
-            ArdChannel channel = new ArdChannel();
-            NetSDKLib.AV_CFG_ChannelName av_cfg_channelName = new NetSDKLib.AV_CFG_ChannelName();
-            boolean b = ConfigModule.GetNewDevConfig(loginId, i - 1, CFG_CMD_CHANNELTITLE, av_cfg_channelName);
-            if (b) {
-                String chanName = null;
-                try {
-                    chanName = new String(av_cfg_channelName.szName, "GBK").trim();
-                } catch (UnsupportedEncodingException e) {
-                    e.printStackTrace();
-                }
-                channel.setName(chanName);
-            } else {
-                channel.setName("通道" + i);
-            }
-            channel.setDeviceId(camera.getId());
-            channel.setChanNo(i);
-            ardChannelService.insertArdChannel(channel);
-        }
-        //配置到流媒体
-        for (int i = 1; i < m_stDeviceInfo.byChanNum + 1; i++) {
-            String name = camera.getId() + "_" + i;
-            String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/cam/realmonitor?channel=" + i + "&subtype=0";
-            Vtdu vtdu = vtduService.selectVtduByName(name);
-            if (vtdu != null) {
-                vtduService.deleteVtduByName(name);
-            }
-            //添加到流媒体
-            CameraCmd cmd = new CameraCmd(camera.getId(), i);
-            Map<String, Object> videoCompressionCfg = getVideoCompressionCfg(cmd);
-            vtdu = new Vtdu();
-            if (videoCompressionCfg.get("videoEncType") != null) {
-                if (videoCompressionCfg.get("videoEncType").equals("标准h264")) {
-                    vtdu.setIsCode("0");//默认不转码
-                } else {
-                    vtdu.setIsCode("1");//默认转码
-                }
-            } else {
-                vtdu.setIsCode("0");//默认不转码
-            }
-            vtdu.setRtspSource(rtspSource);
-            vtdu.setName(camera.getId() + "_" + i);
-            vtdu.setMode("1");//默认CPU软解码
-            vtdu.setCameraId(camera.getId());
-            vtduService.insertVtdu(vtdu);
-        }
-
-        //创建引导队列
-        //创建引导队列
-        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());
-        }
-        return true;
     }
 
     @Override
     @Async("loginExecutor")
-    public void asyncLogin(ArdCameras camera) {
-        LoginModule.init(disConnect, haveReConnect);
-        NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
-        NetSDKLib.LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword(), m_stDeviceInfo);
-        if (loginId.longValue() <= 0) {
-            camera.setChanNum(0);
-            camera.setLoginId(-1);
-            camera.setState("0");
+    public AjaxResult asyncLogin(ArdCameras camera) {
+        try {
+            LoginModule.init(disConnect, haveReConnect);
+            NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
+            NetSDKLib.LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword(), m_stDeviceInfo);
+            if (loginId.longValue() <= 0) {
+                camera.setChanNum(0);
+                camera.setLoginId(-1l);
+                camera.setState("0");
+                ardCamerasService.updateArdCameras(camera);
+                //删除管理通道
+                ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+                log.error("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录失败:" + getErrorCodePrint());
+                return AjaxResult.warn(getErrorCodePrint());
+            }
+            log.debug("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录成功:" + loginId);
+            camera.setState("1");
+            camera.setChanNum(m_stDeviceInfo.byChanNum);
+            camera.setStartChan(1);
+            camera.setLoginId(loginId.longValue());
             ardCamerasService.updateArdCameras(camera);
-            //删除管理通道
-            ardChannelService.deleteArdChannelByDeviceId(camera.getId());
-            return;
-        }
-        if (GlobalVariable.loginMap.containsKey(camera.getId())) {
-            GlobalVariable.loginMap.remove(camera.getId());
-        }
-        //删除管理通道
-        ardChannelService.deleteArdChannelByDeviceId(camera.getId());
-        camera.setState("1");
-        camera.setChanNum(m_stDeviceInfo.byChanNum);
-        camera.setStartDChan(1);
-        camera.setLoginId((int) loginId.longValue());
-        ardCamerasService.updateArdCameras(camera);
-        GlobalVariable.loginMap.put(camera.getId(), loginId);
+            GlobalVariable.loginMap.put(camera.getId(), loginId);
 
-        //获取最新通道
-        for (int i = 1; i < m_stDeviceInfo.byChanNum + 1; i++) {
-            ArdChannel channel = new ArdChannel();
-            NetSDKLib.AV_CFG_ChannelName av_cfg_channelName = new NetSDKLib.AV_CFG_ChannelName();
-            boolean b = ConfigModule.GetNewDevConfig(loginId, i - 1, CFG_CMD_CHANNELTITLE, av_cfg_channelName);
-            if (b) {
-                String chanName = null;
-                try {
-                    chanName = new String(av_cfg_channelName.szName, "GBK").trim();
-                } catch (UnsupportedEncodingException e) {
-                    e.printStackTrace();
-                }
-                channel.setName(chanName);
-            } else {
-                channel.setName("通道" + i);
+            //获取最新通道
+            List<ArdChannel> ardChannelList = getChannels(camera);
+            if (ardChannelList.size() > 0) {
+                ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+                ardChannelList.stream().forEach(channel -> {
+                    ardChannelService.insertArdChannel(channel);
+                });
+                camera.setChannelList(ardChannelList);
+                //通道批量添加到流媒体
+                batchAddVtdu(camera);
             }
-            channel.setDeviceId(camera.getId());
-            channel.setChanNo(i);
-            ardChannelService.insertArdChannel(channel);
+            ardCamerasService.updateArdCameras(camera);
+            //创建引导队列
+            createGuideQueue(camera);
+            //加入已登录设备集合
+            GlobalVariable.loginedSet.add(camera);
+            return AjaxResult.success("登录成功");
+        } catch (Exception ex) {
+            log.error("登录异常:" + ex.getMessage());
+            return AjaxResult.error("登录异常:" + ex.getMessage());
         }
-        //配置到流媒体
-        addVtdu(camera);
-        //创建引导队列
-        createGuideQueue(camera);
     }
 
-    //添加到流媒体
-    private void addVtdu(ArdCameras camera) {
-        for (int i = 1; i < camera.getChanNum() + 1; i++) {
-            String name = camera.getId() + "_" + i;
-            String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/cam/realmonitor?channel=" + i + "&subtype=0";
-            Vtdu vtdu = vtduService.selectVtduByName(name);
-            if (vtdu != null) {
-                vtduService.deleteVtduByName(name);
-            }
-            //添加到流媒体
-            CameraCmd cmd = new CameraCmd(camera.getId(), i);
-            Map<String, Object> videoCompressionCfg = getVideoCompressionCfg(cmd);
-            vtdu = new Vtdu();
-            if (videoCompressionCfg.get("videoEncType") != null) {
-                if (videoCompressionCfg.get("videoEncType").equals("标准h264")) {
-                    vtdu.setIsCode("0");//默认不转码
-                } else {
-                    vtdu.setIsCode("1");//默认转码
-                }
-            } else {
-                vtdu.setIsCode("0");//默认不转码
-            }
-            vtdu.setRtspSource(rtspSource);
-            vtdu.setName(camera.getId() + "_" + i);
-            vtdu.setMode("1");//默认CPU软解码
-            vtdu.setCameraId(camera.getId());
-            vtduService.insertVtdu(vtdu);
-        }
+    //通道批量添加到流媒体
+    public void batchAddVtdu(ArdCameras camera) {
+        camera.getChannelList().stream().forEach(channel -> {
+            vtduService.addChanToVtdu(camera, channel);
+        });
     }
+
 
     //创建引导队列
     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());
             }
         }
+    }
+
+    //获取通道
+    public List<ArdChannel> getChannels(ArdCameras camera) {
+        if (camera.getLoginId() < 0) {
+            return new ArrayList<>();
+        }
+        LLong loginId = new LLong(camera.getLoginId());
+        List<ArdChannel> ardChannelList = new ArrayList<>();
+        for (int i = 1; i < camera.getChanNum() + 1; i++) {
+            ArdChannel channel = new ArdChannel();
+            String chanName = ConfigModule.getChannelName(loginId, i).trim();
+            channel.setName(chanName.equals("") ? "通道" + i : chanName);
+            channel.setDeviceId(camera.getId());
+            channel.setChanNo(i);
+            if (camera.getGdtype().equals("2")) {
+                //NVR过滤不在线的通道
+                if (!ConfigModule.queryCameraState(loginId, camera.getChanNum(), i)) {
+                    continue;
+                }
+            }
+            ardChannelList.add(channel);
+        }
+        return ardChannelList;
     }
 
     /**
@@ -315,14 +274,15 @@
      * 2023/10/17 8:28:13
      */
     @Override
-    public boolean pTZControl(CameraCmd cmd) {
+    @SdkOperate
+    public AjaxResult pTZControl(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         boolean enable = cmd.isEnable();
         Integer chanNo = cmd.getChanNo();
         Integer speed = cmd.getSpeed();
         Integer code = cmd.getCode();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
         int dwStop;
@@ -389,8 +349,9 @@
         boolean bool = PtzControlModule.ptzControl(loginId, chanNo - 1, dwPTZCommand, speed, speed, 0, dwStop);
         if (!bool) {
             log.error("控制失败,请稍后重试" + getErrorCodePrint());
+            return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
         }
-        return bool;
+        return AjaxResult.success("云台控制成功");
     }
 
     /**
@@ -399,31 +360,44 @@
      * 2023/10/17 8:28:13
      */
     @Override
-    public Map<String, Object> getPtz(CameraCmd cmd) {
+    public AjaxResult getPtz(CameraCmd cmd) {
         Map<String, Object> ptzMap = new HashMap<>();
         String cameraId = cmd.getCameraId();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return null;
+            return AjaxResult.warn("设备未登录");
         }
         NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
         NetSDKLib.NET_PTZ_LOCATION_INFO dh_ptz_location_info = new NetSDKLib.NET_PTZ_LOCATION_INFO();
         boolean b = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_LOCATION, dh_ptz_location_info);
-        if (b) {
-            DecimalFormat df = new DecimalFormat("0.0");//设置保留位数
-            String nPTZPan = df.format((float) dh_ptz_location_info.nPTZPan / 10);
-            float t = (float) dh_ptz_location_info.nPTZTilt / 10 * -1;
-            String nPTZTilt = df.format(t < 0 ? t + 360 : t);
-            String nPTZZoom = df.format((float) dh_ptz_location_info.nPTZZoom);
-            ptzMap.put("p", nPTZPan);
-            ptzMap.put("t", nPTZTilt);
-            ptzMap.put("z", nPTZZoom);
+        if (!b) {
+            int code = netsdk.CLIENT_GetLastError();
+            log.error("设置ptz失败:" + getErrorCodePrint());
+            return AjaxResult.warn("设置ptz失败:" + getErrorCodePrint());
         }
-        return ptzMap;
+        DecimalFormat df = new DecimalFormat("0.0");//设置保留位数
+        String nPTZPan = df.format((float) dh_ptz_location_info.nPTZPan / 10);
+        float t = (float) dh_ptz_location_info.nPTZTilt / 10 * -1;
+        String nPTZTilt = df.format(t < 0 ? t + 360 : t);
+        String nPTZZoom = df.format((float) dh_ptz_location_info.nPTZZoom);
+        ptzMap.put("p", nPTZPan);
+        ptzMap.put("t", nPTZTilt);
+        ptzMap.put("z", nPTZZoom);
+        return AjaxResult.success(ptzMap);
     }
 
     @Override
-    public Map<String, Object> getPtzScope(CameraCmd cmd) {
-        return null;
+    public AjaxResult getPtzHigh(CameraCmd cmd) {
+        return getPtz(cmd);
+    }
+
+    @Override
+    public AjaxResult getPtzScope(CameraCmd cmd) {
+        return AjaxResult.success("未实现该功能");
+    }
+
+    @Override
+    public AjaxResult setPtzHigh(CameraCmd cmd) {
+        return setPtz(cmd);
     }
 
     /**
@@ -435,15 +409,19 @@
      * @修改人和其它信息 注意俯仰角度负值需要加上360得到的正值进行设置
      */
     @Override
-    public boolean setPtz(CameraCmd cmd) {
+    @SdkOperate
+    public AjaxResult setPtz(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         Map<String, Double> ptz = cmd.getPtzMap();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         try {
+            if (ptz.get("p") == null || ptz.get("t") == null || ptz.get("z") == null) {
+                return AjaxResult.warn("ptz参数不能为空");
+            }
             int p = (int) (ptz.get("p") * 10);
             int t = (int) (ptz.get("t") * 10);
             t = t > 900 ? 3600 - t : t * -1;
@@ -451,12 +429,13 @@
             int z = ptz.get("z").intValue() == 0 ? 1 : ptz.get("z").intValue();
             boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
             if (!bool) {
-                log.error("控制失败,请稍后重试" + getErrorCodePrint());
+                log.error("设置ptz失败:" + getErrorCodePrint());
+                return AjaxResult.warn("设置ptz失败:" + getErrorCodePrint());
             }
-            return bool;
+            return AjaxResult.success("设置ptz成功");
         } catch (Exception ex) {
-            log.error(ex.getMessage());
-            return false;
+            log.error("设置ptz异常:" + ex.getMessage());
+            return AjaxResult.error("设置ptz异常:" + ex.getMessage());
         }
     }
 
@@ -469,18 +448,20 @@
      * @修改人和其它信息 注意俯仰角度负值需要加上360得到的正值进行设置
      */
     @Override
-    public boolean setZeroPtz(CameraCmd cmd) {
+    @SdkOperate
+    public AjaxResult setZeroPtz(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         boolean bool = NetSDKLib.NETSDK_INSTANCE.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RESETZERO, 0, 0, 0, 0);
         if (!bool) {
-            log.error("控制失败,请稍后重试" + getErrorCodePrint());
+            log.error("设置零方位角失败:" + getErrorCodePrint());
+            return AjaxResult.warn("设置ptz失败:" + getErrorCodePrint());
         }
-        return bool;
+        return AjaxResult.success("设置零方位角成功");
     }
 
     /**
@@ -512,6 +493,102 @@
 
     }
 
+    @Override
+    public AjaxResult localCapture(CameraCmd cmd) {
+        try {
+            String cameraId = cmd.getCameraId();
+            Integer chanNo = cmd.getChanNo();
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return AjaxResult.warn("设备未登录");
+            }
+            LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
+            // 本地临时录像地址
+            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+            String imagePath = FileUtils.createFile(tempPath + "/" + cameraId + ".jpeg");
+            fCaptureReceiveCB1 m_CaptureReceiveCB = new fCaptureReceiveCB1(imagePath);
+            CapturePictureModule.setSnapRevCallBack(m_CaptureReceiveCB);
+            boolean b = CapturePictureModule.remoteCapturePicture(loginId, chanNo - 1);
+            if (!b) {
+                return AjaxResult.warn("本地抓图失败");
+            }
+            Thread.sleep(200);
+            byte[] imageBytes = Files.readAllBytes(Paths.get(imagePath));
+            //OutputStream outputStream = response.getOutputStream();
+            //outputStream.write(imageBytes);
+            // 创建ByteBuffer并将字节数组写入其中
+            //ByteBuffer jpegBuffer = ByteBuffer.wrap(imageBytes);
+            //Base64.Encoder decoder = Base64.getEncoder();
+            //String png_base64 = decoder.encodeToString(jpegBuffer.array());//转换成base64串
+            return AjaxResult.success(imageBytes);
+        } catch (Exception ex) {
+            return AjaxResult.error("本地抓图异常:" + ex);
+        }
+    }
+
+    //本地录像开始
+    @Override
+    public AjaxResult localRecordStart(CameraCmd cmd) {
+        try {
+            String operator = cmd.getOperator();
+            String cameraId = cmd.getCameraId();
+            Integer chanNo = cmd.getChanNo();
+
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return AjaxResult.warn("设备未登录");
+            }
+            LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
+            //if (GlobalVariable.previewMap.containsKey(cameraId)) {
+            //    lRealHandle = new LLong(GlobalVariable.previewMap.get(cameraId));
+            //    RealPlayModule.stopRealPlay(lRealHandle);
+            //    GlobalVariable.previewMap.remove(cameraId);
+            //    log.debug("停止当前录像");
+            //}
+
+            // 本地临时录像地址
+            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+            String path = FileUtils.createFile(tempPath + "/" + operator + "/" + cameraId + ".mp4");
+            LLong lRealHandle = RealPlayModule.startRealPlay(loginId, chanNo - 1, path);
+            if (lRealHandle.longValue() <= 0) {
+                log.error("取流失败" + getErrorCodePrint());
+            }
+            log.debug("本地录像开始取流成功");
+            //GlobalVariable.previewMap.put(cameraId, lRealHandle.intValue());
+            //GlobalVariable.threadMap.put(cameraId, Thread.currentThread().getName());
+            //if (!netsdk.CLIENT_SaveRealData(lRealHandle, path)) {
+            //    log.error("保存视频文件到临时文件夹失败 错误码为:  " +getErrorCodePrint());
+            //    return false;
+            //}
+            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();
+            LLong lRealHandle = new LLong(cmd.getRecordId());
+            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
+                return AjaxResult.warn("设备未登录");
+            }
+            RealPlayModule.stopRealPlay(lRealHandle);
+            log.debug("本地录像停止");
+            // 本地临时录像地址
+            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+            String recordPath = FileUtils.createFile(tempPath + "/" + operator + "/" + cameraId + ".mp4");
+            byte[] imageBytes = Files.readAllBytes(Paths.get(recordPath));
+            return AjaxResult.success(imageBytes);
+        } catch (Exception ex) {
+            log.error("本地录像停止异常" + ex.getMessage());
+            return AjaxResult.error("本地录像停止异常" + ex.getMessage());
+        }
+    }
+
     /**
      * @描述 短时录像
      * @参数 [userId, channelNum, enable]
@@ -526,7 +603,9 @@
             String url = "";
             String cameraId = cmd.getCameraId();
             Integer chanNo = 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");
             boolean enable = cmd.isEnable();
             if (!GlobalVariable.loginMap.containsKey(cameraId)) {
                 return "";
@@ -565,7 +644,9 @@
         try {
             String cameraId = cmd.getCameraId();
             Integer chanNo = 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;
             }
@@ -601,7 +682,9 @@
         String url = "";
         try {
             String cameraId = cmd.getCameraId();
-            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 "";
             }
@@ -651,10 +734,6 @@
         return result;
     }
 
-    @Override
-    public List<ArdChannel> getIPChannelInfo(ArdCameras camera) {
-        return null;
-    }
 
     /**
      * 引导目标位置
@@ -662,11 +741,11 @@
      * 2023/10/17 8:27:48
      */
     @Override
-    public boolean guideTargetPosition(CameraCmd cmd) {
+    public AjaxResult guideTargetPosition(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         try {
@@ -674,74 +753,78 @@
             double[] cameraPositon = new double[]{cameras.getLongitude(), cameras.getLatitude(), cameras.getAltitude()};
             double[] targetPositions = cmd.getTargetPosition();
             double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPositon, targetPositions, 20, 150);
+            //修正俯仰
+            double correctPitch = cameraSdkService.correctPitch(cmd);
+            double newt = cameraPTZ[1] + correctPitch;
             int p = (int) (cameraPTZ[0] * 10);
-            int t = (int) (cameraPTZ[1] * 10);
+            int t = (int) (newt * 10);
             int z = (int) (cameraPTZ[2]);
             boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
             if (!bool) {
-                log.error("控制失败,请稍后重试" + getErrorCodePrint());
+                log.error("设置ptz失败:" + getErrorCodePrint());
+                return AjaxResult.warn("设置ptz失败:" + getErrorCodePrint());
             }
-            return bool;
+            return AjaxResult.success("引导目标位置成功", correctPitch);
         } catch (Exception ex) {
-            log.error("引导异常:" + ex.getMessage());
-            return false;
+            log.error("引导目标位置异常:" + ex.getMessage());
+            return AjaxResult.error("引导目标位置异常:" + ex.getMessage());
         }
     }
 
     //转至预置点
     @Override
-    public boolean gotoPreset(CameraCmd cmd) {
+    public AjaxResult gotoPreset(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         Integer PresetIndex = cmd.getPresetIndex();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         try {
-
             boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NET_PTZ_POINT_MOVE_CONTROL, 0, PresetIndex, 0, 0);
             if (!bool) {
-                log.error("控制失败,请稍后重试" + getErrorCodePrint());
+                log.error("转至预置点失败:" + getErrorCodePrint());
+                return AjaxResult.warn("转至预置点失败:" + getErrorCodePrint());
             }
-            return bool;
+            return AjaxResult.success("转至预置点成功");
         } catch (Exception ex) {
             log.error("转至预置点异常:" + ex.getMessage());
-            return false;
+            return AjaxResult.error("转至预置点异常:" + ex.getMessage());
         }
     }
 
     @Override
     //设置预置位
-    public boolean setPreset(CameraCmd cmd) {
+    public AjaxResult setPreset(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         Integer PresetIndex = cmd.getPresetIndex();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         try {
-
             boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NET_PTZ_POINT_SET_CONTROL, 0, PresetIndex, 0, 0);
             if (!bool) {
-                log.error("控制失败,请稍后重试" + getErrorCodePrint());
+                log.error("设置预置点失败:" + getErrorCodePrint());
+                return AjaxResult.warn("设置预置点失败:" + getErrorCodePrint());
             }
-            return bool;
+            return AjaxResult.success("设置预置点成功");
         } catch (Exception ex) {
             log.error("设置预置点异常:" + ex.getMessage());
-            return false;
+            return AjaxResult.error("设置预置点异常:" + ex.getMessage());
         }
     }
 
     //切换聚焦模式
     @Override
-    public boolean controlFocusMode(CameraCmd cmd) {
+    public AjaxResult controlFocusMode(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         boolean enable = cmd.isEnable();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         try {
@@ -765,22 +848,24 @@
             cfg_video_in_focus.nChannelIndex = chanNo - 1;
             boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, NetSDKLib.CFG_CMD_VIDEOIN_FOCUS, cfg_video_in_focus);
             if (!bool) {
-                log.error("控制失败,请稍后重试" + getErrorCodePrint());
+                log.error("切换聚焦模式失败:" + getErrorCodePrint());
+                return AjaxResult.warn("切换聚焦模式失败:" + getErrorCodePrint());
             }
-            return bool;
+            return AjaxResult.success("切换聚焦模式成功");
         } catch (Exception ex) {
             log.error("切换聚焦模式异常:" + ex.getMessage());
-            return false;
+            return AjaxResult.error("切换聚焦模式异常:" + ex.getMessage());
         }
     }
 
+    //获取聚焦模式
     @Override
-    public String getFocusMode(CameraCmd cmd) {
+    public AjaxResult getFocusMode(CameraCmd cmd) {
         String mode = "";
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return "";
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         try {
@@ -788,10 +873,11 @@
             int emCfgOpType = NET_EM_CFG_OPERATE_TYPE.NET_EM_CFG_VIDEOIN_FOCUSMODE;
             boolean bool = ConfigModule.GetConfig(loginId, chanNo - 1, emCfgOpType, focusModeInfo);
             if (!bool) {
-                log.error("获取失败,请稍后重试" + getErrorCodePrint());
+                log.error("获取聚焦模式失败:" + getErrorCodePrint());
+                return AjaxResult.warn("获取聚焦模式失败:" + getErrorCodePrint());
             }
-            System.out.println("配置类型:" + focusModeInfo.emCfgType);     // 具体信息,参考库里的枚举
-            System.out.println("聚焦模式:" + focusModeInfo.emFocusMode);
+            //System.out.println("配置类型:" + focusModeInfo.emCfgType);     // 具体信息,参考库里的枚举
+            //System.out.println("聚焦模式:" + focusModeInfo.emFocusMode);
             switch (focusModeInfo.emFocusMode) {
                 case 0:
                     mode = "关闭";
@@ -809,119 +895,110 @@
                     mode = "手动聚焦";
                     break;
             }
-
+            return AjaxResult.success(mode);
         } catch (Exception ex) {
             log.error("获取聚焦模式异常:" + ex.getMessage());
-
+            return AjaxResult.error("获取聚焦模式异常:" + ex.getMessage());
         }
-        return mode;
     }
 
     @Override
-    public boolean controlPTHeateRpwron(CameraCmd cmd) {
-        return false;
+    public AjaxResult controlPTHeateRpwron(CameraCmd cmd) {
+        return AjaxResult.success("该功能未实现");
     }
 
     @Override
-    public boolean controlCameraDeicing(CameraCmd cmd) {
-        return false;
+    public AjaxResult controlCameraDeicing(CameraCmd cmd) {
+        return AjaxResult.success("该功能未实现");
     }
 
     @Override
-    public int getPTZLockInfo(CameraCmd cmd) {
-        return 0;
+    public AjaxResult getPTZLockInfo(CameraCmd cmd) {
+        return AjaxResult.success("该功能未实现");
     }
 
-    @Override
-    public String captureJPEGPicture(CameraCmd cmd) {
-        return null;
-    }
 
-    //透雾
+    //切换透雾
     @Override
-    public boolean controlDefogcfg(CameraCmd cmd) {
+    public AjaxResult controlDefogcfg(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         boolean enable = cmd.isEnable();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         try {
             String command = EM_NEW_CONFIG.CFG_CMD_VIDEOINDEFOG.getValue();
-            //CFG_VIDEOINDEFOG_LIST cfg_videoindefog_list=new CFG_VIDEOINDEFOG_LIST();
-            boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, command, null);
+            NET_VIDEOIN_DEFOG_INFO netVideoinDefogInfo = new NET_VIDEOIN_DEFOG_INFO();
+            boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, command, netVideoinDefogInfo);
             if (!bool) {
-                log.error("控制失败,请稍后重试" + getErrorCodePrint());
+                log.error("切换透雾失败:" + getErrorCodePrint());
+                return AjaxResult.warn("切换透雾失败:" + getErrorCodePrint());
             }
-            return bool;
+            return AjaxResult.success("切换透雾成功");
         } catch (Exception ex) {
-            log.error("切换透雾异常:" + ex.getMessage());
-            return false;
+            return AjaxResult.error("切换透雾异常:" + ex.getMessage());
         }
     }
 
-    //红外
+    //切换红外
     @Override
-    public boolean controlInfrarecfg(CameraCmd cmd) {
+    public AjaxResult controlInfrarecfg(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
-        boolean enable = cmd.isEnable();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         try {
-            CFG_LIGHTING_INFO cfg_lighting_info = new CFG_LIGHTING_INFO();
-            cfg_lighting_info.nLightingDetailNum = 1;
-            if (enable) {
-                cfg_lighting_info.stuLightingDetail[0].emMode = EM_CFG_LIGHTING_MODE.EM_CFG_LIGHTING_MODE_MANUAL;
-            } else {
-                cfg_lighting_info.stuLightingDetail[0].emMode = EM_CFG_LIGHTING_MODE.EM_CFG_LIGHTING_MODE_OFF;
-            }
-            boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_LIGHTING, cfg_lighting_info);
+            CFG_INFRARED_INFO cfg_infrared_info = new CFG_INFRARED_INFO();
+            boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_INFRARED_CONFIG, cfg_infrared_info);
             if (!bool) {
-                log.error("控制失败,请稍后重试" + getErrorCodePrint());
+                log.error("切换红外失败:" + getErrorCodePrint());
+                return AjaxResult.warn("切换红外失败:" + getErrorCodePrint());
             }
-            return bool;
+            return AjaxResult.success("切换红外成功");
         } catch (Exception ex) {
-            log.error("切换红外异常:" + ex.getMessage());
-            return false;
+            return AjaxResult.error("切换红外异常:" + getErrorCodePrint());
         }
     }
 
     //获取聚焦值
     @Override
-    public int getFocusPos(CameraCmd cmd) {
+    public AjaxResult getFocusPos(CameraCmd cmd) {
         int result = 0;
         try {
             String cameraId = cmd.getCameraId();
             Integer chanNo = cmd.getChanNo();
             if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-                return result;
+                return AjaxResult.warn("设备未登录");
             }
             LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
             NET_PTZ_LOCATION_INFO net_ptz_location_info = new NET_PTZ_LOCATION_INFO();
             net_ptz_location_info.nChannelID = chanNo - 1;
             boolean bool = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_LOCATION, net_ptz_location_info);
             if (!bool) {
-                log.error("控制失败,请稍后重试" + getErrorCodePrint());
+                log.error("获取聚焦值失败:" + getErrorCodePrint());
+                return AjaxResult.warn("获取聚焦值失败:" + getErrorCodePrint());
             }
             result = net_ptz_location_info.nFocusMapValue;
+            return AjaxResult.success(result);
         } catch (Exception ex) {
             log.error("获取聚焦值异常:" + ex.getMessage());
+            return AjaxResult.error("获取聚焦值异常:" + getErrorCodePrint());
         }
-        return result;
+
     }
 
     //设置聚焦值
     @Override
-    public boolean setFocusPos(CameraCmd cmd) {
+    public AjaxResult setFocusPos(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();
         Integer chanNo = cmd.getChanNo();
         boolean enable = cmd.isEnable();
         if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-            return false;
+            return AjaxResult.warn("设备未登录");
         }
         LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
         try {
@@ -934,12 +1011,13 @@
             }
             boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_LIGHTING, cfg_lighting_info);
             if (!bool) {
-                log.error("控制失败,请稍后重试" + getErrorCodePrint());
+                log.error("设置聚焦值失败:" + getErrorCodePrint());
+                return AjaxResult.warn("设置聚焦值失败:" + getErrorCodePrint());
             }
-            return bool;
+            return AjaxResult.success("设置聚焦值成功");
         } catch (Exception ex) {
             log.error("设置聚焦值异常:" + ex.getMessage());
-            return false;
+            return AjaxResult.error("设置聚焦值失败:" + ex.getMessage());
         }
     }
 
@@ -1011,30 +1089,32 @@
         return map;
     }
 
-    //获取GIS信息数据
+    //获取云台可视域
     @Override
-    public Map<String, Object> getGisInfo(CameraCmd cmd) {
-        Map<String, Object> map = new HashMap<>();
+    public AjaxResult getGisInfo(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             Integer chanNo = cmd.getChanNo();
             if (!GlobalVariable.loginMap.containsKey(cameraId)) {
-                return null;
+                return AjaxResult.warn("设备未登录");
             }
             LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
             DH_OUT_PTZ_VIEW_RANGE_STATUS dh_out_ptz_view_range_status = new DH_OUT_PTZ_VIEW_RANGE_STATUS();
             boolean b = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_VIEW_RANGE, dh_out_ptz_view_range_status);
-            if (b) {
-                float nAngelH = (float) dh_out_ptz_view_range_status.nAngelH / 10;
-                float nAngelV = (float) dh_out_ptz_view_range_status.nAngelV / 10;
-                map = getPtz(cmd);//获取ptz
-                map.put("fHorFieldAngle", nAngelH);// 水平视场角
-                map.put("fVerFieldAngle", nAngelV);// 垂直视场角
+            if (!b) {
+                log.error("获取云台可视域失败:" + getErrorCodePrint());
+                return AjaxResult.warn("获取云台可视域失败:" + getErrorCodePrint());
             }
+            float nAngelH = (float) dh_out_ptz_view_range_status.nAngelH / 10;
+            float nAngelV = (float) dh_out_ptz_view_range_status.nAngelV / 10;
+            Map<String, Object> map = getPtz(cmd);//获取ptz
+            map.put("fHorFieldAngle", nAngelH);// 水平视场角
+            map.put("fVerFieldAngle", nAngelV);// 垂直视场角
+            return AjaxResult.success(map);
         } catch (Exception ex) {
             log.error("获取云台可视域异常" + ex.getMessage());
+            return AjaxResult.error("获取云台可视域异常:" + getErrorCodePrint());
         }
-        return map;
     }
 
     // 设备断线回调: 当设备出现断线时,SDK会调用该函数
@@ -1083,4 +1163,33 @@
         }
     }
 
-}
\ No newline at end of file
+    // 抓图接收回调:当抓图成功,sdk会调用该函数
+    public static class fCaptureReceiveCB1 implements NetSDKLib.fSnapRev {
+        private String picPath;
+
+        public fCaptureReceiveCB1(String picPath) {
+            this.picPath = picPath;
+        }
+
+        public void invoke(LLong lLoginID, Pointer pBuf, int RevLen, int EncodeType, int CmdSerial, Pointer dwUser) {
+            if (pBuf != null && RevLen > 0) {
+                byte[] buf = pBuf.getByteArray(0, RevLen);
+                //存储到本地
+                InputStream input = new ByteArrayInputStream(buf);
+                OutputStream output = null;
+                try {
+                    output = new FileOutputStream(picPath);
+                    byte[] buffer = new byte[1024];
+                    int bytesRead;
+                    while ((bytesRead = input.read(buffer)) != -1) {
+                        output.write(buffer, 0, bytesRead);
+                    }
+                    input.close();
+                    output.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+}

--
Gitblit v1.9.3