From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9600_stateImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9600_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9600_stateImpl.java
index e5dc85b..4d18a9a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9600_stateImpl.java
+++ b/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"));
--
Gitblit v1.9.1