From e69df3cbc963522856846cb62ae1874ccb63ee8c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 九月 2024 16:44:17 +0800
Subject: [PATCH] 2024-9-19bug修改
---
src/main/java/com/whyc/dto/XmlFileOpreate.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/dto/XmlFileOpreate.java b/src/main/java/com/whyc/dto/XmlFileOpreate.java
index 4fbab25..1911faf 100644
--- a/src/main/java/com/whyc/dto/XmlFileOpreate.java
+++ b/src/main/java/com/whyc/dto/XmlFileOpreate.java
@@ -133,12 +133,12 @@
esCap=battRes/Float.valueOf(br);
}
battData.setEstimatedCap(esCap*battCap);*/
- float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
+ /* float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
//瀹归噺鐧惧垎姣斾慨鏀�
battData.setPreCapPercent(preCapPercent);
//棰勪及瀹归噺
battData.setEstimatedCap(preCapPercent*battCap);
- /* //鍐呴樆鍋忓樊鐜囪缃粯璁ゅ�间负0
+ //鍐呴樆鍋忓樊鐜囪缃粯璁ゅ�间负0
if(battRes==0){
battData.setResDevRate(Float.POSITIVE_INFINITY);
}else{
@@ -194,6 +194,11 @@
for (BattgroupData battData:battInfo.getBattDataList()) {
float resDevRate=(Float.valueOf(battData.getBr())-effRes)/effRes;
battData.setResDevRate(resDevRate);
+ float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(battData.getBr()),effRes);
+ //瀹归噺鐧惧垎姣斾慨鏀�
+ battData.setPreCapPercent(preCapPercent);
+ //棰勪及瀹归噺
+ battData.setEstimatedCap(preCapPercent*battCap);
}
fileInfo.setFileParam(fparam);
fiso.close();
@@ -332,7 +337,7 @@
esCap=battRes/Float.valueOf(br);
}
battData.setEstimatedCap(esCap*battCap);*/
- float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
+ /*float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
//瀹归噺鐧惧垎姣斾慨鏀�
battData.setPreCapPercent(preCapPercent);
//棰勪及瀹归噺
@@ -343,7 +348,7 @@
}else{
float resDevRate=(Float.valueOf(br)-battRes)/battRes;
battData.setResDevRate(resDevRate);
- }
+ }*/
batt_node=file_node.element("bs_1");
battData.setBs(batt_node.getTextTrim());
@@ -397,6 +402,11 @@
for (BattgroupData battData:battInfo.getBattDataList()) {
float resDevRate=(Float.valueOf(battData.getBr())-effRes)/effRes;
battData.setResDevRate(resDevRate);
+ float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(battData.getBr()),effRes);
+ //瀹归噺鐧惧垎姣斾慨鏀�
+ battData.setPreCapPercent(preCapPercent);
+ //棰勪及瀹归噺
+ battData.setEstimatedCap(preCapPercent*battCap);
}
}
}
--
Gitblit v1.9.1