From e07cc12a2c219fceeaecd96e77ed642037552fda Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期二, 04 七月 2023 14:45:37 +0800 Subject: [PATCH] websocket推送ptz增加当前操作用户中文名 --- ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 21 ++++++++++++++++++--- ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java | 3 ++- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 2 ++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java index db9981e..4ec8ce2 100644 --- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java +++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java @@ -34,7 +34,8 @@ String operator; /*杩囨湡闂撮殧锛堢锛�*/ Integer expired; - + /*褰撳墠鎿嶄綔鑰呭悕瀛�*/ + String operatorZh; /*褰曞儚瀛樺偍姹犲悕绉�*/ String recordBucketName; /*褰曞儚鏂囦欢鍚嶇О*/ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index c024806..0980b7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -3,6 +3,8 @@ import java.util.List; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.Api; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java index 6ee5445..d97418c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java +++ b/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); } } -- Gitblit v1.9.3