From 9c5a4fbb0be39954fc19a330cadbab1666bc13ad Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 26 十月 2022 14:52:52 +0800
Subject: [PATCH] 更新

---
 src/main/java/com/whyc/service/BattGroupDataService.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/whyc/service/BattGroupDataService.java b/src/main/java/com/whyc/service/BattGroupDataService.java
index 2786106..3128979 100644
--- a/src/main/java/com/whyc/service/BattGroupDataService.java
+++ b/src/main/java/com/whyc/service/BattGroupDataService.java
@@ -93,10 +93,11 @@
 
     public Map<String, String> getStandardDeviation(List<BattgroupData> monList) {
         Map<String,String> map = new HashMap<>();
-        List<Float> bvList = monList.stream().map(BattgroupData::getBv).collect(Collectors.toList());
-        List<Float> brList = monList.stream().map(BattgroupData::getBr).collect(Collectors.toList());
-        List<Float> crList = monList.stream().map(BattgroupData::getCr).collect(Collectors.toList());
-        List<Float> bsList = monList.stream().map(BattgroupData::getBs).collect(Collectors.toList());
+        List<Float> bvList = monList.stream().map(BattgroupData::getBv).map(Float::parseFloat).collect(Collectors.toList());
+        List<Float> brList = monList.stream().map(BattgroupData::getBr).map(Float::parseFloat).collect(Collectors.toList());
+        List<Float> crList = monList.stream().map(BattgroupData::getCr).map(Float::parseFloat).collect(Collectors.toList());
+        List<Float> bsList = monList.stream().map(BattgroupData::getBs).map(Float::parseFloat).collect(Collectors.toList());
+
         float stdDevBv = MathUtil.getStandardDeviation(bvList);
         float stdDevBr = MathUtil.getStandardDeviation(brList);
         float stdDevCr = MathUtil.getStandardDeviation(crList);
@@ -123,10 +124,10 @@
         List<String> resBalanceRate = new LinkedList<>();
         List<String> volBalanceRate = new LinkedList<>();
 
-        float sdBaseBr = MathUtil.getStandardDeviation(baseDataList.stream().map(BattgroupData::getBr).collect(Collectors.toList()));
-        float sdBaseBv = MathUtil.getStandardDeviation(baseDataList.stream().map(BattgroupData::getBv).collect(Collectors.toList()));
-        float sdBr = MathUtil.getStandardDeviation(dataList.stream().map(BattgroupData::getBr).collect(Collectors.toList()));
-        float sdBv = MathUtil.getStandardDeviation(dataList.stream().map(BattgroupData::getBv).collect(Collectors.toList()));
+        float sdBaseBr = MathUtil.getStandardDeviation(baseDataList.stream().map(BattgroupData::getBr).map(Float::parseFloat).collect(Collectors.toList()));
+        float sdBaseBv = MathUtil.getStandardDeviation(baseDataList.stream().map(BattgroupData::getBv).map(Float::parseFloat).collect(Collectors.toList()));
+        float sdBr = MathUtil.getStandardDeviation(dataList.stream().map(BattgroupData::getBr).map(Float::parseFloat).collect(Collectors.toList()));
+        float sdBv = MathUtil.getStandardDeviation(dataList.stream().map(BattgroupData::getBv).map(Float::parseFloat).collect(Collectors.toList()));
 
         resBalanceRate.add(sdBaseBr*10000/100+"%");
         resBalanceRate.add(sdBr*10000/100+"%");

--
Gitblit v1.9.1