81041
2018-10-24 1b0f42c11f7573e56cc85551b762367f3d5da9cc
拓扑图开关状态batt_online_state
2个文件已修改
17 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
@@ -345,7 +345,7 @@
    //实时监测界面根据dev_alarmstate状态判断接触器状态
    public List serchContactorState(Object obj) {
        Fbs9100_state fs=(Fbs9100_state) obj;
        String sql="select dev_id,dev_alarmstate,dev_workstate,record_datetime,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type  from db_ram_db.tb_fbs9100_state where dev_id=? limit 1";
        String sql="select dev_id,dev_alarmstate,dev_workstate,record_datetime,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type,batt_online_state  from db_ram_db.tb_fbs9100_state where dev_id=? limit 1";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{fs.getDev_id()},new CallBack() {
            
            public List getResults(ResultSet rs) {
@@ -379,6 +379,7 @@
                        fstate.setDev_61850alarms(rs.getString("dev_61850alarms"));
                        fstate.setDev_last_captest_stop_type(rs.getInt("dev_last_captest_stop_type"));
                        fstate.setDev_temp(rs.getFloat("dev_temp"));
                        fstate.setBatt_online_state(rs.getInt("batt_online_state"));
                        list.add(fstate);
                    }
                } catch (SQLException e) {
@@ -394,7 +395,7 @@
    public List serchByInfo(Object obj) {
        BattInf binf=(BattInf) obj;
        String sql="select fbs_rt.BattGroupId,fbs_rt.group_curr,fbs_rt.group_vol,fbs_rt.online_vol,fbs_rt.batt_state,fbs_rt.batt_test_type" +
                ",dev_id,dev_workstate,dev_alarmstate,dev_temp,dev_res_test_state,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type  " +
                ",dev_id,dev_workstate,dev_alarmstate,dev_temp,dev_res_test_state,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type,batt_online_state  " +
                "from  db_ram_db.tb_fbs9100_state," +
                "(select distinct db_ram_db.tb_batt_rtstate.BattGroupId,group_curr,group_vol,online_vol,batt_state,batt_test_type,db_battinf.tb_battinf.FBSDeviceId from db_ram_db.tb_batt_rtstate,db_battinf.tb_battinf " +
                "where  db_battinf.tb_battinf.BattGroupId=db_ram_db.tb_batt_rtstate.BattGroupId " +
@@ -439,6 +440,7 @@
                        fstate.setDev_61850alarms(rs.getString("dev_61850alarms"));
                        fstate.setDev_last_captest_stop_type(rs.getInt("dev_last_captest_stop_type"));
                        fstate.setDev_temp(rs.getFloat("dev_temp"));
                        fstate.setBatt_online_state(rs.getInt("batt_online_state"));
                        list.add(fstate);
                    }
                } catch (SQLException e) {
gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java
@@ -30,6 +30,7 @@
    private Integer dev_commcount;
    private Integer dev_errcommcount;
    private Integer dev_rxnullerrcount;
    private Integer batt_online_state;
    
    private String online_vols;
    private String group_vols;
@@ -284,6 +285,12 @@
    public void setDev_temp(Float dev_temp) {
        this.dev_temp = dev_temp;
    }
    public Integer getBatt_online_state() {
        return batt_online_state;
    }
    public void setBatt_online_state(Integer batt_online_state) {
        this.batt_online_state = batt_online_state;
    }
    @Override
    public String toString() {
        return "Fbs9100_state [num=" + num + ", dev_ip=" + dev_ip
@@ -305,7 +312,8 @@
                + ", dev_restest_monindex=" + dev_restest_monindex
                + ", dev_commcount=" + dev_commcount + ", dev_errcommcount="
                + dev_errcommcount + ", dev_rxnullerrcount="
                + dev_rxnullerrcount + ", online_vols=" + online_vols
                + dev_rxnullerrcount + ", batt_online_state="
                + batt_online_state + ", online_vols=" + online_vols
                + ", group_vols=" + group_vols + ", group_currs=" + group_currs
                + ", stationName=" + stationName + ", deviceName=" + deviceName
                + ", note=" + note + ", page=" + page + ", dev_conresist="
@@ -318,4 +326,5 @@
    
    
    
}