From 8a64c0856ead3b87a425ceb84c8ee3c70fd8cd54 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 09:07:56 +0800
Subject: [PATCH] 电源性能下拉
---
src/main/java/com/whyc/service/LeaderHomeService.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/whyc/service/LeaderHomeService.java b/src/main/java/com/whyc/service/LeaderHomeService.java
index 1281442..8303293 100644
--- a/src/main/java/com/whyc/service/LeaderHomeService.java
+++ b/src/main/java/com/whyc/service/LeaderHomeService.java
@@ -1,7 +1,7 @@
package com.whyc.service;
import com.whyc.constant.BattSingalIdEnum;
-import com.whyc.constant.Capperformance;
+import com.whyc.constant.BattCapperformanceEnum;
import com.whyc.constant.DevAlarmEnum;
import com.whyc.constant.PowerAlarmEnum;
import com.whyc.dto.*;
@@ -153,14 +153,14 @@
//鏈勾浼樿壇鍔ｅ寲鎹熷潖鏁伴噺
List<BattCapInfoDto> battCapInfoList = getBattCapInfo(battInfList,yearStartTime,null);
- long battGoodCount = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_1.getStateName())).count();
- long battBadCount = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName())).count();
- long battDamageCount = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName())).count();
+ long battGoodCount = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_1.getStateName())).count();
+ long battBadCount = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_2.getStateName())).count();
+ long battDamageCount = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_3.getStateName())).count();
//鍘诲勾浼樿壇鍔ｅ寲鎹熷潖鏁伴噺
List<BattCapInfoDto> battCapInfoListLastYear = getBattCapInfo(battInfList,lastYearStartTime,lastYearEndTime);
- long battGoodCountLastYear = battCapInfoListLastYear.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_1.getStateName())).count();
- long battBadCountLastYear = battCapInfoListLastYear.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName())).count();
- long battDamageCountLastYear = battCapInfoListLastYear.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName())).count();
+ long battGoodCountLastYear = battCapInfoListLastYear.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_1.getStateName())).count();
+ long battBadCountLastYear = battCapInfoListLastYear.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_2.getStateName())).count();
+ long battDamageCountLastYear = battCapInfoListLastYear.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_3.getStateName())).count();
map.put("battGoodCount", battGoodCount);
map.put("battBadCount", battBadCount);
map.put("battDamageCount", battDamageCount);
@@ -860,7 +860,7 @@
List<NameValueIntDto> data = new ArrayList<>();
List<NameValueListDto> data2 = new ArrayList<>();
//绛涢�夊嚭 绔欑偣浼樿壇,鍔ｅ寲,鎹熷潖 鐨勭數姹犵粍,骞舵寜鐓ц繖涓瓧娈靛垎缁�
- List<BattCapInfoDto> goodList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_1.getStateName()))
+ List<BattCapInfoDto> goodList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_1.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap).reversed()).collect(Collectors.toList());
if(goodList.size()==0){
data.add(new NameValueIntDto("浼樿壇",0));
@@ -869,7 +869,7 @@
data.add(new NameValueIntDto("浼樿壇",goodList.size()));
data2.add(new NameValueListDto("浼樿壇",goodList.subList(0, Math.min(goodList.size(), 2))));
}
- List<BattCapInfoDto> badList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName()))
+ List<BattCapInfoDto> badList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_2.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
if(badList.size()==0){
data.add(new NameValueIntDto("鍔ｅ寲",0));
@@ -878,7 +878,7 @@
data.add(new NameValueIntDto("鍔ｅ寲",badList.size()));
data2.add(new NameValueListDto("鍔ｅ寲",badList.subList(0, Math.min(badList.size(), 2))));
}
- List<BattCapInfoDto> damageList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName()))
+ List<BattCapInfoDto> damageList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_3.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
if(damageList.size()==0){
data.add(new NameValueIntDto("鎹熷潖",0));
@@ -906,9 +906,9 @@
List<NameValueListDto<NameValueDto>> data = new ArrayList<>();
brandMap.forEach((brand,battCapInfoListTemp)->{
//k -鍝佺墝
- long goodCount = battCapInfoListTemp.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_1.getStateName())).count();
- long badCount = battCapInfoListTemp.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName())).count();
- long damageCount = battCapInfoListTemp.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName())).count();
+ long goodCount = battCapInfoListTemp.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_1.getStateName())).count();
+ long badCount = battCapInfoListTemp.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_2.getStateName())).count();
+ long damageCount = battCapInfoListTemp.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_3.getStateName())).count();
long total = goodCount + badCount + damageCount;
//鑹ソ,鍔ｅ寲,鎹熷潖鐨勭櫨鍒嗘瘮.锛堜繚鐣�0浣嶅皬鏁帮級
int goodPercent = Math.round((float) goodCount / total * 100);
@@ -925,7 +925,7 @@
});
//data2,浼樿壇閲岄潰鏈�澶х殑鍜屾渶灏忕殑鍝佺墝
List<NameValueListDto<NameValueDto>> data2 = new ArrayList<>();
- List<BattCapInfoDto> goodList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_1.getStateName()))
+ List<BattCapInfoDto> goodList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_1.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
NameValueListDto<NameValueDto> goodListDto = new NameValueListDto<>();
List<NameValueDto> goodListValue = new ArrayList<>();
@@ -947,7 +947,7 @@
goodListDto.setValue(goodListValue);
data2.add(goodListDto);
//鍔ｅ寲閲岄潰鏈�澶х殑鍜屾渶灏忕殑鍝佺墝
- List<BattCapInfoDto> badList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName()))
+ List<BattCapInfoDto> badList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_2.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
NameValueListDto<NameValueDto> badListDto = new NameValueListDto<>();
List<NameValueDto> badListValue = new ArrayList<>();
@@ -970,7 +970,7 @@
data2.add(badListDto);
//鎹熷潖閲岄潰鏈�澶х殑鍜屾渶灏忕殑鍝佺墝
- List<BattCapInfoDto> damageList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName()))
+ List<BattCapInfoDto> damageList = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_3.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
NameValueListDto<NameValueDto> damageListDto = new NameValueListDto<>();
@@ -1034,9 +1034,9 @@
List<NameValueListDto<NameValueIntDto>> data = new ArrayList<>();
NameValueListDto<NameValueIntDto> time1Dto = new NameValueListDto<>();
time1Dto.setName(time1+"骞村唴");
- List<BattCapInfoDto> badListOfTime1 = time1List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName()))
+ List<BattCapInfoDto> badListOfTime1 = time1List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_2.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
- List<BattCapInfoDto> damageListOfTime1 = time1List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName()))
+ List<BattCapInfoDto> damageListOfTime1 = time1List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_3.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
NameValueIntDto time1BadDto = new NameValueIntDto();
time1BadDto.setName("鍔ｅ寲");
@@ -1048,9 +1048,9 @@
NameValueListDto<NameValueIntDto> time12Dto = new NameValueListDto<>();
time12Dto.setName(time1+"-"+time2+"骞�");
- List<BattCapInfoDto> badListOfTime12 = time12List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName()))
+ List<BattCapInfoDto> badListOfTime12 = time12List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_2.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
- List<BattCapInfoDto> damageListOfTime12 = time12List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName()))
+ List<BattCapInfoDto> damageListOfTime12 = time12List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_3.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
NameValueIntDto time12BadDto = new NameValueIntDto();
time12BadDto.setName("鍔ｅ寲");
@@ -1062,9 +1062,9 @@
NameValueListDto<NameValueIntDto> time2Dto = new NameValueListDto<>();
time2Dto.setName(time2+"骞翠互涓�");
- List<BattCapInfoDto> badListOfTime2 = time2List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName()))
+ List<BattCapInfoDto> badListOfTime2 = time2List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_2.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
- List<BattCapInfoDto> damageListOfTime2 = time2List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName()))
+ List<BattCapInfoDto> damageListOfTime2 = time2List.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(BattCapperformanceEnum.BATTSTATE_3.getStateName()))
.sorted(Comparator.comparing(BattCapInfoDto::getRealCap)).collect(Collectors.toList());
NameValueIntDto time2BadDto = new NameValueIntDto();
time2BadDto.setName("鍔ｅ寲");
@@ -1154,7 +1154,7 @@
if (testInf == null) {
capInfo.setRealCap(0f);
capInfo.setCapPercentage("0");
- capInfo.setPerformance(Capperformance.BATTSTATE_4.getStateName());
+ capInfo.setPerformance(BattCapperformanceEnum.BATTSTATE_4.getStateName());
continue;
}
//鎵捐繖娆℃斁鐢电殑鏈�鍚庝竴绗旀暟鎹�
@@ -1162,7 +1162,7 @@
if (idDataList == null || idDataList.size() == 0) {
capInfo.setRealCap(0f);
capInfo.setCapPercentage("0");
- capInfo.setPerformance(Capperformance.BATTSTATE_4.getStateName());
+ capInfo.setPerformance(BattCapperformanceEnum.BATTSTATE_4.getStateName());
continue;
}
Float moncapStd = battInf.getMoncapstd();
@@ -1170,13 +1170,13 @@
Float groupRealCap = (float) BattCapFactory.GetMonomerCap(testInf.getTestCap(), hourRate, testInf.getTestCap(), testInf.getMaxMonvol(), testInf.getMinMonvol(), testInf.getGroupVol(), BattCapFactory.CapType_Real);
capInfo.setRealCap(groupRealCap);
if (groupRealCap >= moncapStd * badValue) {
- capInfo.setPerformance(Capperformance.BATTSTATE_1.getStateName());
+ capInfo.setPerformance(BattCapperformanceEnum.BATTSTATE_1.getStateName());
}
if (groupRealCap <= moncapStd * damageValue) {
- capInfo.setPerformance(Capperformance.BATTSTATE_3.getStateName());
+ capInfo.setPerformance(BattCapperformanceEnum.BATTSTATE_3.getStateName());
}
if ((groupRealCap > moncapStd * damageValue) && (groupRealCap < moncapStd * badValue)) {
- capInfo.setPerformance(Capperformance.BATTSTATE_2.getStateName());
+ capInfo.setPerformance(BattCapperformanceEnum.BATTSTATE_2.getStateName());
}
//淇濈暀5浣嶅皬鏁�
String capPercentage = String.format("%.5f", (groupRealCap / battInf.getMoncapstd() * 100));
--
Gitblit v1.9.1