From 84d879d9a0f5a5863f3b3edf31b264e9c64c31cb Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 09 六月 2025 17:34:51 +0800
Subject: [PATCH] 统计15，17添加未放电电池性能
---
src/main/java/com/whyc/dto/Statistic/BattCompareStic.java | 2 +-
src/main/java/com/whyc/service/BatttestdataInfService.java | 6 +++---
src/main/java/com/whyc/constant/Capperformance.java | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/constant/Capperformance.java b/src/main/java/com/whyc/constant/Capperformance.java
index 4809963..d498c8d 100644
--- a/src/main/java/com/whyc/constant/Capperformance.java
+++ b/src/main/java/com/whyc/constant/Capperformance.java
@@ -7,6 +7,7 @@
BATTSTATE_1(1,"浼樼"),
BATTSTATE_2(2,"鍔ｅ寲"),
BATTSTATE_3(3,"鎹熷潖"),
+ BATTSTATE_4(4,"鏈斁鐢�"),
;
private Integer stateId;
diff --git a/src/main/java/com/whyc/dto/Statistic/BattCompareStic.java b/src/main/java/com/whyc/dto/Statistic/BattCompareStic.java
index 91a1d5a..34814c2 100644
--- a/src/main/java/com/whyc/dto/Statistic/BattCompareStic.java
+++ b/src/main/java/com/whyc/dto/Statistic/BattCompareStic.java
@@ -14,7 +14,7 @@
private Integer uid;
private Integer pageNum;
private Integer pageSize;
- private Integer performance;//鐢垫睜鎬ц兘锛�1浼樼锛�2鍔ｅ寲锛�3鎹熷潖 涓嶄紶鍏ㄩ儴
+ private Integer performance;//鐢垫睜鎬ц兘锛�1浼樼锛�2鍔ｅ寲锛�3鎹熷潖 4鏈斁鐢� 涓嶄紶鍏ㄩ儴
private String product;
private Float moncapstd;//鏍囩О瀹归噺
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 7b6a5be..bffa249 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -290,7 +290,7 @@
if(tinf==null){
res.setRealCap(0f);
res.setPrecentCap("0");
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
+ res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
continue;
}
//鎵捐繖娆℃斁鐢电殑鏈�鍚庝竴绗旀暟鎹�
@@ -298,7 +298,7 @@
if(idDataList==null||idDataList.size()==0){
res.setRealCap(0f);
res.setPrecentCap("0");
- res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
+ res.setCapperformance(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
continue;
}
Float moncapStd=binf.getMoncapstd();
@@ -521,7 +521,7 @@
res.setMonNum(i+1);
res.setMonrealCap(0f);
res.setMonprecentCap("0");
- res.setMoncapperformance(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
+ res.setMoncapperformance(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
if(performance==null){
reslist.add(res);
}else{
--
Gitblit v1.9.1