From 0f3ee7675fa1f95203393dba2fcee4257fc4fbdb Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 23 十二月 2022 11:15:53 +0800
Subject: [PATCH] 设备实时告警分级数
---
src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java b/src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java
index 2a15efa..e3f257f 100644
--- a/src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java
+++ b/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;
@@ -46,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 (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) {
--
Gitblit v1.9.1