From 350ad51d45f4a25f4d7ecbad8bbfb420f56708c6 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 08 四月 2025 14:40:54 +0800
Subject: [PATCH] 更新电池告警及历史接口

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

diff --git a/src/main/java/com/whyc/service/SubTableService.java b/src/main/java/com/whyc/service/SubTableService.java
index 4a66f0f..4cc80c6 100644
--- a/src/main/java/com/whyc/service/SubTableService.java
+++ b/src/main/java/com/whyc/service/SubTableService.java
@@ -23,9 +23,9 @@
     @Autowired
     private MybatisSqlExecuteService sqlExecuteService;
     //鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�
-    public List<BattTestInfData> getTDataHis(int binfId, int testRecordCount) {
-        String sql="select * from db_dis_batt.batt_test_inf_"+binfId+" " +
-                " where binf_id="+binfId+" " +
+    public List<BattTestInfData> getByBattGroupIdAndTestRecordCount(int battGroupId, int testRecordCount) {
+        String sql="select * from db_dis_batt.batt_test_inf_"+battGroupId+" " +
+                " where binf_id="+battGroupId+" " +
                 " and test_record_count="+testRecordCount+
                 " order by test_starttime asc ";
         List<BattTestInfData> list=sqlExecuteService.executeQuery_call(sql, new CallBack() {
@@ -115,6 +115,9 @@
                     data.setAlmId(rs.getInt("alm_id"));
                     data.setAlmLevel(rs.getInt("alm_level"));
                     data.setAlmValue(rs.getInt("alm_value"));
+                    data.setAlmConfirm(rs.getInt("alm_confirm"));
+                    data.setAlmConfirmTime(rs.getTimestamp("alm_confirm_time"));
+                    data.setAlmType(rs.getInt("alm_type"));
                     data.setPowerName(rs.getString("power_name"));
                     data.setBattGroupName(rs.getString("battGroupName"));
                     list.add(data);

--
Gitblit v1.9.1