From 14f7839ff1c25cca8d9e7dad4d717973797ff2d9 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@192.168.10.3>
Date: 星期四, 27 十二月 2018 14:21:56 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 7c33d1d..f976d3b 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/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"));*/
--
Gitblit v1.9.1