From 5fd7d30fd4c9172543478c15496ce7c93b05f2d0 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 六月 2025 14:06:11 +0800
Subject: [PATCH] 蓄电池组1.2.5，1.2.6右侧图标整合
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 604b501..b5fccd7 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -690,11 +690,11 @@
//鐝粍
Map<String, Object> bzmap=new HashMap<>();
//鎬ц兘
- Map<Integer, Integer> xnmap=new HashMap<>();
- xnmap.put(1,0);
- xnmap.put(2,0);
- xnmap.put(3,0);
- xnmap.put(4,0);
+ Map<String, Integer> xnmap=new HashMap<>();
+ xnmap.put("浼樼",0);
+ xnmap.put("鍔ｅ寲",0);
+ xnmap.put("鎹熷潖",0);
+ xnmap.put("鏈斁鐢�",0);
//鏌ヨ鍑烘墍鏈夌殑鐝粍骞惰祴浜堝垵濮嬪��
setBanZuDefault(bzmap);
//鑾峰彇鏍稿浼樺姡锛屾崯鍧忓弬鏁�
@@ -723,8 +723,8 @@
//2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),null,null);
if(tinf==null){
- int value=xnmap.get(Capperformance.BATTSTATE_4.getStateId());
- xnmap.put(Capperformance.BATTSTATE_4.getStateId(),value+1);
+ int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
+ xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()),value+1);
if(!groupName.equals("none")){
BanZu bz= (BanZu) bzmap.get(groupName);
int nochargeNum=bz.getNochargeNum();
@@ -743,16 +743,16 @@
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);
if(grouprealCap>=moncapStd*badValue){
- int value=xnmap.get(Capperformance.BATTSTATE_1.getStateId());
- xnmap.put(Capperformance.BATTSTATE_1.getStateId(),value+1);
+ int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()));
+ xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()),value+1);
}
if(grouprealCap<=moncapStd*damageValue){
- int value=xnmap.get(Capperformance.BATTSTATE_3.getStateId());
- xnmap.put(Capperformance.BATTSTATE_3.getStateId(),value+1);
+ int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
+ xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()),value+1);
}
if((grouprealCap>moncapStd*damageValue)&&(grouprealCap<moncapStd*badValue)){
- int value=xnmap.get(Capperformance.BATTSTATE_2.getStateId());
- xnmap.put(Capperformance.BATTSTATE_2.getStateId(),value+1);
+ int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()));
+ xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()),value+1);
}
}
--
Gitblit v1.9.1