From 1469fdca0a5f50344876cccdf743ca9c831d009f Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期五, 25 二月 2022 09:52:55 +0800
Subject: [PATCH] websocket接口更新
---
src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java b/src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java
index fb28f91..caf3cc7 100644
--- a/src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevAlarmDataSocket.java
@@ -22,57 +22,72 @@
private static final int executeTime = 5000;
- private static boolean exit=false;
-
private static Map<String,Thread> threadMap = new HashMap<>();
+ private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>();
+
private static DevalarmDataService service;
+
+ private Session session;
@Autowired
public void setService(DevalarmDataService service){
DevAlarmDataSocket.service = service;
}
+ @OnOpen
+ public void onOpen(Session session){
+ this.session=session;
+ }
+
@OnMessage
- public void onMessage(Session session, String message){
- //鍋滄褰撳墠socket鐨勭嚎绋�
- Thread threadBefore = threadMap.get(session.getId());
- if(threadBefore !=null && threadBefore.isAlive()){
- threadBefore.interrupt();
- exit = true;
- }
+ public synchronized void onMessage(Session session, String message){
DevAlarmPar alarmPar = ActionUtil.getGson().fromJson(message, DevAlarmPar.class);
thread = new Thread("Thread_devAlarmData") {
public void run() {
- exit=false;
- while (!thread.isInterrupted()&&!exit) {
+ while (true) {
+ Thread thread = currentThread();
+ threadFlagMap.put(thread.getId(), true);
try {
+ Map<String, Response> res=new HashMap<>();
+ //鏌ヨ宸茬‘璁や俊鎭�
+ alarmPar.setAlmIsConfirmed(1);
+ Response confirmedAlarms=service.serchByInfoOfWebSocket(alarmPar);
+ res.put("confirmedAlarms",confirmedAlarms);
+ alarmPar.setAlmIsConfirmed(0);
+ Response unconfirmedAlarms=service.serchByInfoOfWebSocket(alarmPar);
+ res.put("unconfirmedAlarms",unconfirmedAlarms);
if (session.isOpen()) {
- Map<String, Response> res=new HashMap<>();
- //鏌ヨ宸茬‘璁や俊鎭�
- alarmPar.setAlmIsConfirmed(1);
- Response confirmedAlarms=service.serchByInfoOfWebSocket(alarmPar);
- res.put("confirmedAlarms",confirmedAlarms);
- alarmPar.setAlmIsConfirmed(0);
- Response unconfirmedAlarms=service.serchByInfoOfWebSocket(alarmPar);
- res.put("unconfirmedAlarms",unconfirmedAlarms);
//鎺ㄩ�佷俊鎭�
- session.getBasicRemote().sendObject(new Response().set(1,res));
+ 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();
}
--
Gitblit v1.9.1