From 83f444474e3cbe076b805e5de1cc32b1b263bcaf Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 25 七月 2023 10:43:15 +0800
Subject: [PATCH] 本年度蓄电池优劣分析修改
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 9d3f576..18f759a 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -332,11 +332,11 @@
//绠＄悊鍛橀椤电粺璁℃祴璇曚俊鎭�
public Map<String, Integer> analysisTestData(List<BatttestdataInf> list) {
Map<String, Integer> map = new HashMap<>();
- int disNum = 0;//鏀剧數
- int chNum = 0;//鍏呯數
+ /*int disNum = 0;//鏀剧數
+ int chNum = 0;//鍏呯數*/
int hrdisNum = 0;//鏍稿鏀剧數
int hrchNum = 0;//鏍稿鍏呯數
- Map<Integer, List<BatttestdataInf>> listDisMap = list.stream().collect(Collectors.groupingBy(tinf -> tinf.getTestType()));
+ /*Map<Integer, List<BatttestdataInf>> listDisMap = list.stream().collect(Collectors.groupingBy(tinf -> tinf.getTestType()));
for (Integer dis : listDisMap.keySet()) {
//鏀剧數
if (dis == 3) {
@@ -346,13 +346,19 @@
if (dis == 2) {
chNum = listDisMap.get(dis).size();
}
- }
+ }*/
Map<String, List<BatttestdataInf>> listMap = list.stream().collect(Collectors.groupingBy(tinf -> tinf.getTestType() + "_" + tinf.getTestStarttype()));
for (String type : listMap.keySet()) {
- //鏍稿鏀剧數
+ //鏍稿鏀剧數(姝ｅ父鏍稿娴嬭瘯涓哄墠鎻愶紝婊¤冻鍗曚綋涓嬮檺鍒帮紝缁勭涓嬮檺鍒帮紝娴嬭瘯瀹归噺鍒帮紝鏀剧數鏃堕棿鍒颁笖瓒呰繃2灏忔椂鐨勬暟鎹负涓�绗�)
+ // and test_stoptype in (3, 4, 6)
+ // or (test_stoptype=2 and test_timelong>=7200)
if (type.equals("3_3")) {
- hrdisNum = listMap.get(type).size();
-
+ for (BatttestdataInf tinf : listMap.get("3_3")) {
+ if ((tinf.getTestStoptype() == 3 || tinf.getTestStoptype() == 4 || tinf.getTestStoptype() == 6) ||
+ (tinf.getTestStoptype() == 2 && tinf.getTestTimelong() >= 7200)) {
+ hrdisNum += 1;
+ }
+ }
}
//鏍稿鍏呯數
if (type.equals("2_3")) {
@@ -361,8 +367,8 @@
}
map.put("hrdisNum", hrdisNum);
map.put("hrchNum", hrchNum);
- map.put("jcdisNum", disNum - hrdisNum);
- map.put("jcchNum", chNum - hrchNum);
+/* map.put("jcdisNum", disNum - hrdisNum);
+ map.put("jcchNum", chNum - hrchNum);*/
return map;
}
--
Gitblit v1.9.1