From 83d4497dd072f2478171a5442d9b5c7ce83594b8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 24 六月 2023 14:51:24 +0800
Subject: [PATCH] 增加ptz的websocket推送
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 56 ++++++++++++++++++++++++++++
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 2
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java | 6 ---
3 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
index 445ba49..55c2b35 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
@@ -13,16 +13,10 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.propertyeditors.CustomDateEditor;
-import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.List;
import java.util.Map;
-
-import static com.ruoyi.common.utils.PageUtils.startPage;
/**
* @ClassName: globalAlarmController
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
index af9178a..89f336a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -596,7 +596,7 @@
double p = b.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
double t = c.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
double z = d.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
- log.debug("T鍨傜洿鍙傛暟涓�: " + p + "P姘村钩鍙傛暟涓�: " + t + "Z鍙樺�嶅弬鏁颁负: " + z);
+// log.debug("T鍨傜洿鍙傛暟涓�: " + p + "P姘村钩鍙傛暟涓�: " + t + "Z鍙樺�嶅弬鏁颁负: " + z);
Map<String, Object> ptzMap = new HashMap<>();
ptzMap.put("p", p);
ptzMap.put("t", t);
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
new file mode 100644
index 0000000..33a06f4
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
@@ -0,0 +1,56 @@
+package com.ruoyi.quartz.task;
+
+import com.ruoyi.common.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.service.IHikClientService;
+import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
+
+/**
+ * @Description:
+ * @ClassName: SdkTask
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�06鏈�24鏃�14:23
+ * @Version: 1.0
+ **/
+@Component("SdkTask")
+public class SdkTask {
+ @Resource
+ IArdCamerasService ardCamerasService;
+ @Resource
+ IHikClientService hikClientService;
+
+ /**
+ * @鎻忚堪 瀹氭椂鎺ㄩ�乸tz
+ * @鍙傛暟 []
+ * @杩斿洖鍊� void
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/15 15:43
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ public void ptzPush() {
+ List<Map<String, Object>> list = new ArrayList<>();
+ ArdCameras ardCameras = new ArdCameras();
+ ardCameras.setGdtype("1");
+ List<ArdCameras> ardCamerasList = ardCamerasService.selectArdCamerasListNoDataScope(ardCameras);
+ for (ArdCameras camera : ardCamerasList) {
+ CameraCmd cmd = new CameraCmd();
+ cmd.setCameraId(camera.getId());
+ cmd.setChannelNum(1);
+ Map<String, Object> ptz = hikClientService.getPtz(cmd);
+ if (ptz.size() > 0) {
+ ptz.put("cameraId", camera.getId());
+ list.add(ptz);
+ }
+ }
+ if (ONLINE_USER_SESSIONS.size() > 0) {
+ WebSocketUtils.sendMessageAll(list.toString());
+ }
+ }
+}
--
Gitblit v1.9.3