From 83d2a2e0b10ed7e17dffc997d259a42b5f45260d Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 17 十一月 2022 15:00:51 +0800
Subject: [PATCH] 测试参数-高低压电压增加1.2v和6v,内阻更换
---
src/main/java/com/whyc/service/BattGroupDataService.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattGroupDataService.java b/src/main/java/com/whyc/service/BattGroupDataService.java
index a11dde1..308cd39 100644
--- a/src/main/java/com/whyc/service/BattGroupDataService.java
+++ b/src/main/java/com/whyc/service/BattGroupDataService.java
@@ -54,14 +54,24 @@
info.setDataList(dataList);
return info;
}
- Float stdVol = param.getBattVol();
+ //Float stdVol = param.getBattVol();
Float stdRes = param.getBattRes();
Float volLowCoeK1 = null;
Float volHighCoeK2 = null;
+ //鐢靛帇涓嶅悓,鐢靛帇闃堝�间笉鍚�
if(param.getBattVol() == 2){
volLowCoeK1 = param2.getVol2LowCoeK1();
volHighCoeK2 = param2.getVol2HighCoeK2();
- }else{
+ }
+ else if(param.getBattVol() == 1.2){
+ volLowCoeK1 = param2.getVol1d2LowCoeK1();
+ volHighCoeK2 = param2.getVol1d2HighCoeK2();
+ }
+ else if(param.getBattVol() == 6){
+ volLowCoeK1 = param2.getVol6LowCoeK1();
+ volHighCoeK2 = param2.getVol6HighCoeK2();
+ }
+ else{
volLowCoeK1 = param2.getVol12LowCoeK1();
volHighCoeK2 = param2.getVol12HighCoeK2();
}
@@ -82,16 +92,20 @@
data.setHighVolFlag(true);
}
- if(br > stdRes*resGoodCoeK3){
- if(br > stdRes*resBadCoeK4){
+ if(br > stdRes*resGoodCoeK3/100){
+ if(br > stdRes*resBadCoeK4/100){
data.setHighResFlag2(true);
}else{
data.setHighResFlag1(true);
}
}
- if(cr > chainRes*param2.getChainResCoeK5()){
- data.setHighChainResFlag(true);
+ if(cr > chainRes*param2.getChainResCoeK5()/100){
+ if(cr > chainRes*param2.getChainResChange()/100) {
+ data.setHighChainResFlag2(true);
+ }else {
+ data.setHighChainResFlag1(true);
+ }
}
});
--
Gitblit v1.9.1