From cc942a2f5a1d4453b8c4c6e5445527f83179b60f Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 26 七月 2024 10:57:14 +0800
Subject: [PATCH] 2024-7-26修改文件解析时容量百分比公式
---
src/main/java/com/whyc/dto/XmlFileOpreate.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/dto/XmlFileOpreate.java b/src/main/java/com/whyc/dto/XmlFileOpreate.java
index d0f861b..8bbed61 100644
--- a/src/main/java/com/whyc/dto/XmlFileOpreate.java
+++ b/src/main/java/com/whyc/dto/XmlFileOpreate.java
@@ -2,6 +2,7 @@
import com.whyc.pojo.*;
+import com.whyc.util.MathUtil;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
@@ -123,14 +124,22 @@
file_node=node.element("br_1");
String br=file_node.getTextTrim();
battData.setBr(br);
- float esCap=0f;
+ /*float esCap=0f;
if(battRes==0){
esCap=1;
}else{
esCap=battRes/Float.valueOf(br);
}
- battData.setEstimatedCap(esCap*battCap);
- battData.setBr(br);
+ battData.setEstimatedCap(esCap*battCap);*/
+ float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
+ //瀹归噺鐧惧垎姣斾慨鏀�
+ battData.setPreCapPercent(preCapPercent);
+ //棰勪及瀹归噺
+ battData.setEstimatedCap(preCapPercent*battCap);
+ //鍐呴樆鍋忓樊鐜�
+ float resDevRate=(Float.valueOf(br)-battRes)/battRes;
+ battData.setResDevRate(resDevRate);
+
file_node=node.element("bs_1");
battData.setBs(file_node.getTextTrim());
file_node=node.element("cr_1");
@@ -284,13 +293,22 @@
batt_node=file_node.element("br_1");
String br=batt_node.getTextTrim();
battData.setBr(br);
- float esCap=0f;
+ /* float esCap=0f;
if(battRes==0){
esCap=1;
}else{
esCap=battRes/Float.valueOf(br);
}
- battData.setEstimatedCap(esCap*battCap);
+ battData.setEstimatedCap(esCap*battCap);*/
+ float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
+ //瀹归噺鐧惧垎姣斾慨鏀�
+ battData.setPreCapPercent(preCapPercent);
+ //棰勪及瀹归噺
+ battData.setEstimatedCap(preCapPercent*battCap);
+ //鍐呴樆鍋忓樊鐜�
+ float resDevRate=(Float.valueOf(br)-battRes)/battRes;
+ battData.setResDevRate(resDevRate);
+
batt_node=file_node.element("bs_1");
battData.setBs(batt_node.getTextTrim());
batt_node=file_node.element("cr_1");
@@ -331,6 +349,8 @@
}
return fileInfo;
}
+
+
//瑙ｆ瀽xml鏂囦欢
public static FileInfo readXml(String xmlFilePath)
{
--
Gitblit v1.9.1