修改

81041

2019-01-15 253879d0d562db0290a67160d30d3f15e8e7bf09

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

@@ -276,7 +276,7 @@
    //放电测试添加fbs9600设备的添加电池组的操作

   public List serchByInfo(Object obj) {

      BattInf binf=(BattInf) obj;

      String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,FbsDeviceName,db_battinf.tb_battinf.BattGroupName" +

      String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,FbsDeviceName,db_battinf.tb_battinf.BattGroupName" +

            ",db_battinf.tb_battinf.GroupIndexInFBSDevice,db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd" +

            ",db_ram_db.tb_fbs9600_state.dev_ip,db_ram_db.tb_fbs9600_state.dev_id,db_ram_db.tb_fbs9600_state.op_cmd" +

            ",db_ram_db.tb_fbs9600_state.dev_commcount,db_ram_db.tb_fbs9600_state.dev_errcommcount  " +

@@ -298,6 +298,7 @@
                  fstate.setDev_commcount(rs.getInt("dev_commcount"));

                  fstate.setDev_errcommcount(rs.getInt("dev_errcommcount"));

                  fstate.setStationName(rs.getString("stationName"));

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

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

                  fstate.setBattgroupName(rs.getString("battgroupName"));

                  fstate.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));