From d3281891af5bf8e5069cb15b1f9c1d6a14c212c6 Mon Sep 17 00:00:00 2001 From: 星伟 <星伟@192.168.10.25> Date: 星期四, 27 九月 2018 17:30:00 +0800 Subject: [PATCH] 设备告警参数修改 --- gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java index 49bc6fd..3fa940f 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java @@ -447,7 +447,7 @@ + " from db_alarm.tb_battalarm_data,db_battinf.tb_battinf " + " where alm_id in(?,?,?,?,?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " + " and alm_level in(?,?,?,?) and alm_cleared_type=0 " + - " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? "; + " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?"; //鐢ㄤ簬鐢垫睜缁勬潯浠� String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid ";//鍏ㄩ儴 String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid "; @@ -492,6 +492,7 @@ "%"+binf.getStationName1()+"%", "%"+binf.getStationName()+"%", + "%"+binf.getStationName2()+"%", binf.getBattGroupId(), uinf.getUId(), @@ -759,7 +760,7 @@ " where alm_id in(?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " + " and alm_level in(?,?,?,?) " + " and alm_start_time>=? and alm_start_time<=? " + - " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? "; + " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?"; //鐢ㄤ簬瀹炴椂鍛婅 String almSqlT="and alm_cleared_type=? "; //鍘嗗彶鍛婅 @@ -817,6 +818,7 @@ adata.getAlm_start_time1(), "%"+binf.getStationName1()+"%", "%"+binf.getStationName()+"%", + "%"+binf.getStationName2()+"%", adata.getAlm_cleared_type(), -- Gitblit v1.9.1