电子围栏分页查询修改提交

zhangnaisong

2024-07-06 775524110885e27fe860be1feb156ca78b5040b2

 ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java

@@ -4,6 +4,8 @@
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;
@@ -13,8 +15,11 @@
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.service.ICameraSdkService;
import com.ruoyi.device.channel.domain.ArdChannel;
import com.ruoyi.device.channel.service.IArdChannelService;
import com.ruoyi.device.terrain.domain.ArdTerrainMark;
import com.ruoyi.device.terrain.service.IArdTerrainMarkService;
import com.ruoyi.media.domain.Vtdu;
import com.ruoyi.media.service.IVtduService;
import com.ruoyi.utils.gis.GisUtil;
@@ -41,6 +46,7 @@
import java.text.DecimalFormat;
import java.util.*;
import java.util.concurrent.PriorityBlockingQueue;
import java.util.stream.Collectors;

import static com.ruoyi.utils.sdk.hiksdk.lib.HCNetSDK.*;
import static com.ruoyi.utils.sdk.hiksdk.lib.HCNetSDK.NET_DVR_GET_GISINFO;
@@ -62,7 +68,8 @@
    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;//异常回调
@@ -87,7 +94,7 @@
                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);
                hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog" , true);
            }
            String m_sDeviceIP = camera.getIp();
            String m_sUsername = camera.getUsername();
@@ -138,40 +145,35 @@
                }
            }

            if (GlobalVariable.loginMap.containsKey(camera.getId())) {
                GlobalVariable.loginMap.remove(camera.getId());
            }

            //删除管理通道
            ardChannelService.deleteArdChannelByDeviceId(camera.getId());
//            if (GlobalVariable.loginMap.containsKey(camera.getId())) {
//                GlobalVariable.loginMap.remove(camera.getId());
//            }
            GlobalVariable.loginMap.put(camera.getId(), lUserID);
            GlobalVariable.loginCameraMap.put(lUserID, camera);

            camera.setLoginId(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.setStartDChan(startDchan);
            //获取最新通道
            List<ArdChannel> cameraChannelList = getIPChannelInfo(camera);
            List<ArdChannel> cameraChannelList = getChannels(camera);
            if (cameraChannelList.size() > 0) {
                camera.setChannelList(cameraChannelList);
                for (ArdChannel channel : cameraChannelList) {
                    channel.setId(IdUtils.simpleUUID());
                    ardChannelService.insertArdChannel(channel);
                }
                camera.setChanNum(cameraChannelList.size());
                ardCamerasService.updateArdCameras(camera);
                //添加到流媒体
                addVtdu(camera);
            }
            //创建引导队列
            if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
                Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
                PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
                GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
            }
            ardCamerasService.updateArdCameras(camera);
            createGuideQueue(camera);
            return AjaxResult.success("设备登录成功");
        } catch (Exception ex) {
            log.error("设备登录异常", ex);
            log.error("设备登录异常" , ex);
            return AjaxResult.error("设备登录异常" + ex.getMessage());
        }
    }
@@ -198,7 +200,7 @@
                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);
                hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog" , true);
            }
            String m_sDeviceIP = camera.getIp();
            String m_sUsername = camera.getUsername();
@@ -249,50 +251,49 @@
                    }
                }
            }
            if (GlobalVariable.loginMap.containsKey(camera.getId())) {
                GlobalVariable.loginMap.remove(camera.getId());
            }

            //删除管理通道
            ardChannelService.deleteArdChannelByDeviceId(camera.getId());
//            if (GlobalVariable.loginMap.containsKey(camera.getId())) {
//                GlobalVariable.loginMap.remove(camera.getId());
//            }
            GlobalVariable.loginMap.put(camera.getId(), lUserID);
            GlobalVariable.loginCameraMap.put(lUserID, camera);

            camera.setLoginId(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.setStartDChan(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.insertArdChannel(channel);
                }
                ardCamerasService.updateArdCameras(camera);
                //添加到流媒体
                addVtdu(camera);
            }
            ardCamerasService.updateArdCameras(camera);
            //添加到流媒体
            addVtdu(camera);
            //创建引导队列
            createGuideQueue(camera);
            return AjaxResult.success("设备登录成功");
        } catch (Exception ex) {
            log.error("注册设备异常", ex);
            log.error("注册设备异常" , ex);
            return AjaxResult.error("注册设备异常" + ex.getMessage());
        }
    }

    //创建引导队列
    private void createGuideQueue(ArdCameras camera) {
        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());
            }
        }
    }

