From c42eb48cdd8b606bddb53f3166fa5f4604b7242c Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 28 三月 2023 16:47:01 +0800
Subject: [PATCH] fbo4831
---
src/main/java/com/whyc/webSocket/RealTimeWebsocket.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/RealTimeWebsocket.java b/src/main/java/com/whyc/webSocket/RealTimeWebsocket.java
index 0975d52..22c18b5 100644
--- a/src/main/java/com/whyc/webSocket/RealTimeWebsocket.java
+++ b/src/main/java/com/whyc/webSocket/RealTimeWebsocket.java
@@ -219,6 +219,9 @@
case "fbo4830":
res = getFbo4830(realTimePar);
break;
+ case "fbo4831":
+ res = getFbo4831(realTimePar);
+ break;
case "fbo4815":
res = getFbo4815(realTimePar);
break;
@@ -333,6 +336,27 @@
return new Response().set(1, res);
}
+ //FBO4831鐨勫疄鏃堕〉闈俊鎭�
+ public Response getFbo4831(RealTimePar realTimePar) {
+ Map<String, Response> res = new HashMap<>();
+ //鏌ヨfbs9100淇℃伅
+ Response f9100stateRes = f9100service.serchContactorState(realTimePar.getDevId());
+ res.put("f9100state", f9100stateRes);
+ //鏌ヨ鐢垫睜缁勭淇℃伅
+ Response rtstateRes = rtstateservice.serchByCondition(realTimePar.getBattGroupId());
+ res.put("rtstate", rtstateRes);
+ //鏌ヨ鐢垫睜缁勫崟浣撲俊鎭�
+ Response rtdataRes = rtdataservice.serchByCondition(realTimePar.getBattGroupId());
+ res.put("rtdata", rtdataRes);
+ //閿傜數姹犳暟鎹�
+ /*Response li9130StateRes = li9130Service.search4830State(realTimePar.getDevId());
+ res.put("li9130State", li9130StateRes);*/
+ //鏈�鍚庝竴娆℃牳瀹规斁鐢垫暟鎹�
+ /*Response tinfRes = batttestDataInfService.searchBattLastHrDataById(realTimePar.getBattGroupId(), realTimePar.getDevId());
+ res.put("tinfdata", tinfRes);*/
+ return new Response().set(1, res);
+ }
+
//FBO4815鐨勫疄鏃堕〉闈俊鎭�
public Response getFbo4815(RealTimePar realTimePar) {
Map<String, Response> res = new HashMap<>();
--
Gitblit v1.9.1