24小时报警兴趣点前十统计bug修改提交

zhangnaisong

2024-06-22 dd84c954253800217461651d7ff1ac290962c60a

 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;
@@ -138,15 +140,11 @@
                }
            }

            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");
            int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
@@ -158,23 +156,16 @@
            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);
@@ -255,15 +246,11 @@
                    }
                }
            }
            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");
            int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
@@ -274,20 +261,15 @@
            }
            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("设备登录成功");
@@ -299,12 +281,14 @@

    //创建引导队列
    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());
            }
        }
    }

@@ -1261,7 +1245,7 @@
    @Override
    public AjaxResult controlDefogcfg(CameraCmd cmd) {
        String cameraId = cmd.getCameraId();
        Integer chanNo=cmd.getChanNo();
        Integer chanNo = cmd.getChanNo();
        boolean enable = cmd.isEnable();
        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
            return AjaxResult.warn("设备未登录");
@@ -1623,7 +1607,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");
            boolean enable = cmd.isEnable();
            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
                return "";
@@ -1695,7 +1681,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;
            }
@@ -1753,7 +1741,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 "";
            }
@@ -1847,10 +1837,12 @@
    }

    //获取IP通道
    public List<ArdChannel> getIPChannelInfo(ArdCameras camera) {
    public List<ArdChannel> getChannels(ArdCameras camera) {
        //获取通道
        List<ArdChannel> channelList = new ArrayList<>();
        try {
            //删除管理通道
            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();
@@ -1860,7 +1852,7 @@
            m_strIpparaCfg.read();
            //log.debug("起始数字通道号：" + m_strIpparaCfg.dwStartDChan);//m_strIpparaCfg.dwDChanNum
            for (int iChannum = 0; iChannum < camera.getChanNum(); iChannum++) {
                ArdChannel ardChannel = new ArdChannel();
                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();
@@ -1878,22 +1870,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();
                    channelName = channelName.equals("") ? "通道" + chanNo : channelName;
                    ardChannel.setDeviceId(camera.getId());
                    ardChannel.setName(channelName);
                    ardChannel.setChanNo(chanNo);
                    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) {
                            //log.debug("IP通道" + channum + "在线");
                            channelList.add(ardChannel);
                        //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());
@@ -1948,9 +1939,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("设备未登录");
            }
@@ -2007,6 +2001,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();
@@ -2037,17 +2032,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());