审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

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

@@ -1,5 +1,6 @@
package com.whyc.webSocket;

import com.whyc.dto.Response;
import com.whyc.pojo.Fbs9100State;
import com.whyc.service.Fbs9100StateService;
import com.whyc.util.ActionUtil;
@@ -25,52 +26,71 @@

    private static final int executeTime = 15000;

    private volatile boolean runFlag=true;

    private static Fbs9100StateService service;

    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 Session session;

    @Autowired
    public void setService(Fbs9100StateService service) {
        DeviceWorkStateSocket.service = service;
    }

    @OnOpen
    public void onOpen(Session session){
        this.session=session;
    }

    @OnMessage
    public void onMessage(Session session,String msg){
        //停止当前socket的线程
        Thread threadBefore = threadMap.get(session.getId());
        if(threadBefore !=null && threadBefore.isAlive()){
            threadBefore.interrupt();
        }
    public synchronized void onMessage(Session session,String msg){
        Fbs9100State stateParam = ActionUtil.getGson().fromJson(msg, Fbs9100State.class);
        this.thread = new Thread("Thread_DeviceWorkState") {
            public void run() {
                while (!DeviceWorkStateSocket.this.thread.isInterrupted()) {
                while (runFlag && !isInterrupted()) {
                    Thread thread = currentThread();
                    threadFlagMap.put(thread.getId(), true);
                    try {
                        if (session.isOpen()) {
                            session.getBasicRemote().sendObject(service.getList(stateParam.getDevId().intValue(),stateParam.getDevWorkstate(),Long.parseLong(stateParam.getNote())));
                            //推送信息
                            synchronized (session) {
                                session.getBasicRemote().sendObject(service.getList(stateParam.getDevId().intValue(),stateParam.getDevWorkstate(),Long.parseLong(stateParam.getNote())));
                            }
                            threadFlagMap.put(thread.getId(),false);
                        }
                        sleep(executeTime);
                    } catch (IOException | InterruptedException | EncodeException e) {
                        //} catch (IOException | InterruptedException | EncodeException e) {
                    } catch (Exception e) {
                        interrupt();
                    }
                }
            }
        };
        this.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);
    }

    @OnOpen
    public void onOpen(Session session){

    }

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

    @OnError
@@ -79,5 +99,6 @@
        if (thread != null && thread.isAlive()) {
            thread.interrupt();
        }
        threadMap.remove(session.getId());
    }
}