81041
2018-12-05 01f4050c3529f85ec05673fea9273f35c6e5e934
电池实时告警跨域访问和电池实时状态加续航停止时间
6个文件已修改
150 ■■■■■ 已修改文件
gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/Battalarm_data.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
@@ -5,6 +5,7 @@
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Battalarm_data;
import com.fgkj.dto.RoleLimit;
@@ -31,7 +32,13 @@
        result=ActionUtil.tojson(model);
        return SUCCESS;
    }
    //3.1电池告警实时查询<***********跨域专用**************>
    public String serchByCondition_ky(){
        BattInf binf=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
        ServiceModel model=service.serchByCondition_ky(binf);
        result=ActionUtil.tojson(model);
        return SUCCESS;
    }
    //3.2电池告警历史记录查询
    public String serchByInfo(){
        bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_Maint_Dealarm.class);
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -552,6 +552,63 @@
            
            return list;
        }
    // 3.1电池告警实时查询<***********跨域专用**************>
    public List serchByCondition_ky(Object obj) {
            BattInf binf=(BattInf) obj;
            String sql="";
            String baseSql = "select  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,stationname5,battgroupname"
                    + " from db_alarm.tb_battalarm_data,db_battinf.tb_battinf  "
                    + " where alm_cleared_type=0 ";
            //用于电池组条件
            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 ";
            if(binf.getBattGroupId()==0){
                baseSql+=idSqlT;
            }else{
                baseSql+=idSqlF;
            }
            String endSql="order by db_alarm.tb_battalarm_data.BattGroupId,db_alarm.tb_battalarm_data.alm_start_time desc,db_alarm.tb_battalarm_data.monnum asc ";
            sql=baseSql+endSql;
            List  list = DAOHelper.executeQuery(sql,DBUtil.getConn(),new Object[] {binf.getBattGroupId()}, new CallBack() {
                        public List getResults(ResultSet rs) {
                            List list = new ArrayList();
                            try {
                                while (rs.next()) {
                                    String name="未知";            //存放告警名称
                                    String type="未知";            //存放告警等级
                                    Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
                                    Battalarm_data adata = new Battalarm_data();
                                    adata.setNum(rs.getInt("num"));
                                    adata.setBattGroupId(rs.getInt("battGroupId"));
                                    adata.setAlm_signal_id(rs.getInt("alm_signal_id"));
                                    adata.setMonNum(rs.getInt("monNum"));
                                    adata.setAlm_value(rs.getFloat("alm_value"));
                                    adata.setAlm_level(rs.getInt("alm_level"));
                                    adata.setAlm_is_confirmed(rs.getInt("alm_is_confirmed"));
                                    adata.setAlm_confirmed_time(rs.getTimestamp("alm_confirmed_time"));
                                    adata.setAlm_start_time(rs.getTimestamp("alm_start_time"));
                                    adata.setAlm_end_time(rs.getTimestamp("alm_end_time"));
                                    adata.setStationname(rs.getString("stationName"));
                                    adata.setBattGroupName(rs.getString("battGroupName"));
                                    //battinf中的StationName8,StationName9存放告警名称和等级
                                    name=AlarmDaoFactory.getAlarmName(adata.getAlm_signal_id());
                                    adata.setAlarmname(name);
                                    type=AlarmDaoFactory.getAlarmType(adata.getAlm_level());
                                    adata.setAlarmtype(type);
                                    list.add(adata);
                                }
                            } catch (SQLException e) {
                                // TODO Auto-generated catch block
                                e.printStackTrace();
                            }
                            return list;
                        }
                    });
            return list;
        }
    // 3.2电池告警
        /*
     * 条件所存放的位置前台:tb_batt_maint_inf 
@@ -1997,7 +2054,11 @@
        }*/
        //List list=bimp.serchIn30(uinf);
        //System.out.println(list.size());
        int nums=bimp.searchAlarmInStation(uinf);
        System.out.println(nums);
        /*int nums=bimp.searchAlarmInStation(uinf);
        System.out.println(nums);*/
        List<Battalarm_data> list = bimp.serchByCondition_ky(binf);
        for (Battalarm_data b : list) {
            System.out.println(b);
        }
    }
}
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -51,7 +51,7 @@
        Connection conn=DBUtil.getConn();
        String numberSql="SELECT FOUND_ROWS() number";//存放总数
        String sql="select SQL_CALC_FOUND_ROWS distinct station_id,dev_id,record_datetime,station_stat,station_poff_start_time,station_fadian_start_time" +
                   " ,station_diaozhan_start_time,station_temp,station_damp,station_dooropen_start_time,station_xuhang_start_time" +
                   " ,station_diaozhan_start_time,station_temp,station_damp,station_dooropen_start_time,station_xuhang_start_time,station_xuhang_end_time" +
                   " ,tb_battinf.stationname,tb_battinf.stationname1,tb_battinf.stationname2,tb_battinf.stationname3,tb_battinf.stationname5 " +
                   " from db_ram_db.tb_bts_station_state,db_battinf.tb_battinf  " +
                   " where  tb_bts_station_state.dev_id=db_battinf.tb_battinf.FBSDeviceId  " +
@@ -154,6 +154,7 @@
                        b.setStation_damp(rs.getFloat("station_damp"));
                        b.setStation_dooropen_start_time(rs.getTimestamp("station_dooropen_start_time"));
                        b.setStation_xuhang_start_time(rs.getTimestamp("station_xuhang_start_time"));
                        b.setStation_xuhang_end_time(rs.getTimestamp("station_xuhang_end_time"));
                        b.setStationName(rs.getString("stationName"));
                        b.setStationName1(rs.getString("stationName1"));
                        b.setStationName2(rs.getString("stationName2"));
