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 +++++++++---------
src/main/java/com/whyc/service/BattInfService.java | 5 -
src/main/java/com/whyc/constant/BattCapperformanceEnum.java | 8 +-
src/main/java/com/whyc/service/BatttestdataInfService.java | 71 +++++++++++------------
src/main/java/com/whyc/service/PowerInfService.java | 8 ++
src/main/java/com/whyc/controller/ConditionController.java | 9 +++
src/main/java/com/whyc/constant/PwrCapperformanceEnum.java | 16 ++--
7 files changed, 92 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/whyc/constant/Capperformance.java b/src/main/java/com/whyc/constant/BattCapperformanceEnum.java
similarity index 79%
rename from src/main/java/com/whyc/constant/Capperformance.java
rename to src/main/java/com/whyc/constant/BattCapperformanceEnum.java
index d498c8d..fb2f9d2 100644
--- a/src/main/java/com/whyc/constant/Capperformance.java
+++ b/src/main/java/com/whyc/constant/BattCapperformanceEnum.java
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-public enum Capperformance {
+public enum BattCapperformanceEnum {
BATTSTATE_1(1,"浼樼"),
BATTSTATE_2(2,"鍔ｅ寲"),
BATTSTATE_3(3,"鎹熷潖"),
@@ -13,7 +13,7 @@
private Integer stateId;
private String stateName;
- Capperformance(Integer stateId, String stateName) {
+ BattCapperformanceEnum(Integer stateId, String stateName) {
this.stateId = stateId;
this.stateName = stateName;
}
@@ -30,7 +30,7 @@
if(stateId==null){
return "";
}
- for (Capperformance ele : values()) {
+ for (BattCapperformanceEnum ele : values()) {
if(ele.getStateId().equals(stateId)) {
return ele.getStateName();
}
@@ -39,7 +39,7 @@
}
public static Map<Integer,String> getOpInfo() {
Map<Integer,String> map=new HashMap<>();
- for (Capperformance logOpEnum : Capperformance.values()) {
+ for (BattCapperformanceEnum logOpEnum : BattCapperformanceEnum.values()) {
map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
}
return map;
diff --git a/src/main/java/com/whyc/constant/Capperformance.java b/src/main/java/com/whyc/constant/PwrCapperformanceEnum.java
similarity index 70%
copy from src/main/java/com/whyc/constant/Capperformance.java
copy to src/main/java/com/whyc/constant/PwrCapperformanceEnum.java
index d498c8d..9d3c6bd 100644
--- a/src/main/java/com/whyc/constant/Capperformance.java
+++ b/src/main/java/com/whyc/constant/PwrCapperformanceEnum.java
@@ -3,17 +3,17 @@
import java.util.HashMap;
import java.util.Map;
-public enum Capperformance {
- BATTSTATE_1(1,"浼樼"),
- BATTSTATE_2(2,"鍔ｅ寲"),
- BATTSTATE_3(3,"鎹熷潖"),
- BATTSTATE_4(4,"鏈斁鐢�"),
+public enum PwrCapperformanceEnum {
+ PWRSTATE_1(1,"浼樼"),
+ PWRSTATE_2(2,"涓�鑸�"),
+ PWRSTATE_3(3,"棰勮"),
+ PWRSTATE_4(4,"涓ラ噸"),
;
private Integer stateId;
private String stateName;
- Capperformance(Integer stateId, String stateName) {
+ PwrCapperformanceEnum(Integer stateId, String stateName) {
this.stateId = stateId;
this.stateName = stateName;
}
@@ -30,7 +30,7 @@
if(stateId==null){
return "";
}
- for (Capperformance ele : values()) {
+ for (PwrCapperformanceEnum ele : values()) {
if(ele.getStateId().equals(stateId)) {
return ele.getStateName();
}
@@ -39,7 +39,7 @@
}
public static Map<Integer,String> getOpInfo() {
Map<Integer,String> map=new HashMap<>();
- for (Capperformance logOpEnum : Capperformance.values()) {
+ for (PwrCapperformanceEnum logOpEnum : PwrCapperformanceEnum.values()) {
map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
}
return map;
diff --git a/src/main/java/com/whyc/controller/ConditionController.java b/src/main/java/com/whyc/controller/ConditionController.java
index a2fb6a2..09fde63 100644
--- a/src/main/java/com/whyc/controller/ConditionController.java
+++ b/src/main/java/com/whyc/controller/ConditionController.java
@@ -38,6 +38,9 @@
private PwrdevAlarmService pwrAlmService;
@Autowired
+ private PowerInfService pinfService;
+
+ @Autowired
private DeviceStateService deviceStateService;
@Autowired
@@ -187,6 +190,12 @@
return binfService.getCapperformance();
}
+ @ApiOperation(value = "鑾峰彇鐢垫簮鎬ц兘(涓嬫媺)")
+ @GetMapping("getPwrCapperformance")
+ public Response getPwrCapperformance(){
+ return pinfService.getPwrCapperformance();
+ }
+
@ApiOperation(value = "鑾峰彇璁惧宸ヤ綔绫诲瀷(涓嬫媺)")
@GetMapping("getDevState")
public Response getDevState(){
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index ff303f2..34e7a4f 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.whyc.constant.Capperformance;
-import com.whyc.constant.PowerAlarmEnum;
+import com.whyc.constant.BattCapperformanceEnum;
import com.whyc.dto.BattDto;
import com.whyc.dto.InfoDto;
import com.whyc.dto.Param.ParamAlmDto;
@@ -450,7 +449,7 @@
}
//鑾峰彇瀹归噺鎬ц兘(涓嬫媺)
public Response getCapperformance() {
- Map<Integer,String> map= Capperformance.getOpInfo();
+ Map<Integer,String> map= BattCapperformanceEnum.getOpInfo();
return new Response().setII(1,true,map,"鑾峰彇瀹归噺鎬ц兘(涓嬫媺)");
}
//钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰16
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 47c4a55..954d64d 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -3,15 +3,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.whyc.constant.Capperformance;
-import com.whyc.constant.PowerAlarmEnum;
+import com.whyc.constant.BattCapperformanceEnum;
import com.whyc.constant.StopReasonEnum;
import com.whyc.dto.Real.TestDataDto;
import com.whyc.dto.Response;
import com.whyc.dto.Statistic.*;
import com.whyc.factory.BattCapFactory;
import com.whyc.mapper.BatttestdataInfMapper;
-import com.whyc.pojo.db_alarm.BattalarmData;
import com.whyc.pojo.db_batt_testdata.BatttestdataId;
import com.whyc.pojo.db_batt_testdata.BatttestdataInf;
import com.whyc.pojo.db_param.AppParam;
@@ -22,7 +20,6 @@
import com.whyc.pojo.db_user.Baojigroup;
import com.whyc.util.ActionUtil;
import com.whyc.util.PageInfoUtils;
-import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -305,7 +302,7 @@
if(tinf==null){
res.setRealCap(0f);
res.setPrecentCap("0");
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_4.getStateId()));
continue;
}
//鎵捐繖娆℃斁鐢电殑鏈�鍚庝竴绗旀暟鎹�
@@ -313,7 +310,7 @@
if(idDataList==null||idDataList.size()==0){
res.setRealCap(0f);
res.setPrecentCap("0");
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_4.getStateId()));
continue;
}
Float moncapStd=binf.getMoncapstd();
@@ -322,13 +319,13 @@
//Float restCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Rest);
res.setRealCap(grouprealCap);
if(grouprealCap>=moncapStd*badValue){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_1.getStateId()));
}
if(grouprealCap<=moncapStd*damageValue){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()));
}
if((grouprealCap>moncapStd*damageValue)&&(grouprealCap<moncapStd*badValue)){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()));
}
//淇濈暀5浣嶅皬鏁�
String precentCap = String.format("%.5f",(grouprealCap/binf.getMoncapstd()*100));
@@ -344,7 +341,7 @@
if(stic.getPerformance()==null){
reslist.add(res);
}else{
- if(res.getCapperformance().equals(Capperformance.getValue(stic.getPerformance()))){
+ if(res.getCapperformance().equals(BattCapperformanceEnum.getValue(stic.getPerformance()))){
reslist.add(res);
}
}
@@ -398,7 +395,7 @@
if(tinf==null){
res.setRealCap(0f);
res.setPrecentCap("0");
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()));
res.setStopReason("--");
continue;
}
@@ -409,13 +406,13 @@
//Float restCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Rest);
res.setRealCap(grouprealCap);
if(grouprealCap>=moncapStd*badValue){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_1.getStateId()));
}
if(grouprealCap<=moncapStd*damageValue){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()));
}
if((grouprealCap>moncapStd*damageValue)&&(grouprealCap<moncapStd*badValue)){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()));
}
//淇濈暀5浣嶅皬鏁�
String precentCap = String.format("%.5f",(grouprealCap/binf.getMoncapstd()*100));
@@ -425,7 +422,7 @@
if(stic.getPerformance()==null){
reslist.add(res);
}else{
- if(res.getCapperformance().equals(Capperformance.getValue(stic.getPerformance()))){
+ if(res.getCapperformance().equals(BattCapperformanceEnum.getValue(stic.getPerformance()))){
reslist.add(res);
}
}
@@ -496,18 +493,18 @@
String monprecentCap = String.format("%.5f",(monrealCap/binf.getMoncapstd()*100));
res.setMonprecentCap(monprecentCap);
if(monrealCap>=moncapStd*badValue){
- res.setMoncapperformance(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()));
+ res.setMoncapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_1.getStateId()));
}
if (monrealCap <= moncapStd * damageValue) {//鎹熷潖鐨�
- res.setMoncapperformance(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
+ res.setMoncapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()));
}
if((monrealCap>moncapStd*damageValue)&&(monrealCap<moncapStd*badValue)){
- res.setMoncapperformance(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()));
+ res.setMoncapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()));
}
if(stic.getPerformance()==null){
reslist.add(res);
}else{
- if(res.getMoncapperformance().equals(Capperformance.getValue(stic.getPerformance()))){
+ if(res.getMoncapperformance().equals(BattCapperformanceEnum.getValue(stic.getPerformance()))){
reslist.add(res);
}
}
@@ -536,11 +533,11 @@
res.setMonNum(i+1);
res.setMonrealCap(0f);
res.setMonprecentCap("0");
- res.setMoncapperformance(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
+ res.setMoncapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_4.getStateId()));
if(performance==null){
reslist.add(res);
}else{
- if(res.getMoncapperformance().equals(Capperformance.getValue(performance))){
+ if(res.getMoncapperformance().equals(BattCapperformanceEnum.getValue(performance))){
reslist.add(res);
}
}
@@ -697,19 +694,19 @@
res.setRealCap(grouprealCap);
//res.setDisChargeType(1);
if(grouprealCap>=moncapStd*badValue){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()));
- int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()));
- xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()),value+1);
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_1.getStateId()));
+ int value=xnmap.get(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_1.getStateId()));
+ xnmap.put(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_1.getStateId()),value+1);
}
if(grouprealCap<=moncapStd*damageValue){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
- int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
- xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()),value+1);
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()));
+ int value=xnmap.get(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()));
+ xnmap.put(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()),value+1);
}
if((grouprealCap>moncapStd*damageValue)&&(grouprealCap<moncapStd*badValue)){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()));
- int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()));
- xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()),value+1);
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()));
+ int value=xnmap.get(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()));
+ xnmap.put(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()),value+1);
}
reslist.add(res);
}
@@ -859,30 +856,30 @@
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime());
if(tinf==null){
res.setRealCap(0f);
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_4.getStateId()));
}else{
//鎵捐繖娆℃斁鐢电殑鏈�鍚庝竴绗旀暟鎹�
List<BatttestdataId> idDataList=battTestdataIdService.getLastDataByBattgroupId(tinf.getBattgroupId(),tinf.getTestRecordCount(),tinf.getRecordNum());
if(idDataList==null||idDataList.size()==0){
res.setRealCap(0f);
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_4.getStateId()));
}else{
Float moncapStd=binf.getMoncapstd();
int hourRate = BattCapFactory.GetHourRate(tinf.getTestCap(), tinf.getTestCurr());
Float grouprealCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Real);
res.setRealCap(grouprealCap);
if(grouprealCap>=moncapStd*badValue){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_1.getStateId()));
}
if(grouprealCap<=moncapStd*damageValue){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()));
}
if((grouprealCap>moncapStd*damageValue)&&(grouprealCap<moncapStd*badValue)){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()));
}
}
}
- if(res.getCapperformance().equals(Capperformance.getValue(stic.getPerformance()))){
+ if(res.getCapperformance().equals(BattCapperformanceEnum.getValue(stic.getPerformance()))){
reslist.add(res);
}
}
@@ -931,7 +928,7 @@
//鏌ヨ褰撳墠鐢垫睜缁勫綋鍓嶅崟浣撶數鍘嬫垨鑰呭崟浣撳唴闃讳綆浜庡叾鍗曚綋鐢靛帇鐨勪笅涓嬮檺鎴栭珮浜庝笂涓婇檺鍒ゅ畾褰撳墠鐢垫睜缁勫姡鍖�
int flag = rtdataService.getVolAndRes(binf.getBattgroupId());
if(flag==1){
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()));
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()));
reslist.add(res);
}
}
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));
diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index 00dbd6e..bc6bd61 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.whyc.constant.BattCapperformanceEnum;
+import com.whyc.constant.PwrCapperformanceEnum;
import com.whyc.dto.Param.ParamAlmDto;
import com.whyc.dto.PowerDto;
import com.whyc.dto.Response;
@@ -27,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
@Service
public class PowerInfService {
@@ -162,4 +165,9 @@
public List<Integer> getPowerIdList(ParamAlmDto dto) {
return mapper.getPowerIdList(dto);
}
+ //鑾峰彇鐢垫簮鎬ц兘(涓嬫媺)
+ public Response getPwrCapperformance() {
+ Map<Integer,String> map= PwrCapperformanceEnum.getOpInfo();
+ return new Response().setII(1,true,map,"鑾峰彇鐢垫簮鎬ц兘(涓嬫媺)");
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1