81041
2018-12-27 011a0a15a3959dbbeee92e2a522a6c30b3bdf4f7
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4381,7 +4381,7 @@
      /*Connection conn=DBUtil.getConn();
      String numberSql=" SELECT FOUND_ROWS() number";SQL_CALC_FOUND_ROWS*/
      String sql=" select  distinct(StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"
            + "FBSDeviceName,GroupIndexInFBSDevice,db_battinf.tb_battinf.battgroupId,BattGroupNum" +
            + "FBSDeviceName,GroupIndexInFBSDevice,db_battinf.tb_battinf.battgroupId,battGroupName" +
             ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax"
             + ",db_ram_db.tb_fbs9100_state.dev_version  "
            + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state "
@@ -4438,8 +4438,8 @@
                  binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
                  binf.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));
                  binf.setBattGroupId(rs.getInt("battGroupId"));
                  /*binf.setBattGroupNum(rs.getInt("battGroupNum"));
                  binf.setBattGroupName(rs.getString("battGroupName"));
                  /*binf.setBattGroupNum(rs.getInt("battGroupNum"));
                  binf.setFloatVolLevel(rs.getFloat("floatVolLevel"));
                  binf.setOfflineVolLevel(rs.getFloat("offlineVolLevel"));
                  binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));*/