From d61a41cffb4a70aa3bef833bf12542016d1cce36 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 08:54:12 +0800
Subject: [PATCH] 预警分析管理-电源告警

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

diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index ee97944..0a32904 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -828,11 +828,11 @@
 
     //鐢垫簮鏁版嵁鍘嗗彶瀹炴椂澶勭悊(棰勮鍒嗘瀽)
     public List<PwrdevHistorydataId> getPwrHisRealInAlm(PwrdevHistorydataId pwrHis) {
-        String sql=" select record_time, group_vol, online_vol,group_curr, mon_vol, mon_tmp, mon_res, mon_num,record_num  " +
-                "               from db_data_history.tb_batt_realdata_"+pwrHis.getTableName()+" " +
-                "               where record_time >= '"+ThreadLocalUtil.format(pwrHis.getRecordDatetime(),1)+"' " +
-                "               and record_time <= '"+ThreadLocalUtil.format(pwrHis.getRecordDatetime1(),1)+"' " +
-                "               order by record_time asc,mon_num asc";
+        String sql=" select *  " +
+                "               from db_data_history.tb_pwrdev_historydata_"+pwrHis.getTableName()+" " +
+                "               where record_datetime >= '"+ThreadLocalUtil.format(pwrHis.getRecordDatetime(),1)+"' " +
+                "               and record_datetime <= '"+ThreadLocalUtil.format(pwrHis.getRecordDatetime1(),1)+"' " +
+                "               order by record_datetime asc ";
         List<PwrdevHistorydataId> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
             @Override
             public List getResults(ResultSet rs) throws SQLException {

--
Gitblit v1.9.1