审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

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

@@ -1,9 +1,7 @@
package com.whyc.webSocket;

import com.whyc.dto.Response;
import com.whyc.dto.paramter.AlarmPar;
import com.whyc.dto.paramter.DevAlarmPar;
import com.whyc.service.BattalarmDataService;
import com.whyc.service.DevalarmDataService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +9,6 @@

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

@@ -22,7 +19,9 @@

    private static final int executeTime = 5000;

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

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

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

@@ -44,25 +43,29 @@
    public synchronized void onMessage(Session session, String message){
        DevAlarmPar alarmPar = ActionUtil.getGson().fromJson(message, DevAlarmPar.class);
        thread = new Thread("Thread_devAlarmData") {
            @Override
            public void run() {
                while (true) {
                while (runFlag && !isInterrupted()) {
                    Thread thread = currentThread();
                    threadFlagMap.put(thread.getId(), true);
                    try {
                        Map<String, Response> res=new HashMap<>();
                        Map<String, Response> res = new HashMap<>();
                        //查询已确认信息
                        alarmPar.setAlmIsConfirmed(1);
                        Response confirmedAlarms=service.serchByInfoOfWebSocket(alarmPar);
                        res.put("confirmedAlarms",confirmedAlarms);
                        Response confirmedAlarms = service.serchByInfoOfWebSocket(alarmPar);
                        res.put("confirmedAlarms", confirmedAlarms);
                        alarmPar.setAlmIsConfirmed(0);
                        Response unconfirmedAlarms=service.serchByInfoOfWebSocket(alarmPar);
                        res.put("unconfirmedAlarms",unconfirmedAlarms);
                        Response unconfirmedAlarms = service.serchByInfoOfWebSocket(alarmPar);
                        res.put("unconfirmedAlarms", unconfirmedAlarms);
                        //查询分级告警的个数
                        Response levelRes = service.serchByLevel(alarmPar.getUId());
                        res.put("levelRes", levelRes);
                        if (session.isOpen()) {
                            //推送信息
                            synchronized (session) {
                                session.getBasicRemote().sendObject(new Response().set(1, res));
                            }
                            threadFlagMap.put(thread.getId(),false);
                            threadFlagMap.put(thread.getId(), false);
                        }
                        sleep(executeTime);
                        //} catch (IOException | InterruptedException | EncodeException e) {
@@ -88,9 +91,11 @@
    @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
@@ -99,5 +104,6 @@
        if (thread != null && thread.isAlive()) {
            thread.interrupt();
        }
        threadMap.remove(session.getId());
    }
}