From 664fd1119db534b3746bc211f063f89b57d9db3b Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 24 七月 2023 17:18:26 +0800
Subject: [PATCH] 三一车辆命令代码修改提交
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplAlarm.java | 4 ++--
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java | 2 +-
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 6 +++---
3 files changed, 6 insertions(+), 6 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();
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
index 804fd16..453af4c 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
@@ -97,7 +97,7 @@
/**
* 鏍规嵁閮ㄩ棬鍙戦�佽溅杈嗗疄鏃舵姤璀�
*/
- public void sendArdSyCarAlarmByCarId(String carId, Map<Integer,Object> data);
+ public void sendArdSyCarAlarmByCarId(String carId, Map<String,Object> data);
// List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList);
/**
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 014701b..b594f6d 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -369,15 +369,15 @@
String deptId = String.valueOf(sysUser.getDeptId());
Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
if(map != null){
- Map<Integer,Object> data = new HashMap();
- data.put(30000, map.values());
+ Map<String,Object> data = new HashMap();
+ data.put("30000", map.values());
WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
}
}
}
@Override
- public void sendArdSyCarAlarmByCarId(String carId, Map<Integer,Object> data) {
+ public void sendArdSyCarAlarmByCarId(String carId, Map<String,Object> data) {
List<SysUser> result = userMapper.getSysUserByCarId(carId);
for(SysUser sysUser : result){
WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(sysUser.getUserId()), JSON.toJSONString(data));
--
Gitblit v1.9.3