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,7 +21,6 @@ * @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<>();//临时数据 每个用户关联 @@ -71,7 +71,6 @@ public static void stopTimerTask(Timer timer) { if (timer != null) { timer.cancel(); log.info("停止运行"); } } @@ -94,18 +93,112 @@ 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());//获取引导的list 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，属于申请引导，获取除引导外的其他app用户的位置List // List<ArdAppPosition> appPositionList = positionList.stream() // .filter(obj -> !obj.getUserId().equals(uId)) // .collect(Collectors.toList()); // dataMap.put(userId,appPositionList); // } // else { // //接收到频率等于0，属于释放引导，获取到全部app用户的位置List // 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);//旧方法 } } ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java
@@ -24,7 +24,7 @@ /** * @ClassName ChatServerEndpoint * @Description: * @Description: websocket操作类 * @Author 刘苏义 * @Date 2023/1/27 7:42 * @Version 1.0 @@ -54,100 +54,20 @@ WebSocketUtils.sendMessage(session, message); // sendMessageAll("用户[" + userid + "] : " + 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());//获取引导的list 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，属于申请引导，获取除引导外的其他app用户的位置List // List<ArdAppPosition> appPositionList = positionList.stream() // .filter(obj -> !obj.getUserId().equals(uId)) // .collect(Collectors.toList()); // dataMap.put(userId,appPositionList); // } // else { // //接收到频率等于0，属于释放引导，获取到全部app用户的位置List // dataMap.put(userId,AppPositionPush.getAppPositionList()); // } // AppPositionPush.initDataMap.putAll(dataMap);//更新初始会话默认数据map // AppPositionPush.startLocationPushTask(userId,session,uId, frequency);//开启新任务 //endregion } AppPositionPushService.messageHandler(userId,message); } @OnClose public void onClose(@PathParam("userId") String userId, Session session) { //当前的Session 移除 WebSocketUtils.ONLINE_USER_SESSIONS.remove(userId); // //并且通知其他人当前用户已经离开聊天室了 //并且通知其他人当前用户已经离开聊天室了 String message = "用户[" + userId + "] 断开连接！"; // sendMessage(session,message); log.info("消息：" + message); try { session.close(); //停止全局推送 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);//旧方法 AppPositionPushService.stopHandler(userId); } catch (IOException e) { log.error("onClose error", e); } ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java
@@ -38,7 +38,7 @@ } synchronized(session) { try { log.info("发送消息："+message); log.debug("发送消息："+message); session.getBasicRemote().sendText(message); } catch (IOException e) { log.error("sendMessage IOException ",e); ruoyi-admin/src/main/resources/logback.xml
@@ -233,7 +233,7 @@ <appender-ref ref="stealAlarm"/> </logger> <!--websocket日志打印等级--> <logger name="websocket" level="INFO"> <logger name="websocket" level="DEBUG"> <appender-ref ref="websocket"/> </logger> <!--光电巡检日志打印等级-->
