From 2e8d22d216d1426de1d9848a5cdb886fbe834291 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 26 七月 2024 14:58:00 +0800
Subject: [PATCH] 2024-7-26修改文件解析时容量百分比公式
---
src/main/java/com/whyc/service/BattGroupDataService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattGroupDataService.java b/src/main/java/com/whyc/service/BattGroupDataService.java
index 172ab09..d1ca123 100644
--- a/src/main/java/com/whyc/service/BattGroupDataService.java
+++ b/src/main/java/com/whyc/service/BattGroupDataService.java
@@ -111,7 +111,7 @@
data.setHighChainResFlag1(true);
}
}
- //棰勪及瀹归噺
+ /*//棰勪及瀹归噺
if(stdRes==0){
data.setEstimatedCap(stdCap);
}else{
@@ -121,7 +121,15 @@
}else {
data.setEstimatedCap(stdRes / br * stdCap);
}
- }
+ }*/
+ float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),stdRes);
+ //瀹归噺鐧惧垎姣斾慨鏀�
+ data.setPreCapPercent(preCapPercent);
+ //棰勪及瀹归噺
+ data.setEstimatedCap(preCapPercent*stdCap);
+ //鍐呴樆鍋忓樊鐜�
+ float resDevRate=(Float.valueOf(br)-stdRes)/stdRes;
+ data.setResDevRate(resDevRate);
});
--
Gitblit v1.9.1