From 6ca12d78daab3ad1dec7f5bd6e1f26b6b5fd2f11 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 14:34:42 +0800
Subject: [PATCH] 批量设置放电参数的查询机房

---
 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
index a6f7600..fb869a3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -149,7 +149,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 +176,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 +244,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 +297,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 +324,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();

--
Gitblit v1.9.1