@@ -303,29 +304,31 @@
        binf.setStationName1("");
        binf.setStationName2("");
        binf.setStationName3("");
        binf.setStationName5("");
        binf.setStationId("");
        binf.setBattGroupNum(36);
        binf.setBattGroupNum(62);
        User_inf uinf=new User_inf();
        uinf.setUId(1002);
        Page p=new Page();
        p.setPageCurr(1);
        p.setPageSize(10);
        binf.setPage(p);
        /*List<Bts_station_state> list=bimpl.serchByCondition(binf);
        List<Bts_station_state> list=bimpl.serchByCondition(binf);
        for (Bts_station_state bs : list) {
            //System.out.println(bs.getStation_stat_diaozhan()+"  "+bs.getStation_stat_dooropen()+"  "+bs.getStation_stat_fadian()+"   "+bs.getStation_stat_xuhang()+"  "+bs.getStation_stat_poff());
            System.out.println(bs);
        }
        int nums=bimpl.serchByState(uinf);*/
        //System.out.println(list.size());
        //int nums=bimpl.serchByState(uinf);
        /*BattMap_information bm=new BattMap_information();
        bm.setStationId("42000570");
        int nums=bimpl.serchByStationId(bm);*/
        //int nums=bimpl.serchByState_diaozhan(uinf);
        BattMap_information bm=new BattMap_information();
        /*BattMap_information bm=new BattMap_information();
        bm.setStationId("42000366");
        int nums=bimpl.serchByStationId_diaozhan(bm);
        
        System.out.println(nums);
        System.out.println(nums);*/
    }
    
gx_tieta/src/com/fgkj/dto/Battalarm_data.java
@@ -22,6 +22,9 @@
    
    private String stationid;
    private String stationname;
    private String battGroupName;
    private String alarmname;
    private String alarmtype;
    private String note;
    
    public Battalarm_data() {
@@ -196,6 +199,30 @@
        this.note = note;
    }
    public String getBattGroupName() {
        return battGroupName;
    }
    public void setBattGroupName(String battGroupName) {
        this.battGroupName = battGroupName;
    }
    public String getAlarmname() {
        return alarmname;
    }
    public void setAlarmname(String alarmname) {
        this.alarmname = alarmname;
    }
    public String getAlarmtype() {
        return alarmtype;
    }
    public void setAlarmtype(String alarmtype) {
        this.alarmtype = alarmtype;
    }
    @Override
    public String toString() {
        return "Battalarm_data [num=" + num + ", BattGroupId=" + BattGroupId
@@ -208,10 +235,13 @@
                + ", alm_confirmed_time=" + alm_confirmed_time
                + ", alm_cleared_type=" + alm_cleared_type + ", usr_Id="
                + usr_Id + ", stationid=" + stationid + ", stationname="
                + stationname + ", note=" + note + "]";
                + stationname + ", battGroupName=" + battGroupName
                + ", alarmname=" + alarmname + ", alarmtype=" + alarmtype
                + ", note=" + note + "]";
    }
    
    
    
}
gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
@@ -32,6 +32,7 @@
    
    private int station_stat_xuhang;
    private Date station_xuhang_start_time;
    private Date station_xuhang_end_time;
    private int station_xuhang_tlong;
    
    private String note;
@@ -213,6 +214,13 @@
    public void setStation_xuhang_start_time(Date station_xuhang_start_time) {
        this.station_xuhang_start_time = station_xuhang_start_time;
    }
    public Date getStation_xuhang_end_time() {
        return station_xuhang_end_time;
    }
    public void setStation_xuhang_end_time(Date station_xuhang_end_time) {
        this.station_xuhang_end_time = station_xuhang_end_time;
    }
    public int getStation_xuhang_tlong() {
        return station_xuhang_tlong;
    }
@@ -244,7 +252,8 @@
                + station_dooropen_start_time + ", station_dooropen_tlong="
                + station_dooropen_tlong + ", station_stat_xuhang="
                + station_stat_xuhang + ", station_xuhang_start_time="
                + station_xuhang_start_time + ", station_xuhang_tlong="
                + station_xuhang_start_time + ", station_xuhang_end_time="
                + station_xuhang_end_time + ", station_xuhang_tlong="
                + station_xuhang_tlong + ", note=" + note + ", stationName="
                + stationName + ", stationName1=" + stationName1
                + ", stationName2=" + stationName2 + ", stationName3="
@@ -256,4 +265,5 @@
    
    
    
}
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -176,7 +176,7 @@
    //3.1电池告警实时查询
    public ServiceModel serchByCondition(Object obj){
        model=new ServiceModel();
        List<Batt_Maint_Dealarm> list=dao.serchByCondition(obj);
        List list=dao.serchByCondition(obj);
        if(list!=null && list.size()>1){
            model.setCode(1);
            model.setData(list);
@@ -186,6 +186,21 @@
        }    
        return model;
    }     
    //3.1电池告警实时查询<***********跨域专用**************>
    public ServiceModel serchByCondition_ky(Object obj){
        model=new ServiceModel();
        List list=((Battalarm_dataDAOImpl)dao).serchByCondition_ky(obj);
        if(list!=null && list.size()>1){
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
        }else {
            model.setCode(0);
            model.setData(list);
            model.setMsg("查询失败!");
        }
        return model;
    }
   
    //3.2电池告警历史记录查询
    public ServiceModel serchByInfo(Object obj){