From b8bb71260434558a94a61b7e24c6a0895949d102 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 05 十月 2023 18:53:26 +0800
Subject: [PATCH] 应急预案提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 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..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
@@ -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,28 +39,36 @@
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;
- CameraCmd cmd = new CameraCmd();
- cmd.setCameraId(camera.getId());
- cmd.setChannelNum(1);
- cmd.setOperator(camera.getOperatorId());
- if (!GlobalVariable.loginMap.containsKey(camera.getId()))//鍙帹閫佺櫥褰曟垚鍔熺殑鐩告満
+ if (!GlobalVariable.loginMap.containsKey(camera.getId()))//鍙帹閫侀娆＄櫥褰曟垚鍔熺殑鐩告満
{
continue;
}
- Map<String, Object> ptz = hikClientService.getPtz(cmd);
+ //鎺ㄩ�佸ぇ鍏夌數
+ if(!"1".equals(camera.getGdtype()))
+ {
+ continue;
+ }
+ CameraCmd cmd = new CameraCmd();
+ cmd.setCameraId(camera.getId());
+ cmd.setChanNo(1);
+ cmd.setOperator(camera.getOperatorId());
+ //鎺ㄩ�佸湪绾跨殑鐩告満
+ boolean onLine = hikClientService.isOnLine(cmd);
+ if(!onLine)
+ {
+ continue;
+ }
+ Map<String, Object> ptz = hikClientService.getGisInfo(cmd);
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 {
@@ -85,6 +89,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);
}
}
@@ -98,12 +105,5 @@
log.error("鎺ㄩ�乸tz寮傚父:" + ex.getMessage());
}
}
- /**
- * 鑾峰彇cache key
- *
- * @return 缂撳瓨閿甼ey
- */
- private String getCacheKey() {
- return CacheConstants.CAMERA_LIST_KEY;
- }
+
}
--
Gitblit v1.9.3