From 6c13a67934178804ba4845ed821a07145e679a0e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 29 五月 2025 11:25:58 +0800
Subject: [PATCH] 电压上一季度历史实时

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

diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 99d43ed..0913427 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -1,14 +1,13 @@
 package com.whyc.service;
 
-import com.whyc.dto.AlmHis.BattAlarmRes;
 import com.whyc.dto.AlmHis.BattAlmPar;
 import com.whyc.dto.AlmHis.DevAlmPar;
 import com.whyc.dto.AlmHis.PwrAlmPar;
-import com.whyc.dto.Real.QuarterData;
+import com.whyc.dto.Real.CompareDto;
+import com.whyc.dto.Real.QuarterDto;
 import com.whyc.mapper.CallBack;
 import com.whyc.pojo.db_alarm.BattalarmDataHistory;
 import com.whyc.pojo.db_alarm.DevalarmDataHistory;
-import com.whyc.pojo.db_data_history.BattRealdataId;
 import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmHistory;
 import com.whyc.util.ThreadLocalUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -468,14 +467,14 @@
         return  list;
     }
     //鑾峰彇鐢垫睜缁勬煇涓�骞存湀鐨勬暟鎹�
-    public List<QuarterData> getBattRealHis(String tableName,String columnName) {
+    public List<QuarterDto> getBattRealHis(String tableName, String columnName) {
         String sql="select  distinct mon_num,record_time,"+columnName+"  from "+tableName+" order by record_time asc";
-        List<QuarterData> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+        List<QuarterDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
             @Override
             public List getResults(ResultSet rs) throws SQLException {
-                List<QuarterData> list=new ArrayList<>();
+                List<QuarterDto> list=new ArrayList<>();
                 while (rs.next()){
-                    QuarterData data=new QuarterData();
+                    QuarterDto data=new QuarterDto();
                     data.setRecordTime(rs.getTimestamp("record_time"));
                     data.setNumValue(rs.getFloat(columnName));
                     data.setMonNum(rs.getInt("mon_num"));
@@ -486,4 +485,27 @@
         });
         return list;
     }
+    //鑾峰彇琛ㄤ腑鏈�澶э紝鏈�灏忥紝骞冲潎鏁版嵁鍊�
+    public CompareDto getBattCompareHis(String tableName, String columnName) {
+        String sql="select  max("+columnName+") as maxValue1,min("+columnName+") as minValue,avg("+columnName+") as avgValue"+"  from "+tableName;
+        List<CompareDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+            @Override
+            public List getResults(ResultSet rs) throws SQLException {
+                List<CompareDto> list=new ArrayList<>();
+                while (rs.next()){
+                    CompareDto data=new CompareDto();
+                    data.setMaxValue(rs.getFloat("maxValue1"));
+                    data.setMinValue(rs.getFloat("minValue"));
+                    data.setAvgValue(rs.getFloat("avgValue"));
+                    list.add(data);
+                }
+                return list;
+            }
+        });
+        if(list!=null&&list.size()>0){
+            return list.get(0);
+        }else {
+            return null;
+        }
+    }
 }

--
Gitblit v1.9.1