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/Battalarm_data_historyImpl.java

@@ -105,12 +105,13 @@
      String numberSql="SELECT FOUND_ROWS() number";//存放总数

      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,battgroupname" +

            " from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf   " +

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

            " stationname,stationname5,battgroupname" +

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

            " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? ";

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

      //历史告警

@@ -135,20 +136,27 @@
      }else{

         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;

      //System.out.println(sql);

      List<Batt_Maint_Dealarm> list= DAOHelper.executeQueryLimit(sql,conn,

               new Object[] { 

                    mainf.getUsr_id(),

                  mainf.getFault_type_id(),

                  mainf.getFault_level(),

                  mainf.getRecord_uid(),

@@ -169,6 +177,8 @@
                  adata_H.getAlm_start_time1(),

                  "%"+binf.getStationName1()+"%",

                  "%"+binf.getStationName()+"%",

                  "%"+binf.getStationName2()+"%",

                  "%"+binf.getStationName5()+"%",

                  //adata_H.getAlm_cleared_type(),

                  

                  

@@ -187,6 +197,7 @@
                           Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();

                           BattInf binf = new BattInf();

                           binf.setStationName(rs.getString("stationName"));

                           binf.setStationName5(rs.getString("stationName5"));

                           binf.setBattGroupName(rs.getString("battGroupName"));

                           

                           Battalarm_data_history adata_H = new Battalarm_data_history();

@@ -232,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

@@ -273,6 +284,9 @@
      

       binf.setStationName("");

      binf.setStationName1("");

      binf.setStationName2("");

      binf.setStationName3("");

      binf.setStationName5("");

      binf.setBattGroupId(0);