From b627f6ca5a5ba2a46099e1a3aea6aa5a516c683f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 31 七月 2023 16:36:23 +0800
Subject: [PATCH] app位置结构增加params 修改单兵端的任务详情和列表
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPushService.java | 145 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 129 insertions(+), 16 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 5fad187..9b62a7c 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;
@@ -20,17 +21,12 @@
* @Version 1.0
* {"enabled":false,"frequency":1000,"userId":"69cf75f289424a48ba10cf33fa324206"}
*/
-@Slf4j
public class AppPositionPushService {
public static Map<String, List<ArdAppPosition>> dataMap = new HashMap<>();//甯歌鏁版嵁 姣忎釜鐢ㄦ埛鍏宠仈
public static Map<String, List<ArdAppPosition>> tempDataMap = new HashMap<>();//涓存椂鏁版嵁 姣忎釜鐢ㄦ埛鍏宠仈
public static Map<String, Timer> userTimerMap = new HashMap();//瀹氭椂鍣� 姣忎釜鐢ㄦ埛鍏宠仈
public static Map<String, Timer> tempUserTimerMap = new HashMap();//涓存椂瀹氭椂鍣� 姣忎釜鐢ㄦ埛鍏宠仈
- public static List<ArdAppPosition> initDataList;
-
- static {
- initDataList = getAppPositionList();
- }
+// public static List<ArdAppPosition> initDataList;
//鍚姩鍏ㄥ眬瀹氭椂鍣�
public static Timer startTimerTask(String userId, Integer period) {
@@ -39,9 +35,10 @@
@Override
public void run() {
List<ArdAppPosition> data = dataMap.get(userId);
- if (data.size() > 0) {
+ List<ArdAppPosition> onlineData = isOnlie(data);
+ if (onlineData.size() > 0) {
Map newMap = new HashMap<>();
- newMap.put("50000", data);
+ newMap.put("50000", onlineData);
WebSocketUtils.sendMessage(WebSocketUtils.ONLINE_USER_SESSIONS.get(userId), newMap);
}
}
@@ -58,9 +55,10 @@
public void run() {
//寰幆
List<ArdAppPosition> data = tempDataMap.get(userId);
- if (data.size() > 0) {
+ List<ArdAppPosition> onlineData = isOnlie(data);
+ if (onlineData.size() > 0) {
Map newMap = new HashMap<>();
- newMap.put("50000", data);
+ newMap.put("50000", onlineData);
WebSocketUtils.sendMessage(WebSocketUtils.ONLINE_USER_SESSIONS.get(userId), newMap);
}
}
@@ -73,7 +71,6 @@
public static void stopTimerTask(Timer timer) {
if (timer != null) {
timer.cancel();
- log.info("鍋滄杩愯");
}
}
@@ -83,15 +80,131 @@
ISysUserService sysUserService = SpringUtils.getBean(ISysUserService.class);
//鑾峰彇鎵�鏈塧pp鐢ㄦ埛
List<SysUser> list = sysUserService.selectAllAppUserList(new SysUser());
- List<SysUser> onlineList = list.stream()
- .filter(obj -> obj.getAppOnlineState().equals("1"))
- .collect(Collectors.toList());
- for (SysUser sysUser : onlineList) {
+// List<SysUser> onlineList = list.stream()
+// .filter(obj -> obj.getAppOnlineState().equals("1"))
+// .collect(Collectors.toList());
+ for (SysUser sysUser : list) {
IArdAppPositionService ardAppPositionService = SpringUtils.getBean(IArdAppPositionService.class);
ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
- ArdAppPositions.add(ardAppPosition);
+ 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());
+ 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(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) {
+ Map<String, Object> map = JSONObject.parseObject(message, Map.class);
+ if (map.size() > 0) {
+ Boolean enabled = (Boolean) map.get("enabled");
+ 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);
+ }
+ //region 鏃ф柟娉�
+// Map<String, List<ArdAppPosition>> dataMap = new HashMap<>();
+// List<ArdAppPosition> positionList = AppPositionPush.initDataMap.get(userId);//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁ゅ彂閫佺殑鏁版嵁map
+// if(frequency>0)
+// {
+// //鎺ユ敹鍒伴鐜囧ぇ浜�0锛屽睘浜庣敵璇峰紩瀵硷紝鑾峰彇闄ゅ紩瀵煎鐨勫叾浠朼pp鐢ㄦ埛鐨勪綅缃甃ist
+// List<ArdAppPosition> appPositionList = positionList.stream()
+// .filter(obj -> !obj.getUserId().equals(uId))
+// .collect(Collectors.toList());
+// dataMap.put(userId,appPositionList);
+// }
+// else {
+// //鎺ユ敹鍒伴鐜囩瓑浜�0锛屽睘浜庨噴鏀惧紩瀵硷紝鑾峰彇鍒板叏閮╝pp鐢ㄦ埛鐨勪綅缃甃ist
+// dataMap.put(userId,AppPositionPush.getAppPositionList());
+// }
+// AppPositionPush.initDataMap.putAll(dataMap);//鏇存柊鍒濆浼氳瘽榛樿鏁版嵁map
+// AppPositionPush.startLocationPushTask(userId,session,uId, frequency);//寮�鍚柊浠诲姟
+ //endregion
+ }
+ }
+
+ //鍋滄澶勭悊鍣�
+ 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