81041
2018-11-26 1229c0030c8bb76ee89b9c08c074315b4bbfd44a
首页上电池告警率加入容量更换和容量告警告警
2个文件已修改
38 ■■■■■ 已修改文件
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -1296,25 +1296,21 @@
        return list;    
    }*/
    public List serchAlm(Object obj){
        Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
        Battalarm_data adata=bmd.getAdata();
        BattInf binf=bmd.getBinf();
        User_inf uinf=bmd.getUinf();
        User_inf uinf=(User_inf) obj;
        String sql="select count(num) as number,alm_id " +
                "from db_alarm.tb_battalarm_data  " +
                "where  " +
                "alm_cleared_type=0  " ;
        //根据城市选取
        String citySql=" and 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_battinf.tb_battinf.stationname like ? and tb_battinf.station_install=1  )  " +
        String citySql=" and tb_battalarm_data.BattGroupId in ( select distinct db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId " +
                " 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 tb_battalarm_data.BattGroupId in (select distinct db_battinf.tb_battinf.BattGroupId  from db_battinf.tb_battinf where  station_install=1) " +
                " GROUP BY(alm_id) ";
        sql+=citySql;
        //System.out.println(sql);
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId(),"%"+binf.getStationName()+"%"}, new CallBack() {
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
            
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -227,10 +227,9 @@
    
    //0.5查询实时告警数(电池告警率)
    public ServiceModel serchAlm(Object obj){
        Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
        Battalarm_data adata=new Battalarm_data();
        adata.setNum(0);//实时告警总数
        //adata.setBattGroupId(0);//容量告警告警数
        adata.setBattGroupId(0);//容量告警告警数
        adata.setMonNum(0);//组端电压告警数
        adata.setAlm_id(0);//充电电流告警数
        adata.setAlm_signal_id(0);//放电电流告警数
@@ -238,18 +237,17 @@
        adata.setAlm_is_confirmed(0);//单体温度告警数
        adata.setAlm_cleared_type(0);//单体内阻告警数
        adata.setUsr_Id(0);//连接条阻抗告警数
        //adata.setAlm_value(0f);//容量更换告警
        adata.setAlm_value(0f);//容量更换告警
        adata.setRecord_Id(0l);//在线电压告警数
        bmd.setAdata(adata);
        int numZ=0;//告警总数
        //求八种类型告警的数量  
        List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(bmd);
        List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(obj);
        if(list!=null&&list.size()>0){
            for(int i=0;i<list.size();i++){
                /*if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
                if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
                    adata.setBattGroupId(list.get(i).getNum());//容量告警告警数
                    numZ+=list.get(i).getNum();
                }*/
                }
                if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Group){
                    adata.setMonNum(list.get(i).getNum());//组端电压告警数
                    numZ+=list.get(i).getNum();
@@ -278,10 +276,10 @@
                    adata.setUsr_Id(list.get(i).getNum());//连接条阻抗告警数
                    numZ+=list.get(i).getNum();
                }
                /*if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapChange){
                if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapChange){
                    adata.setAlm_value((float)list.get(i).getNum());//容量更换告警数
                    numZ+=list.get(i).getNum();
                }*/if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Online){
                }if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Online){
                    adata.setRecord_Id((long)list.get(i).getNum());//在线电压告警数
                    numZ+=list.get(i).getNum();
                }
@@ -291,7 +289,7 @@
        adata.setNum(numZ);//实时告警总数
        model.setCode(1);
        model.setData(adata);
        //System.out.println(model.getData());
        System.out.println(model.getData());
        return model;    
    }
@@ -582,7 +580,7 @@
        //System.out.println(bmd);
        //bs.serchByCondition(bmd);
        //bs.serchByInfo(bmd);
        bs.serchAlm(bmd);
        bs.serchAlm(uinf);
        //bs.serchGood();
        //bs.serchTopAlmTen(uinf);
    }