81041
2018-11-03 c85e677271d7d32efcb3c9ebeeac67b80fb2904d
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
@@ -550,7 +550,7 @@
       String sql="select distinct db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_type,alm_start_time " +
             "  from db_alarm.tb_devalarm_data,db_battinf.tb_battinf" +
             "  where alm_cleared_type=0 " +
             "  and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid " +
             "  and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid and tb_battinf.station_install=1 " +
             "  and  db_alarm.tb_devalarm_data.dev_id  in (select distinct db_battinf.tb_battinf.FbsDeviceId " +
            " from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
            " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
@@ -596,7 +596,7 @@
       String sql="select distinct db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_type,alm_start_time " +
             "  from db_alarm.tb_devalarm_data,db_battinf.tb_battinf" +
             "  where alm_cleared_type=0 " +
             "  and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid " +
             "  and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid and tb_battinf.station_install=1 " +
             "  and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<"+AlarmDaoFactory.alarm_voice_timelong ;
       //用户管理
      String userSql=" and tb_battinf.StationId in(" +
@@ -641,7 +641,7 @@
       Batt_devalarm_data ddata=(Batt_devalarm_data) obj;
       String sql="select distinct db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_type,alm_start_time,alm_cleared_type " +
             "  from db_alarm.tb_devalarm_data,db_battinf.tb_battinf " +
             "  where db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid" +
             "  where db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid and tb_battinf.station_install=1 " +
             "  and  db_alarm.tb_devalarm_data.dev_id=? and alm_type=? and alm_start_time=? ";
       List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{ddata.getDev_id(),ddata.getAlm_type(),ddata.getAlm_start_time()}, new CallBack() {