From e24744ff8b8aaa16ec75f33dd67a31e8fb94979d Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期一, 19 十一月 2018 14:48:22 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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..2afd9ac 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,7 @@
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;
default: return false;
}
String sql_end = "";
--
Gitblit v1.9.1