From 82d3504d93db29e2b04ed1137e541a19e0cba0f1 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 23 六月 2025 09:08:14 +0800
Subject: [PATCH] 预警分析管理
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 473555c..23f6ad1 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -627,13 +627,11 @@
return list;
}
- public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity,String halfHourAgoTime) {
+ public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity,Date recordDatetime,Date recordDatetime1) {
String sql="select distinct * " +
- "from (select a.*, (@i:= @i+1) as number " +
- " from (select * from "+tableName+" "+
- " where record_datetime>='"+halfHourAgoTime+"') a, " +
- " (select @i:=0) b) c "+
- " where c.number%"+granularity+"=0 or c.number=1 ";
+ " from "+tableName+" where record_datetime>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
+ " and record_datetime<='"+ActionUtil.sdf.format(recordDatetime1)+
+ "' and record_num%"+granularity+"=0 or record_num=1 or record_num=100 ";
sql+=" order by record_datetime asc";
List<PwrHisRealDcoutInDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
@@ -799,7 +797,7 @@
return list;
}
//鐢垫睜鏁版嵁鍘嗗彶瀹炴椂澶勭悊(棰勮鍒嗘瀽)
- public List<ResAnalysis> getBattHisRealInAlm(BattRealdataId realdata, Map<String,Integer> battMap) {
+ public List<ResAnalysis> getBattHisRealInAlm(BattRealdataId realdata, Map<String,Object> battMap) {
String result = String.join(",", battMap.keySet());
String sql=" select record_time,"+result+" " +
" from db_data_history.tb_batt_realdata_"+realdata.getTableName()+" " +
@@ -815,7 +813,7 @@
ph.setRecordTime(rs.getTimestamp("record_time"));
int i=1;
for (String key : battMap.keySet()) {
- Integer dataType = battMap.get(key);
+ Integer dataType = (Integer) battMap.get(key);
try {
String propertyType = "dataType"+(i);
Field fieldType = ResAnalysis.class.getDeclaredField(propertyType);
@@ -848,7 +846,7 @@
}
//鐢垫簮鏁版嵁鍘嗗彶瀹炴椂澶勭悊(棰勮鍒嗘瀽)
- public List<ResAnalysis> getPwrHisRealInAlm(PwrdevHistorydataId pwrHis, Map<String,Integer> pwrMap) {
+ public List<ResAnalysis> getPwrHisRealInAlm(PwrdevHistorydataId pwrHis, Map<String,Object> pwrMap) {
String result = String.join(",", pwrMap.keySet());
String sql=" select record_datetime,"+result+" " +
" from db_data_history.tb_pwrdev_historydata_"+pwrHis.getTableName()+" " +
@@ -864,7 +862,7 @@
ph.setRecordTime(rs.getTimestamp("record_datetime"));
int i=1;
for (String key : pwrMap.keySet()) {
- Integer dataType = pwrMap.get(key);
+ Integer dataType = (Integer) pwrMap.get(key);
try {
String propertyType = "dataType"+(i);
Field fieldType = ResAnalysis.class.getDeclaredField(propertyType);
--
Gitblit v1.9.1