From cece9e60b6dd536835c9158d98a50d8b60bf655f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 07 九月 2023 14:27:47 +0800
Subject: [PATCH] 雷达报警引导增加日志
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 f844f56..816709f 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
@@ -41,21 +41,23 @@
RedisCache redisCache = SpringUtils.getBean(RedisCache.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(CacheConstants.CAMERA_LIST_KEY);
if (Objects.size() > 0) {
for (Object obj : Objects) {
ArdCameras camera = (ArdCameras) obj;
+ if(!"1".equals(camera.getGdtype()))
+ {
+ continue;
+ }
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(camera.getId());
- cmd.setChannelNum(1);
+ cmd.setChanNo(1);
cmd.setOperator(camera.getOperatorId());
if (!GlobalVariable.loginMap.containsKey(camera.getId()))//鍙帹閫佺櫥褰曟垚鍔熺殑鐩告満
{
continue;
}
- Map<String, Object> ptz = hikClientService.getPtz(cmd);
+ Map<String, Object> ptz = hikClientService.getGisInfo(cmd);
if (StringUtils.isNull(ptz)) {
continue;
}
@@ -80,6 +82,9 @@
ptz.put("usernameZh", cmd.getOperatorZh());
ptz.put("operatorId", cmd.getOperator());//涓婇攣鐢ㄦ埛id
ptz.put("expirationRemainingSecond", secDatePoor);
+ ptz.put("longitude",camera.getLongitude());
+ ptz.put("latitude",camera.getLatitude());
+ ptz.put("altitude",camera.getAltitude());
list.add(ptz);
}
}
--
Gitblit v1.9.3