From f31c226385b545d744cee20165a34a115e371d82 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期六, 09 三月 2024 13:48:54 +0800
Subject: [PATCH] 南网昆明首页接口
---
src/main/java/com/whyc/webSocket/ScreenForNWKMSocket.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/ScreenForNWKMSocket.java b/src/main/java/com/whyc/webSocket/ScreenForNWKMSocket.java
index 30b4de3..470a398 100644
--- a/src/main/java/com/whyc/webSocket/ScreenForNWKMSocket.java
+++ b/src/main/java/com/whyc/webSocket/ScreenForNWKMSocket.java
@@ -105,7 +105,7 @@
Map<String, Object> res = new HashMap<>();
while (!currentThread().isInterrupted()) {
ThreadPoolExecutor poolExecutor = ThreadPoolExecutorFactory.getPoolExecutor();
- CountDownLatch latch = new CountDownLatch(10);
+ CountDownLatch latch = new CountDownLatch(9);
poolExecutor.execute(()->{
//1.缁熻:鐢垫睜缁熻 鍒嗕负鍝佺墝鍜屾爣绉扮數鍘�
Response res_battGroupInfo = new Response();
@@ -160,16 +160,10 @@
latch.countDown();
});
poolExecutor.execute(()->{
- //6.缁熻:瀹炴椂鍛婅 璺熷憡璀︾粺璁￠�昏緫涓�鑷�
+ //6.缁熻:瀹炴椂鏀剧數淇℃伅 TODO 姝ｅ湪鏀剧數鐨勭數姹犱俊鎭睍绀�
Response res_alarm = new Response();
- Map<String, Integer> devAlarmNumMap = new HashMap<>();
- try {
- Response realAlarmList = battAlarmDataService.getRealAlarmListWithLevel1(userId);
- res_alarm.setII(1,true,realAlarmList,null);
- }catch (Exception e){
- res_alarm.set(1,false,"鍙戠敓寮傚父:"+e.getCause());
- }
- res.put("realTimeAlarm", res_alarm);
+
+ res.put("dischargingBattery", res_alarm);
latch.countDown();
});
poolExecutor.execute(()->{
@@ -203,7 +197,7 @@
res.put("resTestdataInfAnalysis", resTestdataInfAnalysis);
latch.countDown();
});
- poolExecutor.execute(()->{
+ /*poolExecutor.execute(()->{
//9.缁熻:鍛婅缁熻 鐢垫簮,璁惧,鐢垫睜
Response res_devAlarmNum = new Response();
Map<String, Integer> devAlarmNumMap = new HashMap<>();
@@ -220,9 +214,9 @@
}
res.put("devAlarmNum", res_devAlarmNum);
latch.countDown();
- });
+ });*/
poolExecutor.execute(()->{
- //9-2.缁熻:鍛婅缁熻 绾у埆缁熻
+ //9-2.缁熻:鍛婅缁熻 绾у埆鍙婄被鍨嬬粺璁�
Response res_alarmLevel = new Response();
Map<String, Integer> devAlarmNumMap = new HashMap<>();
try {
--
Gitblit v1.9.1