websocket推送ptz增加当前操作用户中文名

‘liusuyi’

2023-07-04 e07cc12a2c219fceeaecd96e77ed642037552fda

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

@@ -1,5 +1,6 @@
package com.ruoyi.quartz.task;

import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.websocket.util.WebSocketUtils;
@@ -8,6 +9,7 @@
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 org.springframework.stereotype.Component;

import javax.annotation.Resource;
@@ -37,6 +39,7 @@
     * @修改人和其它信息
     */
    public void ptzPush() {
        ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
        IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
        IHikClientService hikClientService = SpringUtils.getBean(IHikClientService.class);
        List<Map<String, Object>> list = new ArrayList<>();
@@ -47,6 +50,7 @@
            CameraCmd cmd = new CameraCmd();
            cmd.setCameraId(camera.getId());
            cmd.setChannelNum(1);
            cmd.setOperator(camera.getOperatorId());
            if (!GlobalVariable.loginMap.containsKey(camera.getId()))//只推送登录成功的相机
            {
                continue;
@@ -55,10 +59,21 @@
            if (StringUtils.isNull(ptz)) {
                continue;
            }
            SysUser sysUser = sysUserService.selectUserById(camera.getOperatorId());
            if(StringUtils.isNotNull(sysUser))
            {
                cmd.setOperatorZh(sysUser.getNickName());
            }
            else
            {
                cmd.setOperatorZh(cmd.getOperator());
            }

            if (ptz.size() > 0) {
                ptz.put("cameraId", camera.getId());
                ptz.put("operatorId", camera.getOperatorId());//上锁用户id
                ptz.put("operatorExpired", camera.getOperatorExpired());
                ptz.put("cameraId", cmd.getCameraId());
                ptz.put("usernameZh",cmd.getOperatorZh());
                ptz.put("operatorId", cmd.getOperator());//上锁用户id
                ptz.put("operatorExpired",camera.getOperatorExpired());
                list.add(ptz);
            }
        }