修复app推送在线状态错误

‘liusuyi’

2023-07-28 c76d735cf906bde876ebd32a0ad8d1413a7ca902

 ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java

@@ -2,17 +2,27 @@

import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.service.IArdAppPositionService;
import com.ruoyi.app.position.service.impl.AppPositionPush;
import com.ruoyi.app.position.service.impl.ArdAppPositionServiceImpl;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import javax.websocket.*;
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;

/**
 * @ClassName ChatServerEndpoint
@@ -34,9 +44,8 @@
        log.info("用户登录：" + message);
        WebSocketUtils.sendMessage(session, message);
        //每个用户连接时，启动初始所有app用户位置发送
        Map<String, ArdAppPosition> appPositionMap = AppPositionPush.getAppPositionList();
        AppPositionPush.defaultDataMap.put(session,appPositionMap);
        AppPositionPush.initPushTask(session,3000);
        AppPositionPush.initDataMap.put(userId,AppPositionPush.getAppPositionList());
        AppPositionPush.initPushTask(userId,session,3000);
    }

    @OnMessage
@@ -50,20 +59,22 @@
        if(map.size()>0) {
            Integer frequency = (Integer)map.get("frequency");
            String uId = (String) map.get("userId");
            Map allMap = AppPositionPush.defaultDataMap.get(session);//获取当前session的默认发送的数据map
            Map<String, List<ArdAppPosition>> dataMap = new HashMap<>();
            List<ArdAppPosition> positionList = AppPositionPush.initDataMap.get(userId);//获取当前用户的默认发送的数据map
            if(frequency>0)
            {
                //接收到频率大于0，属于申请引导，将app从默认map中移除
                allMap.remove(uId);
                AppPositionPush.defaultDataMap.putAll(allMap);
                //接收到频率大于0，属于申请引导，获取除引导外的其他app用户的位置List
                List<ArdAppPosition> appPositionList = positionList.stream()
                        .filter(obj -> !obj.getUserId().equals(uId))
                        .collect(Collectors.toList());
                dataMap.put(userId,appPositionList);
            }
           else {
                //接收到频率等于0，属于释放引导，将app恢复到初始map
                Map<String, ArdAppPosition> appPositionList = AppPositionPush.getAppPositionList();
                allMap.put(uId,appPositionList.get(uId));
                AppPositionPush.defaultDataMap.putAll(allMap);
                //接收到频率等于0，属于释放引导，获取到全部app用户的位置List
                dataMap.put(userId,AppPositionPush.getAppPositionList());
            }
            AppPositionPush.startLocationPushTask(uId, session, frequency);
            AppPositionPush.initDataMap.putAll(dataMap);//更新初始会话默认数据map
            AppPositionPush.startLocationPushTask(userId,session,uId, frequency);//开启新任务
        }
    }