From 392dfa84e5ecfe24f7cc00c41685c1d2921a93bf Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 17 十月 2023 17:01:07 +0800
Subject: [PATCH] 40
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 1dc035f..1058df2 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -621,7 +621,7 @@
return num;
}
- //13,14,17-SubTablePageInfoUtils.java;88琛�
+ //13,14,17,36-SubTablePageInfoUtils.java;88琛�
public int getCount(DevAlarmPar param){
String sql="SELECT count(distinct history.num) as number FROM db_alarm."+param.getRecordYear()+" history,db_battinf.tb_battinf " +
" where history.dev_id=db_battinf.tb_battinf.FbsDeviceId ";
@@ -1085,7 +1085,7 @@
return num;
}
- //35-SubTablePageInfoUtils.java;176琛�
+ //35,38-SubTablePageInfoUtils.java;176琛�
public List<AlarmRes> getList2(AlarmPar param){
String sql="select history.BattGroupId,history.num,alm_signal_id,history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time " +
" ,alm_severity,stationname,StationName1,StationName2,StationName3,StationName5,battgroupname " +
@@ -1164,4 +1164,34 @@
});
return list;
}
+
+ //40-BattmonTestcapService.java;50琛�
+ List<BattmonTestcap> getTestCapList(BattmonStandardcurve curve){
+ String sql="select monvolstd,moncapstd,battproducer,battmodel,test_cap,ROUND(avg(mon_vol),3) as mon_vol from " +
+ " `db_battinf`.`tb_battmon_testcap_"+curve.getMonVolStd()+"_"+curve.getMonCapStd()+"_"+curve.getNote()+"` " +
+ " where monvolstd= "+curve.getMonVolStd()+" " +
+ " and moncapstd="+curve.getMonCapStd()+" " +
+ " and battproducer='"+curve.getBattproducer()+"' " +
+ " and battmodel='"+curve.getBattmodel()+"' " +
+ " group by test_cap " +
+ " order by num";
+ List<BattmonTestcap> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List<BattmonTestcap> list=new ArrayList<>();
+ while (rs.next()){
+ BattmonTestcap ph=new BattmonTestcap();
+ ph.setMonvolstd(rs.getFloat("monvolstd"));
+ ph.setMoncapstd(rs.getFloat("moncapstd"));
+ ph.setBattproducer(rs.getString("battproducer"));
+ ph.setBattmodel(rs.getString("battmodel"));
+ ph.setTestCap(rs.getDouble("test_cap"));
+ ph.setMonVol(rs.getDouble("mon_vol"));
+ list.add(ph);
+ }
+ return list;
+ }
+ });
+ return list;
+ }
}
--
Gitblit v1.9.1