From 3fac820887b6eae08ec146c85efc9a93cf51a9df Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 18 十月 2023 10:57:25 +0800
Subject: [PATCH] 63
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index f896f42..85150fd 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -706,7 +706,7 @@
return list;
}
- //16,19,30-SubTablePageInfoUtils.java;188琛�
+ //16,19,30锛�61-SubTablePageInfoUtils.java;188琛�
public List getList2(DevAlarmPar param){
String sql=" SELECT history.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,alm_severity, " +
" db_battinf.tb_battinf.stationName,stationName1,stationName2,stationName3,stationName5,db_battinf.tb_battinf.FbsDeviceName as dev_name " +
@@ -853,7 +853,7 @@
return list;
}
- //23-SubTablePageInfoUtils.java;469琛�
+ //23,60-SubTablePageInfoUtils.java;469琛岋紝235琛�
public List<DevalarmDataHistory> getListForInterface_dev(InterfaceParam param){
String sql=" SELECT history.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type, " +
" db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName1,db_battinf.tb_battinf.stationName2,db_battinf.tb_battinf.stationName3," +
@@ -1427,4 +1427,38 @@
" ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8";
sqlExecuteService.execute(sql);
}
+
+ //63-PwrdevTimeAdjAlarmService.java;41琛�
+ public List<PwrdevTimeAdjAlarm> getList_adj(int uId, String alarmParamTableName){
+ String sql=" SELECT adj.num num ,adj.PowerDeviceId PowerDeviceId,alarm_typeId,detect_datetime,record_datetime,alarm_name,StationName " +
+ " FROM db_pwrdev_alarm.tb_pwrdev_time_adj_alarm adj ,db_pwrdev_alarm."+alarmParamTableName+" p2,db_pwrdev_inf.tb_pwrdev_inf inf " +
+ " WHERE adj.alarm_typeId = p2.alarm_id and adj.PowerDeviceId= inf.PowerDeviceId " +
+ " AND adj.PowerDeviceId in ( SELECT DISTINCT devInf.PowerDeviceId " +
+ " FROM db_pwrdev_inf.tb_pwrdev_inf devInf, " +
+ " db_user.tb_user_battgroup_baojigroup_battgroup group1, " +
+ " db_user.tb_user_battgroup_baojigroup_usr groupUser " +
+ " WHERE " +
+ " devInf.StationId = group1.StationId " +
+ " AND group1.baoji_group_id = groupUser.baoji_group_id " +
+ " AND groupUser.uId ="+uId+")";
+ List<PwrdevTimeAdjAlarm> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List<PwrdevTimeAdjAlarm> list=new ArrayList<>();
+ while (rs.next()){
+ PwrdevTimeAdjAlarm ph=new PwrdevTimeAdjAlarm();
+ ph.setNum(rs.getLong("num"));
+ ph.setPowerDeviceId(rs.getLong("PowerDeviceId"));
+ ph.setAlarmTypeid(rs.getInt("alarm_typeId"));
+ ph.setDetectDatetime(rs.getTimestamp("detect_datetime"));
+ ph.setRecordDatetime(rs.getTimestamp("record_datetime"));
+ ph.setAlarmName(rs.getString("alarm_name"));
+ ph.setStationName(rs.getString("StationName"));
+ list.add(ph);
+ }
+ return list;
+ }
+ });
+ return list;
+ }
}
--
Gitblit v1.9.1