From a36855e901319feec93c956ba5cdc0c736633244 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 19 一月 2024 15:31:48 +0800
Subject: [PATCH] 电池单体设置刷新逻辑
---
src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java | 3 ++-
src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java | 14 ++++++++++++++
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java b/src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java
index 134c2c6..9be7118 100644
--- a/src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java
@@ -56,6 +56,20 @@
query.in("mon_num",monNumList);
return mapper.selectList(query);
}
+
+ /**缁勫唴鎵�鏈夊崟浣撳垪琛ㄦ煡璇�*/
+ public List<CKPowerDevBattRtData> getAllMonList(Integer battIndex) {
+ QueryWrapper<CKPowerDevBattRtData> query = Wrappers.query();
+ if(battIndex!=null) {
+ if(battIndex == -1) { //棣栭〉涓婁娇鐢�,榛樿鍙煡缁�1
+ query.eq("batt_index", 0);
+ }else{
+ query.eq("batt_index", battIndex);
+ }
+ }
+ return mapper.selectList(query);
+ }
+
//鑾峰彇榛樿绗竴缁勫崟浣撴暟鎹埛鏂拌嚦绗竴缁�0
public List<CKPowerDevBattRtData> getDataList_index0() {
QueryWrapper<CKPowerDevBattRtData> wrapper = Wrappers.query();
diff --git a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
index 14a5d2e..c37b1d9 100644
--- a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
@@ -150,7 +150,8 @@
Integer battIndex = dataSetList.get(0).getBattIndex();
List<Integer> monNumList = dataSetList.stream().map(CKPowerDevBattRtDataSet::getMonNum).collect(Collectors.toList());
//鑾峰彇瀹炴椂琛ㄦ暟鎹苟鍐欏叆set琛�
- List<CKPowerDevBattRtData> rtDataList = dataService.getMonList(battIndex,monNumList);
+ //List<CKPowerDevBattRtData> rtDataList = dataService.getMonList(battIndex,monNumList);
+ List<CKPowerDevBattRtData> rtDataList = dataService.getAllMonList(battIndex);
CKPowerDevBattRtState state = stateService.get(battIndex);
CkpowerdevBattRsalarm rsAlarm = rsAlarmService.get();
--
Gitblit v1.9.1