更新webrtc-streamer版本 为了避免通道数和通道号混淆修改sdk请求参数channelNum为chanNo sdk接口增加聚焦值获取

‘liusuyi’

2023-09-07 07cac52e0b64a78361ce4a353604c94bd1186a6c

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

@@ -1,23 +1,21 @@
package com.ruoyi.quartz.task;

import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.websocket.util.WebSocketUtils;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
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.hiksdk.common.GlobalVariable;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.*;

import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;

/**
 * @Description:
@@ -40,60 +38,65 @@
     */
    public void ptzPush() {
        try {
            ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
            IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
            RedisCache redisCache = SpringUtils.getBean(RedisCache.class);
            IHikClientService hikClientService = SpringUtils.getBean(IHikClientService.class);
            List<Map<String, Object>> list = new ArrayList<>();
            ArdCameras ardCameras = new ArdCameras();
            ardCameras.setGdtype("1");
            List<ArdCameras> ardCamerasList = ardCamerasService.selectArdCamerasListNoDataScope(ardCameras);
            for (ArdCameras camera : ardCamerasList) {
                CameraCmd cmd = new CameraCmd();
                cmd.setCameraId(camera.getId());
                cmd.setChannelNum(1);
                cmd.setOperator(camera.getOperatorId());
                if (!GlobalVariable.loginMap.containsKey(camera.getId()))//只推送登录成功的相机
                {
                    continue;
                }
                Map<String, Object> ptz = hikClientService.getPtz(cmd);
                if (StringUtils.isNull(ptz)) {
                    continue;
                }
                SysUser sysUser = sysUserService.selectUserById(camera.getOperatorId());
                if (StringUtils.isNotNull(sysUser)) {
                    cmd.setOperatorZh(sysUser.getNickName());
                } else {
                    cmd.setOperatorZh(cmd.getOperator());
                }

                //获取时间差
                long secDatePoor = 0;
                if (StringUtils.isNotNull(camera.getOperatorExpired())) {
                    secDatePoor = DateUtils.getSecDatePoor(camera.getOperatorExpired(), new Date());
                    if(secDatePoor<0)
            List<Object> Objects = redisCache.getListKey(CacheConstants.CAMERA_LIST_KEY);
            if (Objects.size() > 0) {
                for (Object obj : Objects) {
                    ArdCameras camera = (ArdCameras) obj;
                    if(!"1".equals(camera.getGdtype()))
                    {
                        secDatePoor=0;
                        continue;
                    }
                    CameraCmd cmd = new CameraCmd();
                    cmd.setCameraId(camera.getId());
                    cmd.setChanNo(1);
                    cmd.setOperator(camera.getOperatorId());
                    if (!GlobalVariable.loginMap.containsKey(camera.getId()))//只推送登录成功的相机
                    {
                        continue;
                    }
                    Map<String, Object> ptz = hikClientService.getGisInfo(cmd);
                    if (StringUtils.isNull(ptz)) {
                        continue;
                    }
                    SysUser sysUser = redisCache.getCacheObject(CacheConstants.USER_LIST_KEY + camera.getOperatorId());
                    if (StringUtils.isNotNull(sysUser)) {
                        cmd.setOperatorZh(sysUser.getNickName());
                    } else {
                        cmd.setOperatorZh(cmd.getOperator());
                    }

                    //获取时间差
                    long secDatePoor = 0;
                    if (StringUtils.isNotNull(camera.getOperatorExpired())) {
                        secDatePoor = DateUtils.getSecDatePoor(camera.getOperatorExpired(), new Date());
                        if (secDatePoor < 0) {
                            secDatePoor = 0;
                        }
                    }

                    if (ptz.size() > 0) {
                        ptz.put("cameraId", cmd.getCameraId());
                        ptz.put("usernameZh", cmd.getOperatorZh());
                        ptz.put("operatorId", cmd.getOperator());//上锁用户id
                        ptz.put("expirationRemainingSecond", secDatePoor);
                        ptz.put("longitude",camera.getLongitude());
                        ptz.put("latitude",camera.getLatitude());
                        ptz.put("altitude",camera.getAltitude());
                        list.add(ptz);
                    }
                }

                if (ptz.size() > 0) {
                    ptz.put("cameraId", cmd.getCameraId());
                    ptz.put("usernameZh", cmd.getOperatorZh());
                    ptz.put("operatorId", cmd.getOperator());//上锁用户id
                    ptz.put("expirationRemainingSecond", secDatePoor);
                    list.add(ptz);
                if (ONLINE_USER_SESSIONS.size() > 0) {
                    Map<String, Object> sendMap = new HashMap<>();
                    sendMap.put("10000", list);
                    WebSocketUtils.sendMessageAll(sendMap);
                }
            }
            if (ONLINE_USER_SESSIONS.size() > 0) {
                Map<String, Object> sendMap = new HashMap<>();
                sendMap.put("10000", list);
                WebSocketUtils.sendMessageAll(sendMap);
            }
        }
        catch (Exception ex)
        {
            log.error("推送ptz异常:"+ex.getMessage());
        } catch (Exception ex) {
            log.error("推送ptz异常:" + ex.getMessage());
        }
    }

}