From 46a35f95b4caddb52ec886ce0ee7d9f81fbf8bb6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 13 九月 2023 12:55:18 +0800
Subject: [PATCH] 修改电子围栏历史报警按alarm_time逆序返回数据
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 816709f..ad33328 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
@@ -45,6 +45,11 @@
if (Objects.size() > 0) {
for (Object obj : Objects) {
ArdCameras camera = (ArdCameras) obj;
+ if (!GlobalVariable.loginMap.containsKey(camera.getId()))//鍙帹閫侀娆＄櫥褰曟垚鍔熺殑鐩告満
+ {
+ continue;
+ }
+ //鎺ㄩ�佸ぇ鍏夌數
if(!"1".equals(camera.getGdtype()))
{
continue;
@@ -53,7 +58,9 @@
cmd.setCameraId(camera.getId());
cmd.setChanNo(1);
cmd.setOperator(camera.getOperatorId());
- if (!GlobalVariable.loginMap.containsKey(camera.getId()))//鍙帹閫佺櫥褰曟垚鍔熺殑鐩告満
+ //鎺ㄩ�佸湪绾跨殑鐩告満
+ boolean onLine = hikClientService.isOnLine(cmd);
+ if(!onLine)
{
continue;
}
--
Gitblit v1.9.3