From f998f917f90d86499bf8a24c8912e270655e4d43 Mon Sep 17 00:00:00 2001 From: whyclxw <810412026@qq.com> Date: 星期二, 24 六月 2025 17:27:57 +0800 Subject: [PATCH] 预警分析修改 --- src/main/java/com/whyc/service/SubTablePageInfoService.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java index ff2d302..d2fced7 100644 --- a/src/main/java/com/whyc/service/SubTablePageInfoService.java +++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java @@ -5,6 +5,8 @@ import com.whyc.dto.AlmHis.PwrAlmPar; import com.whyc.dto.AnalysisAlm.ResAnalysis; import com.whyc.dto.Real.*; +import com.whyc.dto.Statistic.ComPareChangeCurve; +import com.whyc.dto.Statistic.ComPareChart; import com.whyc.dto.Statistic.QuarterPwr7Res; import com.whyc.mapper.CallBack; import com.whyc.pojo.db_alarm.BattalarmDataHistory; @@ -518,7 +520,7 @@ } //鑾峰彇鍐呴樆鏁版嵁 public List<QuarterDto> getBattResInfData(Integer battgroupId,Integer testRecordCount) { - String sql="select distinct mon_num,test_starttime,mon_res, from db_batt_testdata.tb_battresdata_"+battgroupId + String sql="select distinct mon_num,test_starttime,mon_res from db_batt_testdata.tb_battresdata_"+battgroupId +" where test_record_count="+testRecordCount+" order by mon_num asc"; List<QuarterDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() { @Override @@ -536,6 +538,50 @@ }); return list; } + //鍙栧唴闃绘祴璇曠殑鏈�澶у唴闃诲拰鍗曚綋缂栧彿 + public List<QuarterDto> getMaxResInInfData(Integer battgroupId, Integer testRecordCount) { + String sql="select distinct mon_num,test_starttime,mon_res from db_batt_testdata.tb_battresdata_"+battgroupId + +" where test_record_count="+testRecordCount+" order by mon_num asc"; + List<QuarterDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() { + @Override + public List getResults(ResultSet rs) throws SQLException { + List<QuarterDto> list=new ArrayList<>(); + while (rs.next()){ + QuarterDto data=new QuarterDto(); + data.setMonNum(rs.getInt("mon_num")); + data.setNumValue(rs.getFloat("mon_res")); + data.setRecordTime(rs.getTimestamp("test_starttime")); + list.add(data); + } + return list; + } + }); + return list; + } + //鍙栧唴闃绘祴璇曟寚瀹氬崟浣撶殑鍗曚綋鐢靛帇 + public ComPareChangeCurve getMonResChangeByBattgroupId(Integer battgroupId, Integer testRecordCount, Integer monNum) { + String sql="select distinct battgroup_id,mon_num,test_starttime,mon_res from db_batt_testdata.tb_battresdata_"+battgroupId + +" where test_record_count="+testRecordCount+" and monNum="+monNum; + List<ComPareChangeCurve> list = sqlExecuteService.executeQuery_call(sql, new CallBack() { + @Override + public List getResults(ResultSet rs) throws SQLException { + List<ComPareChangeCurve> list=new ArrayList<>(); + while (rs.next()){ + ComPareChangeCurve data=new ComPareChangeCurve(); + data.setMonNum(rs.getInt("mon_num")); + data.setCurveValue(rs.getFloat("mon_res")); + data.setStartTime(rs.getTimestamp("test_starttime")); + data.setBattgroupId(rs.getInt("battgroup_id")); + list.add(data); + } + return list; + } + }); + if(list!=null&&list.size()>0){ + return list.get(0); + } + return null; + } //鎵捐繖娆℃斁鐢电殑鎸囧畾涓�绗旀暟鎹� public List<BatttestdataId> getLastDataByBattgroupId(Integer battgroupId, Integer testRecordCount, Integer recordNum) { String sql="select distinct * from db_batt_testdata.tb_batttestdata_"+battgroupId -- Gitblit v1.9.1