@@ -872,10 +873,10 @@
                        nFrameRate = "未知";
                        break;
                }
                map.put("resolution", resolution);//分辨率
                map.put("videoBitrate", videoBitrate);//比特率
                map.put("videoEncType", videoEncType);//编码
                map.put("nFrameRate", nFrameRate);//帧率
                map.put("resolution" , resolution);//分辨率
                map.put("videoBitrate" , videoBitrate);//比特率
                map.put("videoEncType" , videoEncType);//编码
                map.put("nFrameRate" , nFrameRate);//帧率

            } else {
                int code = hCNetSDK.NET_DVR_GetLastError();
@@ -928,9 +929,9 @@
        double z = d.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
        //log.debug("T垂直参数为: " + p + "P水平参数为: " + t + "Z变倍参数为: " + z);
        Map<String, Object> ptzMap = new HashMap<>();
        ptzMap.put("p", p);
        ptzMap.put("t", t);
        ptzMap.put("z", z);
        ptzMap.put("p" , p);
        ptzMap.put("t" , t);
        ptzMap.put("z" , z);
        return AjaxResult.success(ptzMap);
    }

@@ -977,9 +978,9 @@
            float fTilt = lpPTZAbsoluteEX_cfg.struPTZCtrl.fTilt;
            float t = fTilt < 0 ? fTilt + 360 : fTilt;
            float z = lpPTZAbsoluteEX_cfg.struPTZCtrl.fZoom;
            ptzMap.put("p", p);
            ptzMap.put("t", t);
            ptzMap.put("z", z);
            ptzMap.put("p" , p);
            ptzMap.put("t" , t);
            ptzMap.put("z" , z);
            return AjaxResult.success(ptzMap);
        } catch (Exception ex) {
            log.error("获取高精度PTZ绝对位置异常:" + ex.getMessage());
@@ -1084,7 +1085,7 @@
            return AjaxResult.success("设置高精度PTZ参数成功");

        } catch (Exception ex) {
            log.error("设置高精度PTZ参数异常", ex);
            log.error("设置高精度PTZ参数异常" , ex);
            return AjaxResult.error("设置高精度PTZ参数异常:" + ex);
        }
    }
@@ -1106,7 +1107,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));
@@ -1119,7 +1123,7 @@
                log.error("设置ptz失败,请稍后重试" + 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());
@@ -1228,12 +1232,12 @@
            String wZoomPosMax = df.format((float) Integer.parseInt(Integer.toHexString(m_ptzPosCurrent.wZoomPosMax)) / 10);
            String wZoomPosMin = df.format((float) Integer.parseInt(Integer.toHexString(m_ptzPosCurrent.wZoomPosMin)) / 10);
            Map<String, Object> ptzScopeMap = new HashMap<>();
            ptzScopeMap.put("pMax", wPanPosMax);
            ptzScopeMap.put("pMin", wPanPosMin);
            ptzScopeMap.put("tMax", wTiltPosMax);
            ptzScopeMap.put("tMin", wTiltPosMin);
            ptzScopeMap.put("zMax", wZoomPosMax);
            ptzScopeMap.put("zMin", wZoomPosMin);
            ptzScopeMap.put("pMax" , wPanPosMax);
            ptzScopeMap.put("pMin" , wPanPosMin);
            ptzScopeMap.put("tMax" , wTiltPosMax);
            ptzScopeMap.put("tMin" , wTiltPosMin);
            ptzScopeMap.put("zMax" , wZoomPosMax);
            ptzScopeMap.put("zMin" , wZoomPosMin);
            return AjaxResult.success(ptzScopeMap);
        }
    }
@@ -1249,8 +1253,8 @@
    @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.warn("设备未登录");
        }
@@ -1258,10 +1262,10 @@
        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));
            log.error("获取前端参数失败: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
            return AjaxResult.warn("获取前端参数失败:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
        }
        struCameraParam.read();
@@ -1276,10 +1280,10 @@
        }
        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));
            log.error("切换透雾失败: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
            return AjaxResult.warn("切换透雾失败:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
        }
        log.debug("切换透雾成功");
@@ -1329,7 +1333,7 @@
        boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG, chanNo, point, struDayNigh.size());
        if (!bool) {
            int code = hCNetSDK.NET_DVR_GetLastError();
            log.error("切换红外失败 ErrorCode:{},ErrorInfo:{}", code, SdkErrorCodeEnum.getDescByCode(code));
            log.error("切换红外失败 ErrorCode:{},ErrorInfo:{}" , code, SdkErrorCodeEnum.getDescByCode(code));
            return AjaxResult.warn("切换红外失败:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
        }
        log.debug("切换红外成功");
@@ -1610,8 +1614,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 "";
@@ -1620,7 +1626,7 @@
            //强制I帧结构体对象
            HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME();   //新建结构体对象
            netDvrIFrame.read();
            netDvrIFrame.dwChannel = channelNum;//因为上文代码中设置了通道号，按照上文中的设置
            netDvrIFrame.dwChannel = chanNo;//因为上文代码中设置了通道号，按照上文中的设置
            netDvrIFrame.byStreamType = 0;
            netDvrIFrame.dwSize = netDvrIFrame.size();
            netDvrIFrame.write();
@@ -1630,7 +1636,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;//播放窗口的句柄，为NULL表示不解码显示。
@@ -1653,6 +1659,7 @@
                    return "";
                }
                log.debug("录像开始");

            } else {
                if (GlobalVariable.previewMap.containsKey(cameraId)) {
                    Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
@@ -1682,7 +1689,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;
            }
@@ -1740,7 +1749,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 "";
            }
