修改

81041

2019-01-04 b31445339c5e4adb5135f0d8e7117a0b60079b13

修改

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Fbs9100_state.class

Binary files differ

 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java

@@ -896,7 +896,7 @@
                + ",dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong "

                + ",dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type "

                + ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName3,db_battinf.tb_battinf.StationName5 "

                + ",db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.BattGroupId,db_battinf.tb_battinf.battgroupname "

                + ",db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.BattGroupId,db_battinf.tb_battinf.battgroupname,db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.moncount "

                + " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr "

                + " where   dev_workstate="+FBS9100_ComBase.DISCHARGE

                + " and db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id    "

@@ -942,6 +942,8 @@
                        fstate.setStationName5(rs.getString("stationName5"));

                        fstate.setBattgroupid(rs.getInt("battgroupid"));

                        fstate.setMonvolstd(rs.getInt("monvolstd"));

                        fstate.setMoncapstd(rs.getInt("moncapstd"));

                        fstate.setMoncount(rs.getInt("moncount"));

                        fstate.setNote(rs.getString("battgroupname"));

                        list.add(fstate);

                    }


 gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java

@@ -43,6 +43,8 @@
    private String deviceName;//设备名称

    private int  monvolstd;

    private int  battgroupid;

    private int  moncount;

    private int  moncapstd;

    private String note;

    private Page page;//分页

    

@@ -333,6 +335,18 @@
    public void setBattgroupid(int battgroupid) {

        this.battgroupid = battgroupid;

    }

    public int getMoncount() {

        return moncount;

    }

    public void setMoncount(int moncount) {

        this.moncount = moncount;

    }

    public int getMoncapstd() {

        return moncapstd;

    }

    public void setMoncapstd(int moncapstd) {

        this.moncapstd = moncapstd;

    }

    @Override

    public String toString() {

        return "Fbs9100_state [num=" + num + ", dev_ip=" + dev_ip + ", dev_version=" + dev_version + ", dev_id="

@@ -349,10 +363,11 @@
                + ", online_vols=" + online_vols + ", group_vols=" + group_vols + ", group_currs=" + group_currs

                + ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2

                + ", stationName3=" + stationName3 + ", stationName5=" + stationName5 + ", deviceName=" + deviceName

                + ", monvolstd=" + monvolstd + ", battgroupid=" + battgroupid + ", note=" + note + ", page=" + page

                + ", dev_conresist=" + dev_conresist + ", dev_concurr=" + dev_concurr + ", dev_condvoldp="

                + dev_condvoldp + ", dev_condcurr=" + dev_condcurr + ", dev_61850alarms=" + dev_61850alarms

                + ", dev_last_captest_stop_type=" + dev_last_captest_stop_type + "]";

                + ", monvolstd=" + monvolstd + ", battgroupid=" + battgroupid + ", moncount=" + moncount

                + ", moncapstd=" + moncapstd + ", note=" + note + ", page=" + page + ", dev_conresist=" + dev_conresist

                + ", dev_concurr=" + dev_concurr + ", dev_condvoldp=" + dev_condvoldp + ", dev_condcurr=" + dev_condcurr

                + ", dev_61850alarms=" + dev_61850alarms + ", dev_last_captest_stop_type=" + dev_last_captest_stop_type

                + "]";

    }

    

    

@@ -360,4 +375,5 @@
    

    

    

	
}