修改

81041

2018-11-19 e24744ff8b8aaa16ec75f33dd67a31e8fb94979d

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

@@ -443,14 +443,14 @@
         String numberSql=" SELECT FOUND_ROWS() number";

         Connection conn=DBUtil.getConn();

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

               + " ,stationname,battgroupname"

               + " ,stationname,stationname5,battgroupname"

               + " from db_alarm.tb_battalarm_data,db_battinf.tb_battinf  "

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

                "  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.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{

@@ -493,6 +493,7 @@
                  "%"+binf.getStationName1()+"%",

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

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

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

                  binf.getBattGroupId(),

                  uinf.getUId(),

                  

@@ -521,6 +522,7 @@
                           BattInf binf=new BattInf();

                           binf.setBattGroupId(rs.getInt("battGroupId"));

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

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

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

                           //battinf中的StationName8，StationName9存放告警名称和等级

                           name=AlarmDaoFactory.getAlarmName(adata.getAlm_signal_id());

@@ -1308,7 +1310,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_battinf.tb_battinf.stationname like ?  )  " +

            " and db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.stationname like ? and tb_battinf.station_install=1  )  " +

            " GROUP BY(alm_id) ";

      sql+=citySql;

      //System.out.println(sql);

@@ -1366,14 +1368,14 @@
      String sql="select count(num) as number " +

            "from db_alarm.tb_battalarm_data  " +

            "where  " +

            "alm_cleared_type=0  " +

            "and alm_id not in("+AlarmDaoFactory.Alarm_vol_Online+","+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+","+AlarmDaoFactory.Alarm_res_Conn+","+AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID+")"+

            "alm_cleared_type=0  " +//+AlarmDaoFactory.Alarm_vol_Online+","

            "and alm_id not in("+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+","+AlarmDaoFactory.Alarm_res_Conn+","+AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID+")"+

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

            " 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() {

         

@@ -1524,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() {

@@ -1773,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   " +

@@ -1820,9 +1822,9 @@
      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))<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=?" +

@@ -1867,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() {