From d1b97b2eebbc4b928a321a29a7ee50197b7471d0 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 14 十二月 2023 08:47:50 +0800
Subject: [PATCH] 断路器告警历史查询
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index a16c23f..c3c189f 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -131,8 +131,8 @@
//鏌ヨbreak鍘嗗彶鍛婅鏁伴噺
public int getCountForBreakAlm(BreakAlarmDto alm) {
- String sql="select count(distinct num) as number from db_ckpwrdev_break_alarm." +alm.getRecordYear()+",db_ckpwrdev_break_alarm.tb_ckpowerdev_break_alarm_config,db_ckpwrdev_inf.tb_breaker_inf"
- +" where tb_ckpowerdev_break_alarm.alm_id=tb_ckpowerdev_break_alarm_config.alm_id " +
+ String sql="select count(distinct breakAlarm.num) as number from db_ckpwrdev_break_alarm." +alm.getRecordYear()+" breakAlarm ,db_ckpwrdev_break_alarm.tb_ckpowerdev_break_alarm_config,db_ckpwrdev_inf.tb_breaker_inf"
+ +" where breakAlarm.alm_id=tb_ckpowerdev_break_alarm_config.alm_id " +
" and tb_ckpowerdev_break_alarm_config.break_id=tb_breaker_inf.breaker_id ";
if(alm.getAlmStarttime()!=null){
sql+=" and alm_starttime >='"+ DateUtil.format_YYYY_MM_DD_HH_MM_SS(alm.getAlmStarttime())+"' ";
@@ -141,13 +141,13 @@
sql+=" and alm_endtime <='"+DateUtil.format_YYYY_MM_DD_HH_MM_SS(alm.getAlmEndTime())+"' ";
}
if(alm.getAlmName()!=null){
- sql+=" and tb_ckpowerdev_break_alarm.alm_name="+alm.getAlmName();
+ sql+=" and breakAlarm.alm_name='"+alm.getAlmName()+"'";
}
if(alm.getBreakerType()!=null){
- sql+=" and tb_breaker_inf.breaker_type=="+alm.getBreakerType();
+ sql+=" and tb_breaker_inf.breaker_type='"+alm.getBreakerType()+"'";
}
if(alm.getBreakerName()!=null){
- sql+=" and tb_breaker_inf.breaker_name=="+alm.getBreakerName();
+ sql+=" and tb_breaker_inf.breaker_name='"+alm.getBreakerName()+"'";
}
List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
@@ -171,8 +171,8 @@
//鏌ヨbreak鍘嗗彶鍛婅鏁伴噺
public List getListBreakAlm(BreakAlarmDto alm){
- String sql="select * from db_ckpwrdev_break_alarm." +alm.getRecordYear()+",db_ckpwrdev_break_alarm.tb_ckpowerdev_break_alarm_config,db_ckpwrdev_inf.tb_breaker_inf"
- +" where tb_ckpowerdev_break_alarm.alm_id=tb_ckpowerdev_break_alarm_config.alm_id " +
+ String sql="select breakAlarm.* from db_ckpwrdev_break_alarm." +alm.getRecordYear()+" breakAlarm,db_ckpwrdev_break_alarm.tb_ckpowerdev_break_alarm_config,db_ckpwrdev_inf.tb_breaker_inf"
+ +" where breakAlarm.alm_id=tb_ckpowerdev_break_alarm_config.alm_id " +
" and tb_ckpowerdev_break_alarm_config.break_id=tb_breaker_inf.breaker_id ";
if(alm.getAlmStarttime()!=null){
sql+=" and alm_starttime >='"+ DateUtil.format_YYYY_MM_DD_HH_MM_SS(alm.getAlmStarttime())+"' ";
@@ -181,13 +181,13 @@
sql+=" and alm_endtime <='"+DateUtil.format_YYYY_MM_DD_HH_MM_SS(alm.getAlmEndTime())+"' ";
}
if(alm.getAlmName()!=null){
- sql+=" and tb_ckpowerdev_break_alarm.alm_name="+alm.getAlmName();
+ sql+=" and breakAlarm.alm_name='"+alm.getAlmName()+"'";
}
if(alm.getBreakerType()!=null){
- sql+=" and tb_breaker_inf.breaker_type=="+alm.getBreakerType();
+ sql+=" and tb_breaker_inf.breaker_type='"+alm.getBreakerType()+"'";
}
if(alm.getBreakerName()!=null){
- sql+=" and tb_breaker_inf.breaker_name=="+alm.getBreakerName();
+ sql+=" and tb_breaker_inf.breaker_name='"+alm.getBreakerName()+"'";
}
sql+=" ORDER BY alm_starttime desc limit "+alm.getLimitStart()+","+alm.getLimitEnd()+" ";
List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
--
Gitblit v1.9.1