修改

81041

2019-01-05 104cf721e069d81f0874b32465a273d8e63e539c

修改

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_stateAction$2.class

Binary files differ

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

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$13.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/services/ram/Fbs9100_battparamService.class

Binary files differ

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

@@ -206,7 +206,6 @@
        DBUtil.close(rs, ps, conn);

        return res_exe;

    }

	
    public List serchByInfo(Object obj) {

        // TODO Auto-generated method stub

        return null;


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

@@ -985,7 +985,7 @@
        for (int i = 0; i < list.size(); i++) {

            BattInf binf=list.get(i);

            String sql="select distinct dev_id,dev_alarmstate,dev_workstate,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum " +

                   " ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong" +

                   " ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong,dev_commcount" +

                   " ,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.FbsDeviceName   " +

                   " ,db_ram_db.tb_batt_rtstate.batt_test_tlong  " +//,db_ram_db.tb_batt_rtstate.group_curr,db_ram_db.tb_batt_rtstate.group_vol 

@@ -1024,7 +1024,7 @@
                            fstate.setDev_captest_curr(rs.getFloat("dev_captest_curr"));

                            fstate.setDev_captest_cap(rs.getFloat("dev_captest_cap"));

                            fstate.setDev_captest_timelong(rs.getInt("batt_test_tlong"));//实际放电时常

							
                            fstate.setDev_commcount(rs.getInt("dev_commcount"));

                            fstate.setDev_conresist(rs.getFloat("dev_conresist"));

                            fstate.setDev_concurr(rs.getFloat("dev_concurr"));

                            fstate.setDev_condcurr(rs.getFloat("dev_condcurr"));

@@ -1038,9 +1038,6 @@
                            fstate.setStationName3(rs.getString("stationName3"));

                            fstate.setStationName5(rs.getString("stationName5"));

                            fstate.setDeviceName(rs.getString("FbsDeviceName"));

                            /*fstate.setOnline_vols(((Float)rs.getFloat("online_vol")).toString());

                            fstate.setGroup_vols(((Float)rs.getFloat("group_vol")).toString());

                            fstate.setGroup_currs(((Float)rs.getFloat("group_curr")).toString());*/

                            

                            list.add(fstate);

                        }


 gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java

@@ -6,6 +6,7 @@
import com.fgkj.dao.BaseDAO;

import com.fgkj.dao.BaseDAOFactory;

import com.fgkj.dao.FBS9100_ComBase;

import com.fgkj.dao.impl.BattInfImpl;

import com.fgkj.dao.impl.ram.Bts_gprs_stateImpl;

import com.fgkj.dao.impl.ram.Fbs9100_battparamImpl;

import com.fgkj.dao.impl.ram.Fbs9100_sysparamImpl;

@@ -95,4 +96,11 @@
        }

        return model;

    }

    //批量设置电池参数时，根据省市区，电池单体型号（伏数），组数筛选出电池组并读取它的实际电池参数

    public ServiceModel serchBattinfAndParam(Object obj) {

        List list=(new BattInfImpl()).serchByDischarge(obj);

		
        return model;

    }

	
}