From d48ed9746c9235e043216f229873df7282bf8293 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期四, 19 十二月 2024 09:24:50 +0800
Subject: [PATCH] 整合充放电数据中的每一笔数据

---
 src/main/java/com/whyc/bts/BTS_DisChargeData.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/bts/BTS_DisChargeData.java b/src/main/java/com/whyc/bts/BTS_DisChargeData.java
index dfdcdc0..574d5ee 100644
--- a/src/main/java/com/whyc/bts/BTS_DisChargeData.java
+++ b/src/main/java/com/whyc/bts/BTS_DisChargeData.java
@@ -27,13 +27,13 @@
 	public BTS_DischargeParam dischargeParam;		//鏍稿鍙傛暟
 	public BTS_CapState capState;					//瀹归噺鍙傛暟
 	
-	public List<BTS_FbsData> fbsDatas;				//姣忔璁板綍鐨勫崟浣撴暟鎹�
+	public List<BTS_BattData> fbsDatas;				//姣忔璁板綍鐨勫崟浣撴暟鎹�
 	
 	public BTS_DisChargeData() {
 		battParam = new BTS_BattParam();
 		dischargeParam = new BTS_DischargeParam();
 		capState = new BTS_CapState();
-		fbsDatas = new ArrayList<BTS_FbsData>();
+		fbsDatas = new ArrayList<BTS_BattData>();
 	}
 
 	
@@ -90,7 +90,7 @@
         					//System.out.println(ComFn.bytesToHexString(databuf, databuf.length));
         					BTS_FbsData fbsData = new BTS_FbsData();
         					if(fbsData.putByteBuffer(bf, 0, 0)) {
-        						fbsDatas.add(fbsData);
+        						fbsDatas.add(fbsData.createBattData(battParam.EachGroupBattCount,capState.TestGroupNum));
         					}
         				}
         			}

--
Gitblit v1.9.1