Merge remote-tracking branch 'origin/dev' into dev

fuliqi

2024-07-04 c3432d4eef8e6545708e30004189ca3f27b8a067

 src/main/java/com/ycl/jxkg/server/WebsocketServer.java

@@ -1,8 +1,16 @@
package com.ycl.jxkg.server;

import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonObject;
import com.ycl.jxkg.domain.entity.Message;
import com.ycl.jxkg.domain.query.WebSocketQuery;
import com.ycl.jxkg.enums.WebsocketCommendEnum;
import com.ycl.jxkg.service.EducationResourceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.servlet.http.HttpSession;
import javax.websocket.OnClose;
import javax.websocket.OnMessage;
import javax.websocket.OnOpen;
@@ -12,6 +20,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArraySet;

/**
@@ -23,6 +32,8 @@
@ServerEndpoint("/websocket/{userId}")
public class WebsocketServer {

    @Autowired
    private EducationResourceService educationResourceService;
    /**
     * 线程安全的无序的集合
     */
@@ -56,6 +67,12 @@

    @OnMessage
    public void onMessage(String message) {
        WebSocketQuery webSocketQuery = JSONObject.parseObject(message, WebSocketQuery.class);
        String commend = webSocketQuery.getCommend();
        Integer userId = webSocketQuery.getId();
        if(WebsocketCommendEnum.RECORD_STUDY_TIME.getCommend().equals(commend)){
            educationResourceService.recordTime(userId);
        }
        log.info("【WebSocket消息】收到客户端消息：" + message);
    }

@@ -117,4 +134,15 @@
        }
    }

    /**
     * 校验用户是否在线
     *
     * @param userId
     * @return
     */
    public Boolean checkUserOnline(Integer userId) {
        Session session = SESSION_POOL.get(userId);
        return Objects.nonNull(session);
    }

}