81041
2018-11-02 2383e6ae0913698f4de001c2dd91641967549985
电池告警实时和设备告警实时筛选出未安装的
2个文件已修改
20 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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() {
            
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -449,8 +449,8 @@
                     "  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.stationname2 like ? and db_battinf.tb_battinf.stationname5 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 ";
            String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid and tb_battinf.station_install=1";//全部
            String idSqlF=" and db_battinf.tb_battinf.battgroupid=?  and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid and tb_battinf.station_install=1 ";
            if(binf.getBattGroupId()==0){
                baseSql+=idSqlT;
            }else{
@@ -1375,7 +1375,7 @@
                " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
                " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
                " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
                " and db_user.tb_user_inf.uid=?  )";
                " and db_user.tb_user_inf.uid=?  and tb_battinf.station_install=1 )";
        //System.out.println(sql);
       List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
            
@@ -1526,7 +1526,7 @@
        BattMap_information binformation=(BattMap_information) obj;
        String sql="select count(num) as nums  from db_alarm.tb_battalarm_data " +
                "where " +
                "battgroupid in (select distinct battgroupid from db_battinf.tb_battinf where stationid=? ) " +
                "battgroupid in (select distinct battgroupid from db_battinf.tb_battinf where stationid=? and tb_battinf.station_install=1) " +
                "and alm_cleared_type=0 and alm_id not in("+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+") limit 1 ";
        //System.out.println(sql);
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binformation.getStationId()}, new CallBack() {
@@ -1775,7 +1775,7 @@
        String sql="select distinct db_alarm.tb_battalarm_data.battgroupid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_alarm.tb_battalarm_data.monnum,alm_id,alm_start_time,alm_signal_id " +
                "  from db_alarm.tb_battalarm_data,db_battinf.tb_battinf " +
                "  where alm_cleared_type=0  " +
                "  and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid " +
                "  and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid  and tb_battinf.station_install=1" +
                "  and db_alarm.tb_battalarm_data.BattGroupId  in (select distinct db_battinf.tb_battinf.battgroupid " +
                " 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   " +
@@ -1822,7 +1822,7 @@
        String sql="select distinct db_alarm.tb_battalarm_data.battgroupid,db_battinf.tb_battinf.stationId,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_alarm.tb_battalarm_data.monnum,alm_id,alm_start_time,alm_signal_id " +
                "  from db_alarm.tb_battalarm_data,db_battinf.tb_battinf " +
                "  where alm_cleared_type=0  " +
                "  and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid " +
                "  and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid  and tb_battinf.station_install=1 " +
                "  and alm_id not in("+AlarmDaoFactory.Alarm_vol_Online+","+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+","+AlarmDaoFactory.Alarm_res_Conn+","+AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID+")  " +
                "  and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<"+AlarmDaoFactory.alarm_voice_timelong;
        //用户管理
@@ -1869,7 +1869,7 @@
        Battalarm_data adata=(Battalarm_data) obj;
        String sql="select distinct db_alarm.tb_battalarm_data.battgroupid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_alarm.tb_battalarm_data.monnum,alm_id,alm_start_time,alm_signal_id,alm_cleared_type " +
                 "  from db_alarm.tb_battalarm_data,db_battinf.tb_battinf " +
                 "  where db_battinf.tb_battinf.battgroupid=db_alarm.tb_battalarm_data.battgroupid " +
                 "  where db_battinf.tb_battinf.battgroupid=db_alarm.tb_battalarm_data.battgroupid and tb_battinf.station_install=1 " +
                 "  and db_alarm.tb_battalarm_data.battgroupid=? and db_alarm.tb_battalarm_data.monnum=? and alm_id=? and alm_start_time=? ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{adata.getBattGroupId(),adata.getMonNum(),adata.getAlm_id(),adata.getAlm_start_time()}, new CallBack() {