From fdc6e85950d116dc26444a4d259f749944afad78 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 09 十一月 2022 12:04:26 +0800
Subject: [PATCH] 更新评价参数
---
src/main/java/com/whyc/service/BattGroupDataService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattGroupDataService.java b/src/main/java/com/whyc/service/BattGroupDataService.java
index e9f8e3c..99d412c 100644
--- a/src/main/java/com/whyc/service/BattGroupDataService.java
+++ b/src/main/java/com/whyc/service/BattGroupDataService.java
@@ -56,20 +56,29 @@
}
Float stdVol = param.getBattVol();
Float stdRes = param.getBattRes();
- Float volLowCoeK1 = param2.getVolLowCoeK1();
- Float volHighCoeK2 = param2.getVolHighCoeK2();
+ Float volLowCoeK1 = null;
+ Float volHighCoeK2 = null;
+ if(param.getBattVol() == 2){
+ volLowCoeK1 = param2.getVol2LowCoeK1();
+ volHighCoeK2 = param2.getVol2HighCoeK2();
+ }else{
+ volLowCoeK1 = param2.getVol12LowCoeK1();
+ volHighCoeK2 = param2.getVol12HighCoeK2();
+ }
Float resGoodCoeK3 = param2.getResGoodCoeK3();
Float resBadCoeK4 = param2.getResBadCoeK4();
Float chainRes = param.getChainRes();
+ Float finalVolLowCoeK = volLowCoeK1;
+ Float finalVolHighCoeK = volHighCoeK2;
dataList.forEach(data->{
//鍒ゆ柇澶勭悊闃堝��
Float br = Float.parseFloat(data.getBr());
Float bv = Float.parseFloat(data.getBv());
Float cr = Float.parseFloat(data.getCr()); //杩炴帴鏉￠樆鎶�
- if(bv < stdVol*volLowCoeK1){
+ if(bv < stdVol* finalVolLowCoeK){
data.setLowVolFlag(true);
- }else if(bv > stdVol*volHighCoeK2){
+ }else if(bv > stdVol* finalVolHighCoeK){
data.setHighVolFlag(true);
}
--
Gitblit v1.9.1