From 3470b33466cfd9ce423a46220ff81f734fae9fb7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 11:32:34 +0800
Subject: [PATCH] 预警分析管理-主属性和配置属性

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

diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 0a32904..e126ffe 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -3,6 +3,7 @@
 import com.whyc.dto.AlmHis.BattAlmPar;
 import com.whyc.dto.AlmHis.DevAlmPar;
 import com.whyc.dto.AlmHis.PwrAlmPar;
+import com.whyc.dto.AnalysisAlm.ResAnalysis;
 import com.whyc.dto.Real.*;
 import com.whyc.dto.Statistic.QuarterPwr7Res;
 import com.whyc.mapper.CallBack;
@@ -16,9 +17,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Field;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class SubTablePageInfoService {
@@ -797,27 +800,38 @@
         return list;
     }
     //鐢垫睜鏁版嵁鍘嗗彶瀹炴椂澶勭悊(棰勮鍒嗘瀽)
-    public List<RealDateDTO> getBattHisRealInAlm(BattRealdataId realdata) {
-        String sql=" select record_time, group_vol, online_vol,group_curr, mon_vol, mon_tmp, mon_res, mon_num,record_num  " +
+    public List<ResAnalysis> getBattHisRealInAlm(BattRealdataId realdata, List<String> battList) {
+        String result = battList.stream().collect(Collectors.joining(","));
+        String sql=" select record_time,"+result+" " +
                 "               from db_data_history.tb_batt_realdata_"+realdata.getTableName()+" " +
                 "               where record_time >= '"+ThreadLocalUtil.format(realdata.getRecordTime(),1)+"' " +
                 "               and record_time <= '"+ThreadLocalUtil.format(realdata.getRecordTime1(),1)+"' " +
                 "               order by record_time asc,mon_num asc";
-        List<RealDateDTO> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+        List<ResAnalysis> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
             @Override
             public List getResults(ResultSet rs) throws SQLException {
-                List<RealDateDTO> list=new ArrayList<>();
+                List<ResAnalysis> list=new ArrayList<>();
                 while (rs.next()){
-                    RealDateDTO ph=new RealDateDTO();
+                    ResAnalysis ph=new ResAnalysis();
                     ph.setRecordTime(rs.getTimestamp("record_time"));
-                    ph.setGroupVol(rs.getFloat("group_vol"));
-                    ph.setOnlineVol(rs.getFloat("online_vol"));
-                    ph.setGroupCurr(rs.getFloat("group_curr"));
-                    ph.setMonVol(rs.getFloat("mon_vol"));
-                    ph.setMonTmp(rs.getFloat("mon_tmp"));
-                    ph.setMonRes(rs.getFloat("mon_res"));
-                    ph.setMonNum(rs.getInt("mon_num"));
-                    ph.setRecordNum(rs.getInt("record_num"));
+                    for (int i=0;i<battList.size();i++){
+                        try {
+                            Float value = rs.getFloat(battList.get(i));
+                            String propertyName = "dataName"+(i+1);
+                            Field fieldName = ResAnalysis.class.getDeclaredField(propertyName);
+                            fieldName.setAccessible(true); // 濡傛灉瀛楁鏄鏈夌殑锛岄渶瑕佽缃负鍙闂�
+                            fieldName.set(ph,battList.get(i));
+
+                            String propertyValue = "dataValue"+(i+1);
+                            Field fieldValue = ResAnalysis.class.getDeclaredField(propertyValue);
+                            fieldValue.setAccessible(true);
+                            fieldValue.set(ph,value);
+                        } catch (NoSuchFieldException e) {
+                            e.printStackTrace();
+                        } catch (IllegalAccessException e) {
+                            e.printStackTrace();
+                        }
+                    }
                     list.add(ph);
                 }
                 return list;
@@ -827,105 +841,39 @@
     }
 
     //鐢垫簮鏁版嵁鍘嗗彶瀹炴椂澶勭悊(棰勮鍒嗘瀽)
-    public List<PwrdevHistorydataId> getPwrHisRealInAlm(PwrdevHistorydataId pwrHis) {
-        String sql=" select *  " +
+    public List<ResAnalysis> getPwrHisRealInAlm(PwrdevHistorydataId pwrHis, List<String> pwrList) {
+        String result = pwrList.stream().collect(Collectors.joining(","));
+        String sql=" select record_datetime,"+result+"  " +
                 "               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() {
+        List<ResAnalysis> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
             @Override
             public List getResults(ResultSet rs) throws SQLException {
-                List<PwrdevHistorydataId> list=new ArrayList<>();
+                List<ResAnalysis> list=new ArrayList<>();
                 while (rs.next()){
-                    PwrdevHistorydataId data=new PwrdevHistorydataId();
-                    data.setRecordDatetime(rs.getTimestamp("record_datetime"));
-                    data.setAcin1Vola(rs.getFloat("acin1_vola"));
-                    data.setAcin1Volb(rs.getFloat("acin1_volb"));
-                    data.setAcin1Volc(rs.getFloat("acin1_volc"));
-                    data.setAcin2Vola(rs.getFloat("acin2_vola"));
-                    data.setAcin2Volb(rs.getFloat("acin2_volb"));
-                    data.setAcin2Volc(rs.getFloat("acin2_volc"));
-                    data.setAcoutVola(rs.getFloat("acout_vola"));
-                    data.setAcoutVolb(rs.getFloat("acout_volb"));
-                    data.setAcoutVolc(rs.getFloat("acout_volc"));
-                    data.setAcoutCurra(rs.getFloat("acout_curra"));
-                    data.setAcoutCurrb(rs.getFloat("acout_currb"));
-                    data.setAcoutCurrc(rs.getFloat("acout_currc"));
-                    data.setDcoutVol(rs.getFloat("dcout_vol"));
-                    data.setDcoutCurr(rs.getFloat("dcout_curr"));
+                    ResAnalysis ph=new ResAnalysis();
+                    ph.setRecordTime(rs.getTimestamp("record_datetime"));
+                    for (int i=0;i<pwrList.size();i++){
+                        try {
+                            Float value = rs.getFloat(pwrList.get(i));
+                            String propertyName = "dataName"+(i+1);
+                            Field fieldName = ResAnalysis.class.getDeclaredField(propertyName);
+                            fieldName.setAccessible(true); // 濡傛灉瀛楁鏄鏈夌殑锛岄渶瑕佽缃负鍙闂�
+                            fieldName.set(ph,pwrList.get(i));
 
-                    data.setBattgroup1Vol(rs.getFloat("battgroup1_vol"));
-                    data.setBattgroup1Curr(rs.getFloat("battgroup1_curr"));
-                    data.setBattgroup2Vol(rs.getFloat("battgroup2_vol"));
-                    data.setBattgroup2Curr(rs.getFloat("battgroup2_curr"));
-                    data.setTemprature(rs.getFloat("temprature"));
-                    data.setMOutputvol(rs.getFloat("m_outputvol"));
-                    data.setM1Outcurr(rs.getFloat("m1_outcurr"));
-                    data.setM2Outcurr(rs.getFloat("m2_outcurr"));
-                    data.setM3Outcurr(rs.getFloat("m3_outcurr"));
-                    data.setM4Outcurr(rs.getFloat("m4_outcurr"));
-                    data.setM5Outcurr(rs.getFloat("m5_outcurr"));
-                    data.setM6Outcurr(rs.getFloat("m6_outcurr"));
-                    data.setM7Outcurr(rs.getFloat("m7_outcurr"));
-                    data.setM8Outcurr(rs.getFloat("m8_outcurr"));
-                    data.setM9Outcurr(rs.getFloat("m9_outcurr"));
-                    data.setM10Outcurr(rs.getFloat("m10_outcurr"));
-                    data.setM11Outcurr(rs.getFloat("m11_outcurr"));
-                    data.setM12Outcurr(rs.getFloat("m12_outcurr"));
-                    data.setM13Outcurr(rs.getFloat("m13_outcurr"));
-                    data.setM14Outcurr(rs.getFloat("m14_outcurr"));
-                    data.setM15Outcurr(rs.getFloat("m15_outcurr"));
-                    data.setM16Outcurr(rs.getFloat("m16_outcurr"));
-
-                    data.setAcin1Curra(rs.getFloat("acin1_curra"));
-                    data.setAcin1Currb(rs.getFloat("acin1_currb"));
-                    data.setAcin1Currc(rs.getFloat("acin1_currc"));
-                    data.setLoaderCurr(rs.getFloat("loader_curr"));
-                    data.setBattgroup1Ah(rs.getFloat("battgroup1_ah"));
-                    data.setBattgroup1Temp(rs.getFloat("battgroup1_temp"));
-                    data.setBattgroup2Ah(rs.getFloat("battgroup2_ah"));
-                    data.setBattgroup2Temp(rs.getFloat("battgroup2_temp"));
-                    data.setAcdcmTemp(rs.getFloat("acdcm_temp"));
-                    data.setM1OutVol(rs.getFloat("m1_out_vol"));
-                    data.setM2OutVol(rs.getFloat("m2_out_vol"));
-                    data.setM3OutVol(rs.getFloat("m3_out_vol"));
-                    data.setM4OutVol(rs.getFloat("m4_out_vol"));
-                    data.setM5OutVol(rs.getFloat("m5_out_vol"));
-                    data.setM6OutVol(rs.getFloat("m6_out_vol"));
-                    data.setM7OutVol(rs.getFloat("m7_out_vol"));
-                    data.setM8OutVol(rs.getFloat("m8_out_vol"));
-                    data.setM9OutVol(rs.getFloat("m9_out_vol"));
-                    data.setM10OutVol(rs.getFloat("m10_out_vol"));
-                    data.setM11OutVol(rs.getFloat("m11_out_vol"));
-                    data.setM12OutVol(rs.getFloat("m12_out_vol"));
-                    data.setM13OutVol(rs.getFloat("m13_out_vol"));
-                    data.setM14OutVol(rs.getFloat("m14_out_vol"));
-                    data.setM15OutVol(rs.getFloat("m15_out_vol"));
-                    data.setM16OutVol(rs.getFloat("m16_out_vol"));
-
-                    data.setUseracin1Vola(rs.getFloat("useracin1_vola"));
-                    data.setUseracin1Volb(rs.getFloat("useracin1_volb"));
-                    data.setUseracin1Volc(rs.getFloat("useracin1_volc"));
-                    data.setUseracin1Curra(rs.getFloat("useracin1_curra"));
-                    data.setUseracin1Currb(rs.getFloat("useracin1_currb"));
-                    data.setUseracin1Currc(rs.getFloat("useracin1_currc"));
-                    data.setUseracin1Freq(rs.getFloat("useracin1_freq"));
-                    data.setUseracin2Vola(rs.getFloat("useracin2_vola"));
-                    data.setUseracin2Volb(rs.getFloat("useracin2_volb"));
-                    data.setUseracin2Volc(rs.getFloat("useracin2_volc"));
-                    data.setUseracin2Curra(rs.getFloat("useracin2_curra"));
-                    data.setUseracin2Currb(rs.getFloat("useracin2_currb"));
-                    data.setUseracin2Currc(rs.getFloat("useracin2_currc"));
-                    data.setUseracin2Freq(rs.getFloat("useracin2_freq"));
-
-                    data.setMTemper1(rs.getFloat("m_temper1"));
-                    data.setMTemper2(rs.getFloat("m_temper2"));
-                    data.setMTemper3(rs.getFloat("m_temper3"));
-                    data.setMHumidity1(rs.getFloat("m_humidity1"));
-                    data.setMHumidity2(rs.getFloat("m_humidity2"));
-                    data.setMHumidity3(rs.getFloat("m_humidity3"));
-                    list.add(data);
+                            String propertyValue = "dataValue"+(i+1);
+                            Field fieldValue = ResAnalysis.class.getDeclaredField(propertyValue);
+                            fieldValue.setAccessible(true);
+                            fieldValue.set(ph,value);
+                        } catch (NoSuchFieldException e) {
+                            e.printStackTrace();
+                        } catch (IllegalAccessException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    list.add(ph);
                 }
                 return list;
             }

--
Gitblit v1.9.1