三一车辆模型bug修改提交

zhangnaisong

2024-07-17 7c1e2217d0e4aad7498a5c136710c33cb55d00d0

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

@@ -15,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;
@@ -43,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;
@@ -64,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;//异常回调
@@ -120,7 +125,7 @@
            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());
@@ -139,13 +144,9 @@
                    log.debug("Set fExceptionCallBack function successfully!");
                }
            }

//            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.setLoginId((long)lUserID);
            camera.setState("1");
            int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
            int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
@@ -154,16 +155,20 @@
                startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
            }
            camera.setChanNum(chanNum);
            camera.setStartDChan(startDchan);
            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());
                ardCamerasService.updateArdCameras(camera);
                //添加到流媒体
                addVtdu(camera);
                //camera.setChanNum(cameraChannelList.size());
                //通道批量添加到流媒体
                batchAddVtdu(camera);
            }
            ardCamerasService.updateArdCameras(camera);
            //创建引导队列
            createGuideQueue(camera);
            return AjaxResult.success("设备登录成功");
@@ -226,7 +231,7 @@
            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());
@@ -246,12 +251,10 @@
                    }
                }
            }
//            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.setLoginId((long)lUserID);
            camera.setState("1");
            int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
            int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
@@ -260,16 +263,20 @@
                startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
            }
            camera.setChanNum(chanNum);
            camera.setStartDChan(startDchan);
            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());
                ardCamerasService.updateArdCameras(camera);
                //添加到流媒体
                addVtdu(camera);
                //camera.setChanNum(cameraChannelList.size());
                //通道批量添加到流媒体
                batchAddVtdu(camera);
            }
            ardCamerasService.updateArdCameras(camera);
            //创建引导队列
            createGuideQueue(camera);
            return AjaxResult.success("设备登录成功");
@@ -292,36 +299,19 @@
        }
    }

    //添加到流媒体
    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());
        }

    }



    /**
     * @描述 注销登录
@@ -1102,7 +1092,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));
@@ -1115,7 +1108,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());
@@ -1841,27 +1834,24 @@
        //获取通道
        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();
            //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 channel = new ArdChannel();
                int chanNo = iChannum + camera.getStartDChan();
                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(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());
                }
@@ -1884,7 +1874,6 @@
                    }
                    channelList.add(channel);
                }
                ardChannelService.insertArdChannel(channel);
            }
        } catch (Exception ex) {
            log.error("获取IP通道异常:" + ex.getMessage());
@@ -1939,11 +1928,12 @@
    @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 + "/" + cameraId + ".mp4");
            String path = FileUtils.createFile(tempPath + "/" + operator + "/" + cameraId + ".mp4");
            if (!GlobalVariable.loginMap.containsKey(cameraId)) {
                return AjaxResult.warn("设备未登录");
            }
@@ -2000,6 +1990,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();
@@ -2034,7 +2025,7 @@
            log.debug("本地录像停止");
            // 本地临时录像地址
            String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
            String recordPath = FileUtils.createFile(tempPath + "/" + cameraId + ".mp4");
            String recordPath = FileUtils.createFile(tempPath + "/" + operator + "/" + cameraId + ".mp4");
            byte[] recordBytes = Files.readAllBytes(Paths.get(recordPath));
            return AjaxResult.success(recordBytes);
        } catch (Exception ex) {