三一车辆命令代码修改提交

zhangnaisong

2023-07-24 664fd1119db534b3746bc211f063f89b57d9db3b

三一车辆命令代码修改提交

 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();

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

    /**

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