From 642635083c0e861c43e5c3674d8cba475cb39dfd Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 03 九月 2024 14:11:24 +0800
Subject: [PATCH] 实时推送rtstate修改
---
src/main/java/com/whyc/webSocket/DevRtstateSocket.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/DevRtstateSocket.java b/src/main/java/com/whyc/webSocket/DevRtstateSocket.java
index 058d391..5878152 100644
--- a/src/main/java/com/whyc/webSocket/DevRtstateSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevRtstateSocket.java
@@ -6,6 +6,7 @@
import com.whyc.service.A200RealstateService;
import com.whyc.service.ActmRealstateService;
import com.whyc.service.BattRtdataService;
+import com.whyc.service.WorkstateChangeeventService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -32,6 +33,8 @@
private static ActmRealstateService actmService;
+ private static WorkstateChangeeventService eventService;
+
private volatile boolean runFlag = true;
@@ -52,6 +55,11 @@
@Autowired
public void setActmRealstateService(ActmRealstateService actmService) {
DevRtstateSocket.actmService = actmService;
+ }
+
+ @Autowired
+ public void setWorkstateChangeeventService(WorkstateChangeeventService eventService) {
+ DevRtstateSocket.eventService = eventService;
}
@OnOpen
@@ -104,8 +112,10 @@
Map<String, Response> map = new HashMap<>();
Response resActmState=actmService.getActmState(devId);
Response rtdataState=rtdataService.getRtdataState(devId);
+ Response event=eventService.getWorkEvent(devId);
map.put("resActmState",resActmState);
map.put("rtdataState",rtdataState);
+ map.put("event",event);
return new Response().setII(1,true,map,"鍧囪 浠狝ctm瀹炴椂鏁版嵁");
}
@@ -114,8 +124,10 @@
Map<String, Response> map = new HashMap<>();
Response resA200State=a200Service.getA200State(devId);
Response rtdataState=rtdataService.getRtdataState(devId);
+ Response event=eventService.getWorkEvent(devId);
map.put("resA200State",resA200State);
map.put("rtdataState",rtdataState);
+ map.put("event",event);
return new Response().setII(1,true,map,"涓�浣撴満A200瀹炴椂鏁版嵁");
}
--
Gitblit v1.9.1