From e8d53b7555595df35bd2fe03a5c5cf449c38859c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 14 十二月 2023 13:30:49 +0800
Subject: [PATCH] 增加PTZ引导优先; 井管理增加可见光和热红外ptz设置; 雷达报警引导只需要引导雷达塔上的光电,通道根据日夜切换自动选择; 引导优先按井配置的ptz进行引导,当未配置时按经纬度进行引导; 相机优先级队列排序取消报警次数num比对,仅由优先级和接收时间作为比较器条件;

---
 ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplAlarm.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplAlarm.java b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplAlarm.java
index 4e20729..71b5b25 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplAlarm.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplAlarm.java
@@ -87,8 +87,8 @@
             if(result != null){
                 alarmMap.putAll(result);
             }
-            Map<Integer,Object> data = new HashMap();
-            data.put(40000, alarmMap);
+            Map<String,Object> data = new HashMap();
+            data.put("40000", alarmMap);
             ((ArdSyCarServiceImpl) SpringUtils.getBean("ardSyCarServiceImpl")).sendArdSyCarAlarmByCarId(carId,data);//鏌ヨ杞﹁締鍙婇儴闂�
         }else if("0401".equals(pushMsg.getCmd())) {//閫忎紶娑堟伅
             Map<String,Object> dataMap = pushMsg.getJsonMap();

--
Gitblit v1.9.3