告警修改

81041

2019-01-03 a17fcf6bdbdd29831bd5e746e95ca5b6f9b5b421

告警修改

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

@@ -307,9 +307,12 @@
        String baseSql=" SELECT SQL_CALC_FOUND_ROWS distinct tb_devalarm_data.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.stationName5,db_battinf.tb_battinf.FbsDeviceName  " +

                " FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf " +

                " FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +

                " WHERE  " +

                " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId  and tb_battinf.station_install=1 " ;

                " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId  and tb_battinf.station_install=1 "

                + "and 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=? " ;

        //设备实时告警

        String alarmTypeSql=" AND alm_cleared_type=0 ";

        baseSql+=alarmTypeSql;

@@ -353,20 +356,21 @@
        }else{

            baseSql+=almTypeF;

        }        

        //判断是否为管理的机房

        /*//判断是否为管理的机房

        String stationSql=" 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   " +

                " 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=?) ";

        baseSql+=stationSql;

        baseSql+=stationSql;*/

        //排序

        String endSql=" ORDER BY alm_start_time DESC,db_alarm.tb_devalarm_data.dev_id asc  ";

        //分页

        String limitSql=" LIMIT ?,? ";

        sql=baseSql+endSql+limitSql;

        List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getStationName5(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

        //System.out.println(sql);

        List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{uinf.getUId(),ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getStationName5(),ddata.getAlm_type(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

@@ -702,14 +706,14 @@
        bmd.setPage(page);

        bmd.setUinf(uinf);

        //List list=dimpl.serchIn30(uinf);

        /*List<Batt_devalarm_data> list=dimpl.serchByInfo(ddata);

        List<Batt_devalarm_data> list=dimpl.serchByInfo(ddata);

        for (Batt_devalarm_data b : list) {

            System.out.println(b);

        }*/

        }

        //List<Batt_devalarm_data> list = dimpl.serchByCondition(bmd);

        //System.out.println(list.size());

        int nums=dimpl.searchNums(uinf);

        System.out.println(nums);

        /*int nums=dimpl.searchNums(uinf);

        System.out.println(nums);*/

    }



    


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

@@ -70,7 +70,12 @@
        String baseSql=" SELECT SQL_CALC_FOUND_ROWS tb_devalarm_data_history.num,record_id,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +

                " alm_is_confirmed,alm_confirmed_time,alm_cleared_type, " +

                " DISTINCTbinf.stationName,DISTINCTbinf.stationName5,DISTINCTbinf.FbsDeviceName " +

                " FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName5,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf  where db_battinf.tb_battinf.StationName LIKE ?  AND db_battinf.tb_battinf.StationName1 LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ? AND db_battinf.tb_battinf.StationName5 LIKE ?)  as DISTINCTbinf    " +

                " FROM db_alarm.tb_devalarm_data_history,"

                + "(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName5,db_battinf.tb_battinf.FbsDeviceName 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_battinf.tb_battinf.StationName LIKE ?  AND db_battinf.tb_battinf.StationName1 LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ? AND db_battinf.tb_battinf.StationName5 LIKE ?  "

                + "and 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=?)  as DISTINCTbinf    " +

                " WHERE  tb_devalarm_data_history.dev_id=DISTINCTbinf.FbsDeviceId  " +

                " AND alm_start_time>=? and alm_start_time<=? ";

         

@@ -78,13 +83,13 @@
        String alarmTypeSql=" AND alm_cleared_type!=0";

        baseSql+=alarmTypeSql;*/

        //判断是否为管理的机房

        String stationSql=" and db_alarm.tb_devalarm_data_history.dev_id in(select distinct db_battinf.tb_battinf.FbsDeviceId " +

        /*String stationSql=" and db_alarm.tb_devalarm_data_history.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   " +

                " 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=? )";

        baseSql+=stationSql;

        baseSql+=stationSql;*/

        

        //排序

        String endSql=" ORDER BY alm_start_time DESC ";

@@ -92,9 +97,9 @@
        String limitSql=" LIMIT ?,? ";

        

        sql=baseSql+endSql+limitSql;

		
        List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getBattProductDate(),binf.getBattProductDate1()

            ,uinf.getUId(),(page.getPageCurr() - 1)*page.getPageSize()

        //System.out.println(sql);

        List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",uinf.getUId(),binf.getBattProductDate(),binf.getBattProductDate1()

            ,(page.getPageCurr() - 1)*page.getPageSize()

            ,page.getPageSize()}, new CallBack() {

                

            public List getResults(ResultSet rs) {

@@ -376,10 +381,13 @@
        binf.setStationName1("");

        binf.setStationName2("");

        binf.setStationName3("");

        binf.setStationName5("");

        binf.setStationId("");

        binf.setBattGroupNum(1);

        binf.setBattInUseDate(ActionUtil.getSimpDate(date1));

        binf.setBattInUseDate1(ActionUtil.getSimpDate(date2));

        binf.setBattProductDate(ActionUtil.getSimpDate(date1));

        binf.setBattProductDate1(ActionUtil.getSimpDate(date2));

        

        User_inf uinf=new User_inf();

        uinf.setUId(1002);

@@ -387,8 +395,8 @@
        bmd.setPage(p);

        bmd.setBinf(binf);

        bmd.setUinf(uinf);

        //List<Batt_devalarm_data_history> list=bimpl.serchByCondition(bmd);

        List<Batt_devalarm_data_history> list=bimpl.serchStateBydev_id(binf);

        List<Batt_devalarm_data_history> list=bimpl.serchByCondition(bmd);

        //List<Batt_devalarm_data_history> list=bimpl.serchStateBydev_id(binf);

        System.out.println(list.size());

        for (Batt_devalarm_data_history b : list) {

            System.out.println(b.getDev_ip()+" "+b.getDev_id()+" "+b.getNum()+" "+b.getRecord_id()+" "+b.getAlm_type()+" "+b.getAlm_level()+" "+b.getAlm_is_confirmed()+" "+b.getAlm_cleared_type()+" "+b.getUsr_id()+" "+b.getNote()+" "+b.getStationName());


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

@@ -1986,7 +1986,7 @@
        

        Page p = new Page();

        p.setPageCurr(1);

        p.setPageSize(10);

        p.setPageSize(10000);

        /*条件所存放的位置前台：tb_batt_maint_inf 

         * 在线电压：usr_id 

         * 组端电压：fault_type_id

@@ -2001,7 +2001,7 @@
        Date date1 = sdf.parse("2000-01-01");

        Date date2 = sdf.parse("2020-01-01");

        Batt_maint_inf mainf=new Batt_maint_inf();

        mainf.setUsr_id(0);

        mainf.setUsr_id(1002);

        mainf.setFault_type_id(119002);

        mainf.setFault_level(119003);

        mainf.setRecord_uid(119004);

@@ -2027,6 +2027,9 @@
        

        binf.setStationName("");

        binf.setStationName1("");

        binf.setStationName2("");

        binf.setStationName3("");

        binf.setStationName5("");

        binf.setBattGroupId(0);

        

        

@@ -2039,12 +2042,12 @@
        bmd.setBinf(binf);

        bmd.setUinf(uinf);

        

        //List<Batt_Maint_Dealarm> list = bimp.serchByCondition(bmd);

      /*  List<Batt_Maint_Dealarm> list = bimp.serchByInfo(bmd);

        List<Batt_Maint_Dealarm> list = bimp.serchByCondition(bmd);

        //List<Batt_Maint_Dealarm> list = bimp.serchByInfo(bmd);

        for (Batt_Maint_Dealarm b : list) {

            System.out.println(b);

        }

        System.out.println(list.size());*/

        System.out.println(list.size());

       // List list=bimp.serchRealTime(uinf);

       // System.out.println(list);

        /*List<Integer> list = bimp.serchGood(uinf);

@@ -2055,9 +2058,9 @@
        //System.out.println(list.size());

        /*int nums=bimp.searchAlarmInStation(uinf);

        System.out.println(nums);*/

        List<Battalarm_data> list = bimp.serchByCondition_ky(binf);

        /*List<Battalarm_data> list = bimp.serchByCondition_ky(binf);

        for (Battalarm_data b : list) {

            System.out.println(b);

        }

        }*/

    }

}


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

@@ -106,7 +106,8 @@
        Connection conn=DBUtil.getConn();//sql和numberSql共用一个connection

        String baseSql = "select SQL_CALC_FOUND_ROWS distinct(db_alarm.tb_battalarm_data_history.BattGroupId),db_alarm.tb_battalarm_data_history.num,alm_signal_id,db_alarm.tb_battalarm_data_history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time,  " +

                " stationname,stationname5,battgroupname" +

                " from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf   " +

                " from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf"

                + ",db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +

                " where  alm_id in(?,?,?,?,?,?,?)  and alm_signal_id%2 in(?,?)  " +

                " and alm_level in(?,?,?,?) " +

                " and alm_start_time>=? and alm_start_time<=?  " +

@@ -136,13 +137,19 @@
            baseSql+=idSqlF;

        }

        //用于用户管理的电池组的筛选

         String userSql=" and 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=? ";

         baseSql+=userSql;

	   
        /*//用于用户管理的电池组的筛选

        String userSql=" and db_alarm.tb_battalarm_data_history.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   " +

                " 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=? )";

        baseSql+=userSql;

        baseSql+=userSql;*/

        String endSql="order by db_alarm.tb_battalarm_data_history.alm_start_time desc,db_alarm.tb_battalarm_data_history.monnum asc ";        

        String limitSql=" limit ?,? ";

        sql=baseSql+endSql+limitSql;

@@ -236,7 +243,7 @@
        Battalarm_data_historyImpl bimpl=new Battalarm_data_historyImpl();

        Page p = new Page();

        p.setPageCurr(1);

        p.setPageSize(10);

        p.setPageSize(1000);

        /*条件所存放的位置前台：tb_batt_maint_inf 

         * 在线电压：usr_id 

         * 组端电压：fault_type_id

@@ -277,6 +284,9 @@
        

        binf.setStationName("");

        binf.setStationName1("");

        binf.setStationName2("");

        binf.setStationName3("");

        binf.setStationName5("");

        binf.setBattGroupId(0);