From fdc45803b0b4468508316efc5cfd90af9c63e9c9 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期六, 05 一月 2019 14:06:52 +0800
Subject: [PATCH] 电池放电参数设置批量
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 6 ++++--
1 files changed, 4 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 e2c4b09..eb87b4a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4385,11 +4385,11 @@
//鎵归噺璁剧疆鏀剧數鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁�
public List serchByDischarge(Object obj) {
BattInf binf=(BattInf) obj;
- Page page=binf.getPage();
+ //Page page=binf.getPage();
/*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,battGroupName" +
+ + "FBSDeviceName,GroupIndexInFBSDevice,db_battinf.tb_battinf.battgroupId,battGroupName,battGroupNum" +
",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 "
@@ -4430,6 +4430,7 @@
try {
while(rs.next()) {
BattInf binf = new BattInf();
+ binf.setNum(0);
binf.setStationId(rs.getString("stationId"));
binf.setStationName(rs.getString("stationName"));
binf.setStationName1(rs.getString("stationName1"));
@@ -4446,6 +4447,7 @@
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"));
--
Gitblit v1.9.1