From c87eefc568af56d327ab7ceca8969526f59b3d9b Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 10 一月 2023 17:39:29 +0800
Subject: [PATCH] 预付容量
---
src/main/java/com/whyc/dto/XmlFileOpreate.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/dto/XmlFileOpreate.java b/src/main/java/com/whyc/dto/XmlFileOpreate.java
index 663f4c0..9c8733d 100644
--- a/src/main/java/com/whyc/dto/XmlFileOpreate.java
+++ b/src/main/java/com/whyc/dto/XmlFileOpreate.java
@@ -105,6 +105,9 @@
if(file_node!=null){
fparam.setConnResBad(Float.parseFloat(file_node.getTextTrim()));
}
+
+ float battCap=fparam.getBattCap();//鏍囩О瀹归噺
+ float battRes=fparam.getBattRes();//鏍囩О鍐呴樆
//-----鏍规嵁groupNum鐨勫�艰鍙栨祴璇曟暟鎹�---------------------------//
Iterator nodes = rootnode.elementIterator("node_batt_num");
BattgroupInfo battInfo=new BattgroupInfo();
@@ -118,7 +121,10 @@
file_node=node.element("bv_1");
battData.setBv(file_node.getTextTrim());
file_node=node.element("br_1");
- battData.setBr(file_node.getTextTrim());
+ String br=file_node.getTextTrim();
+ battData.setBr(br);
+ battData.setEstimatedCap(Float.valueOf(br)/battRes*battCap);
+ battData.setBr(br);
file_node=node.element("bs_1");
battData.setBs(file_node.getTextTrim());
file_node=node.element("cr_1");
@@ -252,6 +258,10 @@
//-----鏍规嵁groupNum鐨勫�艰鍙栨祴璇曟暟鎹�---------------------------//
Iterator nodes = rootnode.elementIterator("node_group_num");
+
+ float battCap=fparam.getBattCap();//鏍囩О瀹归噺
+ float battRes=fparam.getBattRes();//鏍囩О鍐呴樆
+
if(nodes!=null){
while (nodes.hasNext()){
node= (Element) nodes.next();
@@ -266,7 +276,9 @@
batt_node=file_node.element("bv_1");
battData.setBv(batt_node.getTextTrim());
batt_node=file_node.element("br_1");
- battData.setBr(batt_node.getTextTrim());
+ String br=batt_node.getTextTrim();
+ battData.setBr(br);
+ battData.setEstimatedCap(Float.valueOf(br)/battRes*battCap);
batt_node=file_node.element("bs_1");
battData.setBs(batt_node.getTextTrim());
batt_node=file_node.element("cr_1");
--
Gitblit v1.9.1