@@ -1834,15 +1845,12 @@
    }

    //获取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
            }
            //删除管理通道
            ardChannelService.deleteArdChannelByDeviceId(camera.getId());
            IntByReference ibrBytesReturned = new IntByReference(0);//获取IP接入配置参数
            HCNetSDK.NET_DVR_IPPARACFG_V40 m_strIpparaCfg = new HCNetSDK.NET_DVR_IPPARACFG_V40();
            m_strIpparaCfg.write();
@@ -1852,16 +1860,15 @@
            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.getStartDChan();
                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(), HCNetSDK.NET_DVR_GET_PICCFG_V40, lChannel.intValue(), pStrPicCfg, strPicCfg.size(), pInt);
                if (!b_GetPicCfg) {
                    // log.error("获取图像参数失败，错误码：" + hCNetSDK.NET_DVR_GetLastError());
                }
@@ -1870,21 +1877,21 @@
                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);
                }
                ardChannelService.insertArdChannel(channel);
            }
        } catch (Exception ex) {
            log.error("获取IP通道异常:" + ex.getMessage());
@@ -1926,11 +1933,11 @@
        }
        struGisInfo.read();
        Map<String, Object> map = new HashMap<>();
        map.put("p", struGisInfo.struPtzPos.fPanPos);
        map.put("t", struGisInfo.struPtzPos.fTiltPos < 0 ? struGisInfo.struPtzPos.fTiltPos + 360 : struGisInfo.struPtzPos.fTiltPos);
        map.put("z", struGisInfo.struPtzPos.fZoomPos);
        map.put("fHorFieldAngle", struGisInfo.fHorizontalValue);// 水平视场角
        map.put("fVerFieldAngle", struGisInfo.fVerticalValue);// 垂直视场角
        map.put("p" , struGisInfo.struPtzPos.fPanPos);
        map.put("t" , struGisInfo.struPtzPos.fTiltPos < 0 ? struGisInfo.struPtzPos.fTiltPos + 360 : struGisInfo.struPtzPos.fTiltPos);
        map.put("z" , struGisInfo.struPtzPos.fZoomPos);
        map.put("fHorFieldAngle" , struGisInfo.fHorizontalValue);// 水平视场角
        map.put("fVerFieldAngle" , struGisInfo.fVerticalValue);// 垂直视场角
        return AjaxResult.success(map);

    }
@@ -1939,9 +1946,12 @@
    @Override
    public AjaxResult localRecordStart(CameraCmd cmd) {
        try {
            String operator = cmd.getOperator();
            String cameraId = cmd.getCameraId();
            Integer channelNum = cmd.getChanNo();
            String path = FileUtils.createFile("D:/LocalRecordTemp/" + cameraId + ".mp4");
            // 本地临时录像地址
            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("设备未登录");
            }
@@ -1987,7 +1997,7 @@
                return AjaxResult.warn("本地录像取流失败:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
            }
            log.debug("本地录像开始");
            return AjaxResult.success("录像开始", lRealHandle);
            return AjaxResult.success("录像开始" , lRealHandle);
        } catch (Exception ex) {
            log.error("本地录像开始异常" + ex.getMessage());
            return AjaxResult.error("本地录像开始异常" + ex.getMessage());
@@ -1998,6 +2008,7 @@
    @Override
    public AjaxResult localRecordStop(CameraCmd cmd) {
        try {
            String operator = cmd.getOperator();
            String cameraId = cmd.getCameraId();
            Integer channelNum = cmd.getChanNo();
            Integer lRealHandle = cmd.getRecordId().intValue();
@@ -2028,17 +2039,12 @@
            previewinfo.byNPQMode = 0;//NPQ模式：0-直连模式，1-过流媒体模式
            previewinfo.write();
            //endregion
            //if (GlobalVariable.previewMap.containsKey(cameraId)) {
            //    Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
            //    hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
            //    GlobalVariable.previewMap.remove(cameraId);
            //}
            hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
            log.debug("本地录像停止");
            String recordPath = FileUtils.createFile("D:/LocalRecordTemp/" + cameraId + ".mp4");
            // 本地临时录像地址
            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
            String recordPath = FileUtils.createFile(tempPath + "/" + operator + "/" + cameraId + ".mp4");
            byte[] recordBytes = Files.readAllBytes(Paths.get(recordPath));
            //OutputStream outputStream = response.getOutputStream();
            //outputStream.write(imageBytes);
            return AjaxResult.success(recordBytes);
        } catch (Exception ex) {
            log.error("本地录像停止异常" + ex.getMessage());