From d62fa80f3d12a56ae60eeef45f07cea6477c2507 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 13 二月 2025 09:00:58 +0800
Subject: [PATCH] 6186
---
src/main/java/com/whyc/webSocket/RealTimeWebsocket.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/RealTimeWebsocket.java b/src/main/java/com/whyc/webSocket/RealTimeWebsocket.java
index d21e72a..b488abc 100644
--- a/src/main/java/com/whyc/webSocket/RealTimeWebsocket.java
+++ b/src/main/java/com/whyc/webSocket/RealTimeWebsocket.java
@@ -324,7 +324,7 @@
res = getNibian6184(realTimePar,lang);
break;
case "nibian6186":
- res = getNibian6186(realTimePar);
+ res = getNibian6186(realTimePar,lang);
break;
}
//瀹炴椂鏄剧ず璋冩暣,澧炲姞鐢垫睜鏁伴噺,鏍囩О鍗曚綋鐢靛帇,閾呴吀杩樻槸閿傜數锛屾斁缃簬杩斿洖缁撴灉鐨刣ata2
@@ -672,11 +672,8 @@
}
//6186
- public Response getNibian6186(RealTimePar realTimePar) {
+ public Response getNibian6186(RealTimePar realTimePar, String lang) {
Map<String, Object> res = new HashMap<>();
- //鑾峰彇閫嗗彉鐨勫叾浠栦俊鎭�
- Response fbs9100sBuscoupleState = fbs9100sBuscoupleStateService.serchByDevId(realTimePar.getDevId());
- res.put("fbs9100sBuscoupleState", fbs9100sBuscoupleState);
//鏌ヨfbs9100淇℃伅
Response f9100stateRes = f9100service.serchContactorState(realTimePar.getDevId());
res.put("f9100state", f9100stateRes);
@@ -685,9 +682,9 @@
//鏌ヨ鐢垫睜缁勫崟浣撲俊鎭�
Response rtdataRes = rtdataservice.serchByCondition(realTimePar.getBattGroupId());
res.put("rtdata", rtdataRes);
- //鑾峰彇615鍏ㄥ姛鑳介�嗗彉鍋囪礋杞藉紑鍏充互鍙婇�嗗彉妯″潡瀹炴椂
- Response qgnRes= qgnService.serchByDevId(realTimePar.getDevId());
- res.put("qgnRes", qgnRes);
+ //鏈�鍚庝竴娆℃牳瀹规斁鐢垫暟鎹�
+ Response tinfRes = batttestDataInfService.searchBattLastHrDataByIdDbs(realTimePar.getBattGroupId(), realTimePar.getDevId(), lang);
+ res.put("tinfdata", tinfRes);
return new Response().set(1, res);
}
--
Gitblit v1.9.1