From 7c1e2217d0e4aad7498a5c136710c33cb55d00d0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 17 七月 2024 15:11:00 +0800
Subject: [PATCH] 三一车辆模型bug修改提交
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 96 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java
index 1fe8209..d60f957 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java
@@ -1,5 +1,6 @@
package com.ruoyi.app.position.service.impl;
+import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.service.IArdAppPositionService;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -71,7 +72,6 @@
public static void stopTimerTask(Timer timer) {
if (timer != null) {
timer.cancel();
- log.info("鍋滄杩愯");
}
}
@@ -88,24 +88,117 @@
IArdAppPositionService ardAppPositionService = SpringUtils.getBean(IArdAppPositionService.class);
ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
if (StringUtils.isNotNull(ardAppPosition)) {
+ Map<String, Object> params=new HashMap<>();
+ params.put("longitude",ardAppPosition.getLongitude());
+ params.put("latitude",ardAppPosition.getLatitude());
+ params.put("speed",ardAppPosition.getSpeed());
+ params.put("bearing",ardAppPosition.getBearing());
+ params.put("name",sysUser.getUserName());
+ ardAppPosition.setParams(params);
ArdAppPositions.add(ardAppPosition);
}
}
return ArdAppPositions;
}
+ //杩囨护鍦ㄧ嚎app鐢ㄦ埛
public static List<ArdAppPosition> isOnlie(List<ArdAppPosition> data) {
List<ArdAppPosition> onlineList = new ArrayList<>();
if (data.size() > 0) {
for (ArdAppPosition ardAppPosition : data) {
ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
SysUser sysUser = sysUserService.selectUserById(ardAppPosition.getUserId());
- if (sysUser.getAppOnlineState().equals("1")) {
- onlineList.add(ardAppPosition);
+ if(StringUtils.isNotNull(sysUser)) {
+ if(StringUtils.isNotNull(sysUser.getAppOnlineState())) {
+ if (sysUser.getAppOnlineState().equals("1")) {
+ onlineList.add(ardAppPosition);
+ }
+ }
}
}
}
return onlineList;
}
+ //鎺ユ敹澶勭悊鍣�
+ public static void messageHandler(String userId, String message) {
+ try {
+ Map<String, Object> map = JSONObject.parseObject(message, Map.class);
+ if (map.size() > 0) {
+ Boolean enabled = (Boolean) map.get("enabled");
+ if(enabled==null)
+ {
+ return;
+ }
+ if (enabled) {
+ //鍚姩鍏ㄥ眬鎺ㄩ��
+ List<ArdAppPosition> newList = new ArrayList<>(AppPositionPushService.getAppPositionList());
+ AppPositionPushService.dataMap.put(userId, newList);
+ if (!AppPositionPushService.userTimerMap.containsKey(userId)) {
+ Timer timer = AppPositionPushService.startTimerTask(userId, 3000);
+ AppPositionPushService.userTimerMap.put(userId, timer);//灏嗗畾鏃跺櫒鍏宠仈鐢ㄦ埛
+ }
+ } else {
+ //鍋滄鍏ㄥ眬鎺ㄩ��
+ if (AppPositionPushService.userTimerMap.containsKey(userId)) {
+ Timer timer = AppPositionPushService.userTimerMap.get(userId);
+ AppPositionPushService.stopTimerTask(timer);
+ AppPositionPushService.userTimerMap.remove(userId);
+ }
+ if (AppPositionPushService.tempUserTimerMap.containsKey(userId)) {
+ Timer temptimer = AppPositionPushService.tempUserTimerMap.get(userId);
+ AppPositionPushService.stopTimerTask(temptimer);
+ AppPositionPushService.tempUserTimerMap.remove(userId);
+ }
+ AppPositionPushService.dataMap.remove(userId);
+ AppPositionPushService.tempDataMap.remove(userId);
+ }
+
+ Integer frequency = (Integer) map.get("frequency");
+ String uId = (String) map.get("userId");
+ if (frequency > 0) {
+ List<ArdAppPosition> List = AppPositionPushService.getAppPositionList().stream()
+ .filter(obj -> !obj.getUserId().equals(uId))
+ .collect(Collectors.toList());//鍘婚櫎寮曞鍚庣殑list
+ AppPositionPushService.dataMap.put(userId, List);
+
+ List<ArdAppPosition> tempList = AppPositionPushService.getAppPositionList().stream()
+ .filter(obj -> obj.getUserId().equals(uId))
+ .collect(Collectors.toList());//鑾峰彇寮曞鐨刲ist
+ AppPositionPushService.tempDataMap.put(userId, tempList);
+ Timer timer = AppPositionPushService.startTempTimerTask(userId, frequency);
+ AppPositionPushService.tempUserTimerMap.put(userId, timer);
+ } else {
+ List<ArdAppPosition> newList = new ArrayList<>(AppPositionPushService.getAppPositionList());
+ AppPositionPushService.dataMap.put(userId, newList);
+ Timer timer = AppPositionPushService.tempUserTimerMap.get(userId);
+ AppPositionPushService.stopTimerTask(timer);
+ AppPositionPushService.tempUserTimerMap.remove(userId);
+ AppPositionPushService.tempDataMap.remove(userId);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ log.error(ex.getMessage());
+ }
+ }
+
+ //鍋滄澶勭悊鍣�
+ public static void stopHandler(String userId) {
+ //鍋滄鍏ㄥ眬鎺ㄩ��
+ if (AppPositionPushService.userTimerMap.containsKey(userId)) {
+ Timer timer = AppPositionPushService.userTimerMap.get(userId);
+ AppPositionPushService.stopTimerTask(timer);
+ AppPositionPushService.userTimerMap.remove(userId);
+ }
+ if (AppPositionPushService.tempUserTimerMap.containsKey(userId)) {
+ Timer temptimer = AppPositionPushService.tempUserTimerMap.get(userId);
+ AppPositionPushService.stopTimerTask(temptimer);
+ AppPositionPushService.tempUserTimerMap.remove(userId);
+ }
+ AppPositionPushService.dataMap.remove(userId);
+ AppPositionPushService.tempDataMap.remove(userId);
+ // AppPositionPush.stopLocationPushTask(session);//鏃ф柟娉�
+ }
}
--
Gitblit v1.9.3