1. 增加聚焦值和获取接口。 2. 增加视频编码获取接口。 3. 流媒体通过编码自动切换是否转码。

‘liusuyi’

2023-10-20 aaa07634fa899b7346dfd61c6f70962adbc1dca5

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java

@@ -6,6 +6,7 @@
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.channel.domain.ArdChannel;
import com.ruoyi.device.dhsdk.service.IDhClientService;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.media.domain.Items;
import com.ruoyi.media.domain.JsonsRoot;
@@ -37,7 +38,9 @@
    @Resource
    IArdCamerasService iArdCamerasService;
    @Resource
    IHikClientService iHikClientService;
    IHikClientService hikClientService;
    @Resource
    IDhClientService dhClientService;
    @Resource
    IVtduService vtduService;
    @Resource
@@ -50,15 +53,20 @@
     */
    public void cameraState() {
        try {
            ArdCameras ardCamera = new ArdCameras();
            ardCamera.setFactory("1");
           ArdCameras ardCamera = new ArdCameras();
            //调用查询方法
            List<ArdCameras> ardCameras = iArdCamerasService.selectArdCamerasListNoDataScope(ardCamera);
            for (ArdCameras camera : ardCameras) {
                CameraCmd cmd = new CameraCmd();
                cmd.setCameraId(camera.getId());
                boolean onLineNew = iHikClientService.isOnLine(cmd);//相机实时状态
                boolean onLineOld = "1".equals(camera.getState());//相机历史状态
                //当状态发生变化时，更新实时状态
                boolean onLineNew = false;
                // 判断是1还是2
                if (camera.getFactory().equals("1")) {
                    onLineNew = hikClientService.isOnLine(cmd);
                } else if (camera.getFactory().equals("2")) {
                    onLineNew = dhClientService.isOnLine(cmd);
                }
                boolean onLineOld = "1".equals(camera.getState());
                if (onLineNew != onLineOld) {
                    if (onLineNew) {
                        camera.setState("1");
@@ -67,7 +75,6 @@
                    }
                    iArdCamerasService.updateArdCameras(camera);
                }

            }
        } catch (Exception ex) {
            log.error("同步相机在线状态异常:" + ex.getMessage());
@@ -107,10 +114,11 @@
     * 2023/10/13 14:13:53
     */
    public void vtdu() {
        List<String> nameList = mediaService.getNameList();

        List<Vtdu> vtdus = vtduService.selectVtduList(new Vtdu());
        for (Vtdu vtdu : vtdus) {
            if (!nameList.contains(vtdu.getName())) {
            boolean nameExist = mediaService.checkNameExist(vtdu.getName());
            if (!nameExist) {
                mediaService.addPath(vtdu.getName(), vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode());
            }
        }