修改

81041

2018-10-29 71ab093be46f062bb580c0a97df50b9774b9e330

修改

 gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java

@@ -61,6 +61,7 @@
    public static final int Alarm_IGNAL_ID_CapChangeLow =21;    

    public static final int Alarm_IGNAL_ID_CapChangeHigh =22;  



    public static final int alarm_voice_timelong=3000;//语音播报的时间间隔



    public static String getAlarmName(int type)

    {


 gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java

@@ -589,7 +589,7 @@
                "  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 (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<30 " ;

                "  and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<"+AlarmDaoFactory.alarm_voice_timelong ;

        //用户管理

        String userSql=" and tb_battinf.StationId in(" +

                " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +


 gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java

@@ -1822,7 +1822,7 @@
                "  where alm_cleared_type=0  " +

                "  and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid " +

                "  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))<30   ";

                "  and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<"+AlarmDaoFactory.alarm_voice_timelong;

        //用户管理

        String userSql=" and tb_battinf.StationId in(" +

                " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +