From 1bca1b9c61676b48cc3137d3003e520c75ecdd92 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Sat, 13 Jan 2024 10:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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