From c971825d2a2bc48c74f2ffe97127b50b14445e12 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 09 六月 2025 20:56:16 +0800
Subject: [PATCH] 压入变动的时间列的总电压和电流

---
 src/main/java/com/whyc/service/BattRealTimeDataHistoryService.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/BattRealTimeDataHistoryService.java b/src/main/java/com/whyc/service/BattRealTimeDataHistoryService.java
index 942e066..11b575a 100644
--- a/src/main/java/com/whyc/service/BattRealTimeDataHistoryService.java
+++ b/src/main/java/com/whyc/service/BattRealTimeDataHistoryService.java
@@ -130,6 +130,8 @@
                     his.setMonNum(rs.getInt("mon_num"));
                     his.setMonVol(rs.getFloat("mon_vol"));
                     his.setMonTmp(rs.getFloat("mon_tmp"));
+                    his.setGroupVol(rs.getFloat("group_vol"));
+                    his.setGroupCurr(rs.getFloat("group_curr"));
 
                     list.add(his);
                 }
@@ -154,6 +156,8 @@
                     his.setMonNum(rs.getInt("mon_num"));
                     his.setMonVol(rs.getFloat("mon_vol"));
                     his.setMonTmp(rs.getFloat("mon_tmp"));
+                    his.setGroupVol(rs.getFloat("group_vol"));
+                    his.setGroupCurr(rs.getFloat("group_curr"));
 
                     list.add(his);
                 }
@@ -178,6 +182,8 @@
                     his.setMonNum(rs.getInt("mon_num"));
                     his.setMonVol(rs.getFloat("mon_vol"));
                     his.setMonTmp(rs.getFloat("mon_tmp"));
+                    his.setGroupVol(rs.getFloat("group_vol"));
+                    his.setGroupCurr(rs.getFloat("group_curr"));
 
                     list.add(his);
                 }
@@ -190,7 +196,7 @@
 
     public Date getChargeStartTime(int battGroupId, Date recordTime) {
         String battGroupIdTable = getBattGroupIdTable(battGroupId, recordTime);
-        String sql = "select record_time from db_power_history.tb_batt_realdata_" + battGroupIdTable + " where record_time > '" + recordTime + "' and batt_test_type = 2 order limit 1";
+        String sql = "select record_time from db_power_history.tb_batt_realdata_" + battGroupIdTable + " where record_time > '" + recordTime + "' and batt_test_type = 2 limit 1";
         List<Date> timeList = sqlExecuteService.executeQuery_call(sql, new CallBack() {
 
             @Override
@@ -223,6 +229,8 @@
                     his.setMonNum(rs.getInt("mon_num"));
                     his.setMonVol(rs.getFloat("mon_vol"));
                     his.setMonTmp(rs.getFloat("mon_tmp"));
+                    his.setGroupVol(rs.getFloat("group_vol"));
+                    his.setGroupCurr(rs.getFloat("group_curr"));
 
                     list.add(his);
                 }

--
Gitblit v1.9.1