Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

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

@@ -54,11 +54,15 @@
    //机房事件统计

   public List serchByCondition(Object obj) {

      final BattInf binf=(BattInf) obj;

      String sql="select station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +

      //System.out.println(binf);

      String sql="select distinct station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3,tb_battinf.StationName5 " +

            " from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +

            " where  tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +

            " and tb_bts_station_event.station_id 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=?" +

            " ) " +

            " and  record_datetime>=?  and  record_datetime<=?  " +

            " and stationname1 like ? and stationname2 like  ? and stationname3 like ? and stationid like ? " ;

            " and stationname1 like ? and stationname2 like  ? and stationname3 like ? and stationname5 like ?  and stationid like ? " ;

      /*//事件筛选

      String eventSqlT=" and station_event_type!=? ";

      String eventSqlF=" and station_event_type=? ";

@@ -73,8 +77,8 @@
      //排序

      String orderSql="  order by station_id,record_datetime,station_event_type asc  ";

      sql+=orderSql;

      System.err.println(sql);

      List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {

      //System.err.println(sql);

      List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName5()+"%","%"+binf.getStationId()+"%"}, new CallBack() {

         

         public List getResults(ResultSet rs) {

            List list=new ArrayList();

@@ -300,6 +304,9 @@
      String sql="select  distinct station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +

            " from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +

            " where  tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +

            "  and tb_bts_station_event.station_id 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=?" +

            " ) " +

            " and dev_id=?  " +

            " and  record_datetime>=?  and  record_datetime<=? ";

      //基站状态

@@ -318,7 +325,7 @@
      //sql+=limitSql;

      //,(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()

      //executeQueryLimit

      List<Bts_station_event> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bevent.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),bevent.getStation_event_type()}, new CallBack() {

      List<Bts_station_event> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bevent.getNum(),bevent.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),bevent.getStation_event_type()}, new CallBack() {

         

         public List getResults(ResultSet rs) {

            List list=new ArrayList();

@@ -371,12 +378,13 @@
      

      

      BattInf binf = new BattInf();

      binf.setNum(0);

      binf.setNum(1002);

       binf.setStationName("");

      binf.setStationName1("");

      binf.setStationName2("");

      binf.setStationName3("");

      binf.setStationId("");

      binf.setStationName5("");

      binf.setStationId("42000524");

      binf.setBattGroupNum(1);

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

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

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

      bmd.setBinf(binf);

        bmd.setUinf(uinf);

       /* List<Bts_station_event> list=bimpl.serchByCondition(binf);

        List<Bts_station_event> list=bimpl.serchByCondition(binf);

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

        for (Bts_station_event b : list) {

         System.out.println(b.getNote()+" "+b.getDev_id()+" "+b.getStation_event_type_poff()+" "+b.getStation_event_type_xuhang()+" "+b.getStation_event_type_fadian()+" "+b.getStation_event_type_diaozhan()+" "+b.getStation_event_type_dooropen()+" "+b.getStation_event_type_tempup()+" "+b.getStation_event_type_templow()+" "+b.getStation_event_type_dampup()+" "+b.getStation_event_type_damplow()+" "+b.getStationName());

      }*/

      }

        Bts_station_event b=new Bts_station_event();

        b.setDev_id(910000001);

        b.setNum(1002);

        b.setDev_id(910000534);

        b.setRecord_datetime(ActionUtil.getSimpDate(date1));

        b.setRecord_datetime_end(ActionUtil.getSimpDate(date2));

        b.setStation_event_type(0);

@@ -401,8 +410,8 @@
        page.setPageCurr(1);

        page.setPageSize(10);

        b.setPage(page);

        List list=bimpl.serchByInfo(b);

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

        //List list=bimpl.serchByInfo(b);

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

   }



}