parent: bc4435f0 | 补丁 | 提交 | ignore whitespace
lxw
2020-04-20 1dae6192e8402cb39cf7460e5e108bc36697c37c 
告警加总数
2个文件已修改
28 ■■■■■ 已修改文件
Device_Manage/src/com/fgkj/dao/impl/Battalarm_dataImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Manage/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 Device_Manage/src/com/fgkj/dao/impl/Battalarm_dataImpl.java


@@ -1,5 +1,6 @@


package com.fgkj.dao.impl;




import java.sql.Connection;


import java.sql.ResultSet;


import java.sql.SQLException;


import java.util.ArrayList;


@@ -9,6 +10,7 @@


import com.fgkj.dao.BaseDAO;


import com.fgkj.dao.CallBack;


import com.fgkj.dao.DAOHelper;


import com.fgkj.dao.LimitNumberFactory;


import com.fgkj.db.DBUtil;


import com.fgkj.dto.BattInf;


import com.fgkj.dto.Battalarm_data;


@@ -76,7 +78,9 @@


        @Override


    public List serchByInfo(Object obj) {


        Page page=(Page) obj;


        String sql=" select distinct db_alarm.tb_battalarm_data.battgroupid,alm_start_time,alm_id,db_alarm.tb_battalarm_data.monnum,alm_signal_id,alm_level  "


        Connection conn=DBUtil.getConn();


        String numberSql=" SELECT FOUND_ROWS() number";


        String sql=" select SQL_CALC_FOUND_ROWS distinct db_alarm.tb_battalarm_data.battgroupid,alm_start_time,alm_id,db_alarm.tb_battalarm_data.monnum,alm_signal_id,alm_level  "


                + "  ,FBSDeviceId,BattGroupName "


                + "  from db_alarm.tb_battalarm_data,db_battinf.tb_battinf "


                + "  where db_alarm.tb_battalarm_data.battGroupId=db_battinf.tb_battinf.battGroupId  ";


@@ -93,7 +97,7 @@


        String endSql="  order by db_alarm.tb_battalarm_data.battgroupid asc,alm_start_time desc "


                + "  limit ?,? ";


        sql+=endSql;


        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{page.getPageAll(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {


        List<Battalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{page.getPageAll(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {


            


            @Override


            public List getResults(ResultSet rs) {


@@ -120,6 +124,12 @@


                return list;


            }


        });


        //去掉limit条件后的总数


        int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);


        //System.out.println("number: "+number);


        if(list!=null&&list.size()>0){


            list.get(list.size()-1).setUsr_Id(number);


        }


        return list;


    }


    //根据电池组id查询电池告警的详细情况




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


@@ -1,5 +1,6 @@


package com.fgkj.dao.impl;




import java.sql.Connection;


import java.sql.ResultSet;


import java.sql.SQLException;


import java.util.ArrayList;


@@ -9,6 +10,7 @@


import com.fgkj.dao.BaseDAO;


import com.fgkj.dao.CallBack;


import com.fgkj.dao.DAOHelper;


import com.fgkj.dao.LimitNumberFactory;


import com.fgkj.db.DBUtil;


import com.fgkj.dto.BattInf;


import com.fgkj.dto.Battalarm_data_history;


@@ -80,7 +82,9 @@


    //查询所有的历史告警(分页)


    public List serchByInfo(Object obj) {


        Page page=(Page) obj;


        String sql="select  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 "


        Connection conn=DBUtil.getConn();


        String numberSql=" SELECT FOUND_ROWS() number";


        String sql="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 "


                + " ,FBSDeviceId,BattGroupName  "


                + " from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf"


                + " where db_alarm.tb_battalarm_data_history.battGroupId=db_battinf.tb_battinf.battGroupId  ";


@@ -96,7 +100,7 @@


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


                + " limit ?,? ";


        sql+=endSql;


        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),  new Object[]{page.getPageAll(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {


        List<Battalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,  new Object[]{page.getPageAll(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {


            


            @Override


            public List getResults(ResultSet rs) {


@@ -125,6 +129,12 @@


                return list;


            }


        });


        //去掉limit条件后的总数


        int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);


        //System.out.println("number: "+number);


        if(list!=null&&list.size()>0){


            list.get(list.size()-1).setUsr_Id(number);


        }


        return list;


    }


    //根据电池组id查询