From 1f2cf986ce2317973fec8f4cc65b94d1693d9727 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 07 九月 2024 13:58:31 +0800
Subject: [PATCH] rtstateSocket取actm修改
---
src/main/java/com/whyc/webSocket/DevRtstateSocket.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/DevRtstateSocket.java b/src/main/java/com/whyc/webSocket/DevRtstateSocket.java
index 5878152..bb0e443 100644
--- a/src/main/java/com/whyc/webSocket/DevRtstateSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevRtstateSocket.java
@@ -111,10 +111,12 @@
private Response getActmState(int devId) {
Map<String, Response> map = new HashMap<>();
Response resActmState=actmService.getActmState(devId);
- Response rtdataState=rtdataService.getRtdataState(devId);
+ Response rtdataState0=rtdataService.getActmRtdataState(devId,0);
+ Response rtdataState1=rtdataService.getActmRtdataState(devId,1);
Response event=eventService.getWorkEvent(devId);
map.put("resActmState",resActmState);
- map.put("rtdataState",rtdataState);
+ map.put("rtdataState0",rtdataState0);
+ map.put("rtdataState1",rtdataState1);
map.put("event",event);
return new Response().setII(1,true,map,"鍧囪 浠狝ctm瀹炴椂鏁版嵁");
}
@@ -123,7 +125,7 @@
private Response getA200State(int devId) {
Map<String, Response> map = new HashMap<>();
Response resA200State=a200Service.getA200State(devId);
- Response rtdataState=rtdataService.getRtdataState(devId);
+ Response rtdataState=rtdataService.getA200RtdataState(devId);
Response event=eventService.getWorkEvent(devId);
map.put("resA200State",resA200State);
map.put("rtdataState",rtdataState);
--
Gitblit v1.9.1