From 296bc1c12ed1cff4839a6387757845c98379c273 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 31 八月 2023 16:52:02 +0800
Subject: [PATCH] 流媒体优化
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
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 78edeb6..f844f56 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
@@ -6,20 +6,16 @@
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:
@@ -43,12 +39,11 @@
public void ptzPush() {
try {
RedisCache redisCache = SpringUtils.getBean(RedisCache.class);
- ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
IHikClientService hikClientService = SpringUtils.getBean(IHikClientService.class);
List<Map<String, Object>> list = new ArrayList<>();
ArdCameras ardCameras = new ArdCameras();
ardCameras.setGdtype("1");
- List<Object> Objects = redisCache.getListKey(getCacheKey());
+ List<Object> Objects = redisCache.getListKey(CacheConstants.CAMERA_LIST_KEY);
if (Objects.size() > 0) {
for (Object obj : Objects) {
ArdCameras camera = (ArdCameras) obj;
@@ -64,7 +59,7 @@
if (StringUtils.isNull(ptz)) {
continue;
}
- SysUser sysUser = sysUserService.selectUserById(camera.getOperatorId());
+ SysUser sysUser = redisCache.getCacheObject(CacheConstants.USER_LIST_KEY + camera.getOperatorId());
if (StringUtils.isNotNull(sysUser)) {
cmd.setOperatorZh(sysUser.getNickName());
} else {
@@ -98,12 +93,5 @@
log.error("鎺ㄩ�乸tz寮傚父:" + ex.getMessage());
}
}
- /**
- * 鑾峰彇cache key
- *
- * @return 缂撳瓨閿甼ey
- */
- private String getCacheKey() {
- return CacheConstants.CAMERA_LIST_KEY;
- }
+
}
--
Gitblit v1.9.3