From 8ba9295eef9d53f633aeb83e7cf5234da7713ac0 Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期二, 28 二月 2023 08:55:28 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0
---
src/main/java/com/whyc/webSocket/ScreenSocket.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/ScreenSocket.java b/src/main/java/com/whyc/webSocket/ScreenSocket.java
index 063c82c..bc7f1da 100644
--- a/src/main/java/com/whyc/webSocket/ScreenSocket.java
+++ b/src/main/java/com/whyc/webSocket/ScreenSocket.java
@@ -2,6 +2,7 @@
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
+import com.whyc.pojo.Battinf;
import com.whyc.pojo.UserInf;
import com.whyc.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +13,9 @@
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 澶у睆灞曠ず Socket
@@ -32,9 +35,27 @@
private static DevalarmDataService devAlarmDataService;
+ private static BattInfService battInfService;
+
@Autowired
public void setPowerAlarmService(PwrdevAlarmService powerAlarmService) {
ScreenSocket.powerAlarmService = powerAlarmService;
+ }
+ @Autowired
+ public void setBattAlarmDataService(BattalarmDataService battAlarmDataService) {
+ ScreenSocket.battAlarmDataService = battAlarmDataService;
+ }
+ @Autowired
+ public void setFbs9100StateService(Fbs9100StateService fbs9100StateService) {
+ ScreenSocket.fbs9100StateService = fbs9100StateService;
+ }
+ @Autowired
+ public void setDevAlarmDataService(DevalarmDataService devAlarmDataService) {
+ ScreenSocket.devAlarmDataService = devAlarmDataService;
+ }
+ @Autowired
+ public void setBattInfService(BattInfService battInfService) {
+ ScreenSocket.battInfService = battInfService;
}
@OnOpen
@@ -61,12 +82,19 @@
int battAlarmNum = battAlarmDataService.serchRealTime(userId).getCode();
int devAlarmNum = devAlarmDataService.getAlarmNum(userId);
int powerAlarmNum = (int) powerAlarmService.getAlarmNum().getData();
- //涓�浣� 缁熻:鐢垫睜鍝佺墝缁熻
+ //涓�浣� 缁熻:鐢垫睜缁熻 鍒嗕负鍝佺墝鍜屾爣绉扮數鍘�
+ List<Battinf> battinfList = battInfService.getBattGroupList(userId);
+ Map<String, List<Battinf>> battProducerMap = battinfList.stream().collect(Collectors.groupingBy(Battinf::getBattProducer));
+ Map<Float, List<Battinf>> battMonVolStdMap = battinfList.stream().collect(Collectors.groupingBy(Battinf::getMonVolStd));
+ Map<String,Object> battGroupInfoMap = new HashMap<>();
+ for(String producer : battGroupInfoMap.keySet()){
+
+ }
//涓�浣� 缁熻:璁惧鐘舵��
Response<Map> res_devStates = fbs9100StateService.getBTSEquipStatus(userId);
- //涓�浣� 缁熻:鍚勭璁惧绫诲瀷鎬绘暟 鐢垫睜 璁惧 鐢垫簮 绔欑偣 TODO 闇�瑕佹坊鍔犵數婧愰獙璇佷笅绔欑偣鐨勫彉鍖栭�昏緫
-
+ //涓�浣� 缁熻:鍚勭璁惧绫诲瀷鎬绘暟 鐢垫睜 璁惧 鐢垫簮 绔欑偣
+ Response<Map> res_devCountMap = battInfService.getDevCountMap(userId);
//缁埅妫�娴�??? TODO
--
Gitblit v1.9.1