~whychwj/haha.git

			@@ -78,6 +78,18 @@
			fs.getDCVolHighLimit(),fs.getChargeCurrSet(),fs.getMonomerTmp_High(),fs.getDev_id()});
			return bl;
			}
			//批量设置放电参数
			public boolean updatePro(Object obj) {
			Fbs9100_setparam fs=(Fbs9100_setparam) obj;
			String sql="update db_ram_db.tb_Fbs9100_setparam set testCmd=?,HourRate=?," +
			"DisCurr=?,DisCap=?,DisTime=?,groupVol_Low=?,monomerVol_Low=?,monomerLowCount=?,battGroupNum=?," +
			"onlineVolLowAction=?,dCVolHighLimit=?,chargeCurrSet=?,MonomerTmp_High=? where dev_id=?";
			Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{
			fs.getTestCmd(),fs.getHourRate(),fs.getDisCurr(),fs.getDisCap(),fs.getDisTime(),
			fs.getGroupVol_Low(),fs.getMonomerVol_Low(),fs.getMonomerLowCount(),fs.getBattGroupNum(),fs.getOnlineLowAction(),
			fs.getDCVolHighLimit(),fs.getChargeCurrSet(),fs.getMonomerTmp_High(),fs.getDev_id()});
			return bl;
			}
			//修改放电参数表中ld6
			public boolean updateld6Param(Object obj) {
			Fbs9100_setparam fs=(Fbs9100_setparam) obj;
			@@ -149,7 +161,7 @@
			//根据机房编号和维护区查询放电机房的信息和放电参数
			public List serchByCondition(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,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,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_fbs9100_setparam.HourRate,db_ram_db.tb_fbs9100_setparam.DisCurr,db_ram_db.tb_fbs9100_setparam.DisCap" +
			",db_ram_db.tb_fbs9100_setparam.DisTime,db_ram_db.tb_fbs9100_setparam.GroupVol_LOW,db_ram_db.tb_fbs9100_setparam.MonomerVol_LOW" +
			@@ -176,6 +188,7 @@
			BattInf binf=new BattInf();
			binf.setBattGroupId(rs.getInt("battGroupId"));
			binf.setStationName(rs.getString("stationName"));
			binf.setStationName5(rs.getString("stationName5"));
			binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
			binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
			binf.setBattGroupName(rs.getString("battGroupName"));
			@@ -243,6 +256,8 @@
			case FBS9100_ComBase.CMD_GetDischargeParm: m_cmd_ack = FBS9100_ComBase.CMD_GetDischargeParmAck; break;
			case FBS9100_ComBase.CMd_SetIp_Tem: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
			case FBS9100_ComBase.CMd_SetIp_Per: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
			case FBS9100_ComBase.CMD_ResetSystem: m_cmd_ack = FBS9100_ComBase.CMD_ResetSystemAck; break;
			case FBS9100_ComBase.CMD_READGPRS_BTS_TASK_INF: m_cmd_ack = FBS9100_ComBase.CMD_READGPRS_BTS_TASK_INFACK; break;
			default: return false;
			}
			String sql_end = "";
			@@ -294,7 +309,7 @@
			public List serchbyDev_id(Object obj) {
			Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
			String sql=" select db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,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_battinf.tb_battinf.GroupIndexInFBSDevice,db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.charge_curr_max" +
			",db_ram_db.tb_fbs9100_setparam.HourRate,db_ram_db.tb_fbs9100_setparam.DisCurr,db_ram_db.tb_fbs9100_setparam.DisCap" +
			",db_ram_db.tb_fbs9100_setparam.DisTime,db_ram_db.tb_fbs9100_setparam.GroupVol_LOW,db_ram_db.tb_fbs9100_setparam.MonomerVol_LOW" +
			",db_ram_db.tb_fbs9100_setparam.MonomerLowCount,db_ram_db.tb_fbs9100_setparam.OnlineVolLowAction" +
			@@ -321,6 +336,7 @@
			binf.setMonCount(rs.getInt("monCount"));
			binf.setMonVolStd(rs.getFloat("monVolStd"));
			binf.setMonCapStd(rs.getFloat("monCapStd"));
			binf.setCharge_curr_max(rs.getFloat("charge_curr_max"));
			fbs9100.setBinf(binf);

			Fbs9100_setparam fsparam=new Fbs9100_setparam();