更新socket推送方式

whycxzp

2022-02-23 5d21d50f13d46f6eab52bd333c90dbdf048e1741

更新socket推送方式

 src/main/java/com/whyc/webSocket/BattAlarmDataSocket.java

@@ -2,7 +2,6 @@

import com.whyc.dto.Response;
import com.whyc.dto.paramter.AlarmPar;
import com.whyc.dto.paramter.BattSparePar;
import com.whyc.service.BattalarmDataService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,23 +9,21 @@

import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArraySet;

@Component
@ServerEndpoint(value = "/battAlarmData",encoders = WebSocketEncoder.class)
public class BattAlarmDataSocket {
    private volatile Thread thread;

    private static final int executeTime = 5000;
    private static final int executeTime = 10000;

    private static Map<String,Thread> threadMap = new HashMap<>();
    private volatile Map<String,Thread> threadMap = new HashMap<>();

    private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>();

    private static BattalarmDataService service;

    private boolean sendingFlag = false;

    private Session session;
    @Autowired
@@ -39,21 +36,14 @@
        this.session=session;
    }
    @OnMessage
    public void onMessage(Session session, String message){
        //停止当前socket的线程
        Thread threadBefore = threadMap.get(session.getId());
        if(threadBefore !=null && threadBefore.isAlive()){
            while (sendingFlag){

            }
            threadBefore.interrupt();
        }
    public synchronized void onMessage(Session session, String message){
        AlarmPar alarmPar = ActionUtil.getGson().fromJson(message, AlarmPar.class);
        thread = new Thread("Thread_battAlarmData") {
            public void run() {
                while (!currentThread().isInterrupted()) {
                while (true) {
                    Thread thread = currentThread();
                    threadFlagMap.put(thread.getId(),true);
                    try {
                        sendingFlag = true;
                        Map<String, Response> res=new HashMap<>();
                        //查询已确认信息
                        alarmPar.setAlmIsConfirmed(1);
@@ -64,23 +54,35 @@
                        res.put("unconfirmedAlarms",unconfirmedAlarms);
                        if (session.isOpen()) {
                            //推送信息
                            session.getBasicRemote().sendObject(new Response().set(1,res));
                            sendingFlag = false;
                            synchronized (session) {
                                session.getBasicRemote().sendObject(new Response().set(1, res));
                            }
                            threadFlagMap.put(thread.getId(),false);
                        }
                        sleep(executeTime);
                    } catch (IOException | InterruptedException | EncodeException e) {
                    //} catch (IOException | InterruptedException | EncodeException e) {
                    } catch (Exception e) {
                        interrupt();
                    }
                }
            }
        };
        thread.start();
        threadFlagMap.put(thread.getId(),true);
        //停止老的socket线程
        Thread threadBefore = threadMap.get(session.getId());
        if(threadBefore !=null && threadBefore.isAlive()){
            while (threadFlagMap.get(threadBefore.getId())){
            }
            threadBefore.interrupt();
        }
        //将线程存储,便于调用定位
        threadMap.put(session.getId(), this.thread);
    }

    @OnClose
    public void onClose(){
    public void onClose(CloseReason closeReason){
        System.err.println("closeReason = " + closeReason);
        if (thread != null && thread.isAlive()) {
            thread.interrupt();
        }