From 17f23160c7dff513fbab0da321b81b405e03eb0a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 15 六月 2024 13:37:33 +0800
Subject: [PATCH] 再用电池模块推送环境数据
---
src/main/java/com/whyc/webSocket/BattSocket.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/BattSocket.java b/src/main/java/com/whyc/webSocket/BattSocket.java
index a5af408..806b140 100644
--- a/src/main/java/com/whyc/webSocket/BattSocket.java
+++ b/src/main/java/com/whyc/webSocket/BattSocket.java
@@ -5,10 +5,7 @@
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.pojo.RtState;
import com.whyc.pojo.StationInf;
-import com.whyc.service.BattAlarmService;
-import com.whyc.service.BattInfService;
-import com.whyc.service.RtDataService;
-import com.whyc.service.RtStateService;
+import com.whyc.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -43,7 +40,6 @@
private volatile Map<String, Thread> threadMap = new HashMap<>();
- private volatile Map<Long, Boolean> threadFlagMap = new HashMap<>();
private static final int executeTime = 5000;
@@ -52,6 +48,8 @@
private static RtDataService rtDataService;
private static BattAlarmService battAlarmService;
+
+ private static RtEnvirmentService rtEnvirmentService;
@Autowired
@@ -69,6 +67,11 @@
BattSocket.battAlarmService = battAlarmService;
}
+ @Autowired
+ public void setRtEnvirmentService(RtEnvirmentService rtEnvirmentService) {
+ BattSocket.rtEnvirmentService = rtEnvirmentService;
+ }
+
@OnOpen
public void onOpen(Session session) {
this.session = session;
@@ -84,7 +87,7 @@
Map<String, Object> res = new HashMap<>();
while (!currentThread().isInterrupted()) {
ThreadPoolExecutor poolExecutor = ThreadPoolExecutorFactory.getPoolExecutor();
- CountDownLatch latch = new CountDownLatch(3);
+ CountDownLatch latch = new CountDownLatch(4);
poolExecutor.execute(() -> {
Response resRtState = rtStateService.getResRtState(binfId);
res.put("resRtState", resRtState);
@@ -100,6 +103,11 @@
res.put("resBattAlm", resBattAlm);
latch.countDown();
});
+ poolExecutor.execute(() -> {
+ Response resRtEnvir = rtEnvirmentService.getResRtEnvir();
+ res.put("resRtEnvir", resRtEnvir);
+ latch.countDown();
+ });
latch.await(10, TimeUnit.MINUTES);
session.getBasicRemote().sendObject(new Response().set(1, res));
sleep(executeTime);
--
Gitblit v1.9.1