电磁锁操控加入判断速度为0提交

zhangnaisong

2024-07-11 cd538c205628f28839323b49b7f77f33196a601f

 ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java

@@ -16,6 +16,7 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
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;
@@ -74,6 +75,9 @@
    private IArdChannelService ardChannelService;
    @Resource
    private IVtduService vtduService;

    @Resource
    ICameraSdkService cameraSdkService;
    @Value("${minio.endpoint}")
    private String minioEndPoint;
    @Resource
@@ -108,9 +112,7 @@
                log.error("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录失败:" + getErrorCodePrint());
                return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
            }
//            if (GlobalVariable.loginMap.containsKey(camera.getId())) {
//                GlobalVariable.loginMap.remove(camera.getId());
//            }

            camera.setState("1");
            camera.setChanNum(m_stDeviceInfo.byChanNum);
            camera.setStartDChan(1);
@@ -119,7 +121,12 @@
            //获取最新通道
            List<ArdChannel> ardChannelList = getChannels(camera);
            if (ardChannelList.size() > 0) {
                ardChannelService.deleteArdChannelByDeviceId(camera.getId());
                ardChannelList.stream().forEach(channel -> {
                    ardChannelService.insertArdChannel(channel);
                });
                camera.setChanNum(ardChannelList.size());
                camera.setChannelList(ardChannelList);
                ardCamerasService.updateArdCameras(camera);
                //配置到流媒体
                addVtdu(camera);
@@ -150,9 +157,6 @@
                log.error("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录失败:" + getErrorCodePrint());
                return AjaxResult.warn(getErrorCodePrint());
            }
//            if (GlobalVariable.loginMap.containsKey(camera.getId())) {
//                GlobalVariable.loginMap.remove(camera.getId());
//            }
            camera.setState("1");
            camera.setChanNum(m_stDeviceInfo.byChanNum);
            camera.setStartDChan(1);
@@ -163,7 +167,12 @@
            //获取最新通道
            List<ArdChannel> ardChannelList = getChannels(camera);
            if (ardChannelList.size() > 0) {
                ardChannelService.deleteArdChannelByDeviceId(camera.getId());
                ardChannelList.stream().forEach(channel -> {
                    ardChannelService.insertArdChannel(channel);
                });
                camera.setChanNum(ardChannelList.size());
                camera.setChannelList(ardChannelList);
                ardCamerasService.updateArdCameras(camera);
                //配置到流媒体
                addVtdu(camera);
@@ -179,17 +188,17 @@

    //添加到流媒体
    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) {
        camera.getChannelList().stream().forEach(channel -> {
            String name = camera.getId() + "_" + channel.getChanNo();
            String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/cam/realmonitor?channel=" + channel.getChanNo() + "&subtype=0";
             //删除流媒体
            if (vtduService.selectVtduByName(name) != null) {
                vtduService.deleteVtduByName(name);
            }
            //添加到流媒体
            CameraCmd cmd = new CameraCmd(camera.getId(), i);
            CameraCmd cmd = new CameraCmd(camera.getId(), channel.getChanNo());
            Map<String, Object> videoCompressionCfg = getVideoCompressionCfg(cmd);
            vtdu = new Vtdu();
            Vtdu vtdu = new Vtdu();
            if (videoCompressionCfg.get("videoEncType") != null) {
                if (videoCompressionCfg.get("videoEncType").equals("标准h264")) {
                    vtdu.setIsCode("0");//默认不转码
@@ -200,11 +209,11 @@
                vtdu.setIsCode("0");//默认不转码
            }
            vtdu.setRtspSource(rtspSource);
            vtdu.setName(camera.getId() + "_" + i);
            vtdu.setName(name);
            vtdu.setMode("1");//默认CPU软解码
            vtdu.setCameraId(camera.getId());
            vtduService.insertVtdu(vtdu);
        }
        });
    }

    //创建引导队列
@@ -222,23 +231,12 @@

    //获取通道
    public List<ArdChannel> getChannels(ArdCameras camera) {
        ardChannelService.deleteArdChannelByDeviceId(camera.getId());
        LLong loginId = new LLong(camera.getLoginId());
        List<ArdChannel> ardChannelList = new ArrayList<>();
        for (int i = 1; i < camera.getChanNum() + 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) {
                log.error("获取配置失败,请稍后重试" + getErrorCodePrint());
                // return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
            }
            String chanName = "";
            try {
                chanName = new String(av_cfg_channelName.szName, "GBK").trim();
            } catch (UnsupportedEncodingException e) {
                e.printStackTrace();
            }
            String chanName = ConfigModule.getChannelName(loginId, i - 1).trim();
            log.debug("获取通道名称：" + chanName);
            channel.setName(chanName.equals("") ? "通道" + i : chanName);
            channel.setDeviceId(camera.getId());
            channel.setChanNo(i);
@@ -249,7 +247,6 @@
                }
            }
            ardChannelList.add(channel);
            ardChannelService.insertArdChannel(channel);
        }
        return ardChannelList;
    }
@@ -781,15 +778,18 @@
            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("设置ptz失败:" + getErrorCodePrint());
                return AjaxResult.warn("设置ptz失败:" + getErrorCodePrint());
            }
            return AjaxResult.success("引导目标位置成功");
            return AjaxResult.success("引导目标位置成功", correctPitch);
        } catch (Exception ex) {
            log.error("引导目标位置异常:" + ex.getMessage());
            return AjaxResult.error("引导目标位置异常:" + ex.getMessage());