From eb14cc836d7fa3dc9d093be450463c68cb64af6e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 04 七月 2023 16:00:45 +0800
Subject: [PATCH] websocket推送ptz增加剩余秒数
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 d97418c..746bae2 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,6 +1,7 @@
package com.ruoyi.quartz.task;
import com.ruoyi.common.core.domain.entity.SysUser;
+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;
@@ -13,10 +14,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
@@ -60,20 +58,20 @@
continue;
}
SysUser sysUser = sysUserService.selectUserById(camera.getOperatorId());
- if(StringUtils.isNotNull(sysUser))
- {
+ if (StringUtils.isNotNull(sysUser)) {
cmd.setOperatorZh(sysUser.getNickName());
- }
- else
- {
+ } else {
cmd.setOperatorZh(cmd.getOperator());
}
+ //鑾峰彇鏃堕棿宸�
+ long secDatePoor = DateUtils.getSecDatePoor(camera.getOperatorExpired(), new Date());
+
if (ptz.size() > 0) {
ptz.put("cameraId", cmd.getCameraId());
- ptz.put("usernameZh",cmd.getOperatorZh());
+ ptz.put("usernameZh", cmd.getOperatorZh());
ptz.put("operatorId", cmd.getOperator());//涓婇攣鐢ㄦ埛id
- ptz.put("operatorExpired",camera.getOperatorExpired());
+ ptz.put("expirationRemainingSecond", secDatePoor);
list.add(ptz);
}
}
--
Gitblit v1.9.3