Skip to content

T
tianjin-cement
Commit 5baf0b6b authored by 竹天卫's avatar 竹天卫
Browse files
Options

校核开始按照整理的公式 写countQnet_adMJ_kg

parent aecd115f
Show whitespace changes
Inline Side-by-side
Showing with 766 additions and 32 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java
View file @ 5baf0b6b
...@@ -176,14 +176,30 @@ public class CommonServiceImpl { ...@@ -176,14 +176,30 @@ public class CommonServiceImpl {
countMap.put(name,CheckCountUtil.checkCount(name,resultMap)); countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Fe2O3")){ }else if(name.equals("Fe2O3")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap)); countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Cl")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("CaO")){ }else if(name.equals("CaO")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap)); countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("MgO")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("TiO2")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("重量法_SO3")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("K2O")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Na2O")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("MnO")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Cl")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Mad1")){ }else if(name.equals("Mad1")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap)); countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Mad2")){ }else if(name.equals("Mad2")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap)); countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Aad1")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Aad2")) {
countMap.put(name, CheckCountUtil.checkCount(name, resultMap));
} }
...@@ -193,9 +209,9 @@ public class CommonServiceImpl { ...@@ -193,9 +209,9 @@ public class CommonServiceImpl {
//输出检测项第二次循环 //输出检测项第二次循环
for(String name : checkResutlList){ for(String name : checkResutlList){
if(name.equals("合量")){ if(name.equals("SO3")){
BigDecimal countHL = CheckCountUtil.countHL(countMap); BigDecimal countSO3 = CheckCountUtil.countSO3(countMap);
countMap.put(name, countHL); countMap.put(name, countSO3);
}else if(name.equals("KH")){ }else if(name.equals("KH")){
BigDecimal countKH = CheckCountUtil.countKH(countMap); BigDecimal countKH = CheckCountUtil.countKH(countMap);
countMap.put(name, countKH); countMap.put(name, countKH);
...@@ -208,16 +224,115 @@ public class CommonServiceImpl { ...@@ -208,16 +224,115 @@ public class CommonServiceImpl {
}else if(name.equals("易烧性等级")){ }else if(name.equals("易烧性等级")){
String burnupLevel = CheckCountUtil.countBurnupLevel(resultMap,countMap); String burnupLevel = CheckCountUtil.countBurnupLevel(resultMap,countMap);
countMap.put(name, burnupLevel); countMap.put(name, burnupLevel);
}else if(name.equals("报出_Mad")){
BigDecimal countBCMad = CheckCountUtil.countBCMad(countMap);
countMap.put(name, countBCMad);
}else if(name.equals("报出_Aad")){
BigDecimal countBCAad = CheckCountUtil.countBCAad(countMap);
countMap.put(name, countBCAad);
}
}
//输出检测项第三次循环
for(String name : checkResutlList){
if(name.equals("合量")){
BigDecimal countHL = CheckCountUtil.countHL(countMap);
countMap.put(name, countHL);
}else if(name.equals("Mad")){ }else if(name.equals("Mad")){
BigDecimal countMad = CheckCountUtil.countMad(countMap); BigDecimal countMad = CheckCountUtil.countMad(countMap);
countMap.put(name, countMad); countMap.put(name, countMad);
}else if(name.equals("Aad")){
BigDecimal countAad = CheckCountUtil.countAad(countMap);
countMap.put(name, countAad);
}else if(name.equals("Vad1")){
BigDecimal countVad1 = CheckCountUtil.countVad1(resultMap, countMap);
countMap.put(name, countVad1);
}else if(name.equals("Vad2")) {
BigDecimal countVad2 = CheckCountUtil.countVad2(resultMap, countMap);
countMap.put(name, countVad2);
}else if(name.equals("Mad判断")) {
Integer countMadPD = CheckCountUtil.countMadPD(countMap);
countMap.put(name, countMadPD);
}else if(name.equals("Ad")) {
BigDecimal countAd = CheckCountUtil.countAd(countMap);
countMap.put(name, countAd);
}
}
//输出检测项第四次循环
for(String name : checkResutlList){
if(name.equals("报出_Vad")){
BigDecimal countBCVad = CheckCountUtil.countBCVad(countMap);
countMap.put(name, countBCVad);
}else if(name.equals("Ad系数0.1或0")) {
BigDecimal countAdXS = CheckCountUtil.countAdXS(countMap);
countMap.put(name, countAdXS);
}else if(name.equals("Vdaf系数0.8~0.95")) {
BigDecimal countVdafXS = CheckCountUtil.countVdafXS(countMap);
countMap.put(name, countVdafXS);
} }
}
//输出检测项第五次循环
for(String name : checkResutlList){
if(name.equals("Vad")){
BigDecimal countVad = CheckCountUtil.countVad(countMap);
countMap.put(name, countVad);
}
}
//输出检测项第六次循环
for(String name : checkResutlList){
if(name.equals("Vdaf")){
BigDecimal countVdaf = CheckCountUtil.countVdaf(countMap);
countMap.put(name, countVdaf);
}
}
//输出检测项第七次循环
for(String name : checkResutlList){
if(name.equals("K1,")){
BigDecimal countK1_ = CheckCountUtil.countK1_(countMap);
countMap.put(name, countK1_);
}else if(name.equals("K")) {
String countK = CheckCountUtil.countK(resultMap, countMap);
countMap.put(name, countK);
}else if(name.equals("Vdaf判断")) {
Integer countVdafPD = CheckCountUtil.countVdafPD(countMap);
countMap.put(name, countVdafPD);
}else if(name.equals("V,daf")) {
BigDecimal countV_daf = CheckCountUtil.countV_daf(countMap);
countMap.put(name, countV_daf);
} }
}
//输出检测项第八次循环
for(String name : checkResutlList){
if(name.equals("40Mad 0或1")){
BigDecimal count40Mad0Or1 = CheckCountUtil.count40Mad0Or1(countMap);
countMap.put(name, count40Mad0Or1);
}else if(name.equals("K0,")) {
BigDecimal countK0_ = CheckCountUtil.countK0_(countMap);
countMap.put(name, countK0_);
}
}
//输出检测项第九次循环
//todo countQnet_adMJ_kg
/*for(String name : checkResutlList){
if(name.equals("Qnet,ad MJ/kg")){
BigDecimal countQnet_adMJ_kg = CheckCountUtil.countQnet_adMJ_kg(countMap);
countMap.put(name, countQnet_adMJ_kg);
}
}
*/
......
cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java
View file @ 5baf0b6b
...@@ -13,7 +13,7 @@ import java.util.List; ...@@ -13,7 +13,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* excel工具类 * 校核计算工具类
* *
* @author zhutianwei * @author zhutianwei
* *
...@@ -89,7 +89,7 @@ public class CheckCountUtil { ...@@ -89,7 +89,7 @@ public class CheckCountUtil {
BigDecimal TAl2O3 = getBigDecimal(resultMap.get("TAl2O3")); BigDecimal TAl2O3 = getBigDecimal(resultMap.get("TAl2O3"));
BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl2O3")); BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl2O3"));
BigDecimal K = getBigDecimal(resultMap.get("K")); BigDecimal K = getBigDecimal(resultMap.get("K"));
BigDecimal VCuSO4_I = getBigDecimal(resultMap.get("VCuSO4（I）")); BigDecimal VCuSO4_I = getBigDecimal(resultMap.get("VCuSO4(I)"));
BigDecimal m = getBigDecimal(resultMap.get("样重m")); BigDecimal m = getBigDecimal(resultMap.get("样重m"));
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = TAl2O3.multiply(VAl2O3.subtract(K.multiply(VCuSO4_I))).divide(m); BigDecimal countResult = TAl2O3.multiply(VAl2O3.subtract(K.multiply(VCuSO4_I))).divide(m);
...@@ -104,9 +104,9 @@ public class CheckCountUtil { ...@@ -104,9 +104,9 @@ public class CheckCountUtil {
BigDecimal TAl2O3 = getBigDecimal(resultMap.get("TAl2O3")); BigDecimal TAl2O3 = getBigDecimal(resultMap.get("TAl2O3"));
BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl2O3")); BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl2O3"));
BigDecimal K = getBigDecimal(resultMap.get("K")); BigDecimal K = getBigDecimal(resultMap.get("K"));
BigDecimal VCuSO4_I = getBigDecimal(resultMap.get("VCuSO4（I）")); BigDecimal VCuSO4_I = getBigDecimal(resultMap.get("VCuSO4(I)"));
BigDecimal m = getBigDecimal(resultMap.get("样重m")); BigDecimal m = getBigDecimal(resultMap.get("样重m"));
BigDecimal VCuSO4_II = getBigDecimal(resultMap.get("VCuSO4（II）")); BigDecimal VCuSO4_II = getBigDecimal(resultMap.get("VCuSO4(II)"));
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = TAl2O3.multiply(VAl2O3.subtract(K.multiply(VCuSO4_I.add(VCuSO4_II)))).divide(m); BigDecimal countResult = TAl2O3.multiply(VAl2O3.subtract(K.multiply(VCuSO4_I.add(VCuSO4_II)))).divide(m);
BigDecimal result1 = countResult.multiply(param100); BigDecimal result1 = countResult.multiply(param100);
...@@ -129,26 +129,40 @@ public class CheckCountUtil { ...@@ -129,26 +129,40 @@ public class CheckCountUtil {
}else{ }else{
endResult = countResult.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_UP); endResult = countResult.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
} }
}else if(name.equals("Cl")){ }else if(name.equals("CaO")){
BigDecimal T = getBigDecimal(resultMap.get("T")); BigDecimal TCaO = getBigDecimal(resultMap.get("TCaO"));
BigDecimal V2 = getBigDecimal(resultMap.get("V2")); BigDecimal VCaO = getBigDecimal(resultMap.get("VCaO"));
BigDecimal V1 = getBigDecimal(resultMap.get("V1")); BigDecimal m = getBigDecimal(resultMap.get("样重m"));
BigDecimal mCl = getBigDecimal(resultMap.get("样重Cl"));
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = T.multiply(V2.subtract(V1)).divide(mCl).divide(param10); BigDecimal countResult = TCaO.multiply(VCaO).divide(m);
BigDecimal result1 = countResult.multiply(param1000); BigDecimal result1 = countResult.multiply(param100);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue(); int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
if((resultInt1&1) == 1){ //如果结果为奇数 if((resultInt1&1) == 1){ //如果结果为奇数
endResult = countResult.setScale(3,BigDecimal.ROUND_HALF_UP); endResult = countResult.setScale(2,BigDecimal.ROUND_HALF_UP);
}else{ }else{
endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(3,BigDecimal.ROUND_HALF_UP); endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
} }
}else if(name.equals("CaO")){ }else if(name.equals("MgO")){
BigDecimal TCaO = getBigDecimal(resultMap.get("TCaO")); BigDecimal TMgO = getBigDecimal(resultMap.get("TMgO"));
BigDecimal VMgO = getBigDecimal(resultMap.get("VMgO"));
BigDecimal VCaO = getBigDecimal(resultMap.get("VCaO")); BigDecimal VCaO = getBigDecimal(resultMap.get("VCaO"));
BigDecimal m = getBigDecimal(resultMap.get("样重m")); BigDecimal m = getBigDecimal(resultMap.get("样重m"));
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = TCaO.multiply(VCaO).divide(m); BigDecimal countResult = TMgO.multiply(VMgO.subtract(VCaO)).divide(m);
BigDecimal result1 = countResult.multiply(param100);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
if((resultInt1&1) == 1){ //如果结果为奇数
endResult = countResult.setScale(2,BigDecimal.ROUND_HALF_UP);
}else{
endResult = countResult.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
}else if(name.equals("TiO2")){
BigDecimal TTiO2 = getBigDecimal(resultMap.get("TTiO2"));
BigDecimal VCuSO4_II = getBigDecimal(resultMap.get("VCuSO4(II)"));
BigDecimal K = getBigDecimal(resultMap.get("K"));
BigDecimal m = getBigDecimal(resultMap.get("样重m"));
//计算的核心公式结果
BigDecimal countResult = TTiO2.multiply(VCuSO4_II).multiply(K).divide(m);
BigDecimal result1 = countResult.multiply(param100); BigDecimal result1 = countResult.multiply(param100);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue(); int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
if((resultInt1&1) == 1){ //如果结果为奇数 if((resultInt1&1) == 1){ //如果结果为奇数
...@@ -156,7 +170,29 @@ public class CheckCountUtil { ...@@ -156,7 +170,29 @@ public class CheckCountUtil {
}else{ }else{
endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP); endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
} }
}else if(name.equals("MnO")){ }else if(name.equals("重量法_SO3")){
BigDecimal m2 = getBigDecimal(resultMap.get("烧重m2"));
BigDecimal m1 = getBigDecimal(resultMap.get("埚重m1"));
BigDecimal m3 = getBigDecimal(resultMap.get("空白m3"));
BigDecimal m = getBigDecimal(resultMap.get("样重m"));
//计算的核心公式结果
BigDecimal countResult = m2.subtract(m1).subtract(m3).divide(m).multiply(new BigDecimal(0.343));
endResult = countResult.multiply(param100);
}else if(name.equals("K2O")){
BigDecimal CK2O = getBigDecimal(resultMap.get("CK2O"));
BigDecimal V = getBigDecimal(resultMap.get("V"));
BigDecimal AK2O = getBigDecimal(resultMap.get("AK2O"));
BigDecimal mR20 = getBigDecimal(resultMap.get("样重R2O"));
//计算的核心公式结果
BigDecimal countResult = CK2O.multiply(V).multiply(AK2O).divide(mR20).divide(param10000);
BigDecimal result1 = countResult.multiply(param100);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
if((resultInt1&1) == 1){ //如果结果为奇数
endResult = countResult.setScale(2,BigDecimal.ROUND_HALF_UP);
}else{
endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
}else if(name.equals("Na2O")){
BigDecimal CNa2O = getBigDecimal(resultMap.get("CNa2O")); BigDecimal CNa2O = getBigDecimal(resultMap.get("CNa2O"));
BigDecimal V = getBigDecimal(resultMap.get("V")); BigDecimal V = getBigDecimal(resultMap.get("V"));
BigDecimal ANa2O = getBigDecimal(resultMap.get("ANa2O")); BigDecimal ANa2O = getBigDecimal(resultMap.get("ANa2O"));
...@@ -170,6 +206,34 @@ public class CheckCountUtil { ...@@ -170,6 +206,34 @@ public class CheckCountUtil {
}else{ }else{
endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP); endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
} }
}else if(name.equals("MnO")){
BigDecimal CMnO = getBigDecimal(resultMap.get("CMnO"));
BigDecimal V = getBigDecimal(resultMap.get("V"));
BigDecimal AMnO = getBigDecimal(resultMap.get("AMnO"));
BigDecimal mR20 = getBigDecimal(resultMap.get("样重R2O"));
//计算的核心公式结果
BigDecimal countResult = CMnO.multiply(V).multiply(AMnO).divide(mR20).divide(param10000);
BigDecimal result1 = countResult.multiply(param100);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
if((resultInt1&1) == 1){ //如果结果为奇数
endResult = countResult.setScale(2,BigDecimal.ROUND_HALF_UP);
}else{
endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
}else if(name.equals("Cl")){
BigDecimal T = getBigDecimal(resultMap.get("T"));
BigDecimal V2 = getBigDecimal(resultMap.get("V2"));
BigDecimal V1 = getBigDecimal(resultMap.get("V1"));
BigDecimal mCl = getBigDecimal(resultMap.get("样重Cl"));
//计算的核心公式结果
BigDecimal countResult = T.multiply(V2.subtract(V1)).divide(mCl).divide(param10);
BigDecimal result1 = countResult.multiply(param1000);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
if((resultInt1&1) == 1){ //如果结果为奇数
endResult = countResult.setScale(3,BigDecimal.ROUND_HALF_UP);
}else{
endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(3,BigDecimal.ROUND_HALF_UP);
}
}else if(name.equals("Mad1")){ }else if(name.equals("Mad1")){
BigDecimal YZ_M1 = getBigDecimal(resultMap.get("样重M1")); BigDecimal YZ_M1 = getBigDecimal(resultMap.get("样重M1"));
BigDecimal MZ_M1 = getBigDecimal(resultMap.get("⽫重M1")); BigDecimal MZ_M1 = getBigDecimal(resultMap.get("⽫重M1"));
...@@ -184,13 +248,54 @@ public class CheckCountUtil { ...@@ -184,13 +248,54 @@ public class CheckCountUtil {
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = YZ_M2.add(MZ_M2).subtract(SZ_M2).divide(YZ_M2); BigDecimal countResult = YZ_M2.add(MZ_M2).subtract(SZ_M2).divide(YZ_M2);
endResult = countResult.multiply(param100); endResult = countResult.multiply(param100);
}else if(name.equals("Aad1")){
BigDecimal SZ_A1 = getBigDecimal(resultMap.get("烧重A1"));
BigDecimal MZ_A1 = getBigDecimal(resultMap.get("⽫重A1"));
BigDecimal YZ_A1 = getBigDecimal(resultMap.get("样重A1"));
//计算的核心公式结果
BigDecimal countResult = SZ_A1.subtract(MZ_A1).divide(YZ_A1);
endResult = countResult.multiply(param100);
}else if(name.equals("Aad2")){
BigDecimal SZ_A2 = getBigDecimal(resultMap.get("烧重A2"));
BigDecimal MZ_A2 = getBigDecimal(resultMap.get("⽫重A2"));
BigDecimal YZ_A2 = getBigDecimal(resultMap.get("样重A2"));
//计算的核心公式结果
BigDecimal countResult = SZ_A2.subtract(MZ_A2).divide(YZ_A2);
endResult = countResult.multiply(param100);
} }
return endResult; return endResult;
} }
/** /**
* 求合量 L.O.I+SiO2+Al2O3+Fe2O3+CaO+MgO+TiO2+K2O+Na2O+MnO+SO3 * 求SO3
* @param countMap
* @return
*/
public static BigDecimal countSO3(Map<String, Object> countMap) {
BigDecimal weightSO3 = getBigDecimal(countMap.get("重量法_SO3"));
BigDecimal displaySO3= getBigDecimal(countMap.get("显示值"));
BigDecimal mSO3= getBigDecimal(countMap.get("样重SO3"));
BigDecimal elseResult = displaySO3.multiply(new BigDecimal(2.5));
BigDecimal countResult = weightSO3.compareTo(new BigDecimal(0))==1?
weightSO3:elseResult;
BigDecimal result1 = countResult.multiply(param1000);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
BigDecimal count = null;
if((resultInt1&1) == 1){ //如果结果为奇数
BigDecimal jsResult = weightSO3.compareTo(new BigDecimal(0))==1?
weightSO3:elseResult.multiply(mSO3).divide(mSO3);
count = jsResult.setScale(3,BigDecimal.ROUND_HALF_UP);
}else{
BigDecimal osResult = weightSO3.compareTo(new BigDecimal(0))==1?
weightSO3:elseResult.multiply(mSO3).divide(mSO3);
count = osResult.subtract(new BigDecimal(0.00000000001)).setScale(3,BigDecimal.ROUND_HALF_UP);
}
return count;
}
/**
* 求合量 L.O.I+SiO2+(Al2O3+TiO2)+Al2O3+Fe2O3+CaO+MgO+TiO2+K2O+Na2O+MnO+SO3
* @param countMap * @param countMap
* @return * @return
*/ */
...@@ -198,6 +303,7 @@ public class CheckCountUtil { ...@@ -198,6 +303,7 @@ public class CheckCountUtil {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.add(countMap.get("L.O.I").toString()); list.add(countMap.get("L.O.I").toString());
list.add(countMap.get("SiO2").toString()); list.add(countMap.get("SiO2").toString());
list.add(countMap.get("Al2O3+TiO2").toString());
list.add(countMap.get("Al2O3").toString()); list.add(countMap.get("Al2O3").toString());
list.add(countMap.get("Fe2O3").toString()); list.add(countMap.get("Fe2O3").toString());
list.add(countMap.get("CaO").toString()); list.add(countMap.get("CaO").toString());
...@@ -225,7 +331,7 @@ public class CheckCountUtil { ...@@ -225,7 +331,7 @@ public class CheckCountUtil {
BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe2O3")); BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe2O3"));
BigDecimal SiO2 = getBigDecimal(countMap.get("SiO2")); BigDecimal SiO2 = getBigDecimal(countMap.get("SiO2"));
BigDecimal KH = BigDecimal KH =
CaO.subtract(new BigDecimal(1.65).multiply(Al2O3_TiO2).multiply(Fe2O3)).divide(new BigDecimal(2.8)).divide(SiO2); CaO.subtract(new BigDecimal(1.65).multiply(Al2O3_TiO2)).subtract(new BigDecimal(0.35).multiply(Fe2O3)).divide(new BigDecimal(2.8)).divide(SiO2);
return KH; return KH;
} }
...@@ -256,11 +362,6 @@ public class CheckCountUtil { ...@@ -256,11 +362,6 @@ public class CheckCountUtil {
/** /**
* 求易烧性等级 * 求易烧性等级
* A fCaO 1450 =<18.75 * “KH” - 16
* B fCaO 1450 >18.75 * “KH” - 16
* C fCaO 1450”>26.25 * “KH” - 22.15
* D fCaO 1450”>35 * “KH” - 29.3
* E fCaO 1450”>45 * “KH” - 37.4
* @param resultMap 输入集合 * @param resultMap 输入集合
* @param countMap 输出集合 * @param countMap 输出集合
* @return * @return
...@@ -286,15 +387,25 @@ public class CheckCountUtil { ...@@ -286,15 +387,25 @@ public class CheckCountUtil {
} }
/** /**
* 求Mad （Mad1 + Mad2 ）/ 2 结果奇偶数判断后的结果 * 求报出_Mad （Mad1 + Mad2 ）/ 2
* @param countMap * @param countMap
* @return * @return
*/ */
public static BigDecimal countMad(Map<String, Object> countMap) { public static BigDecimal countBCMad(Map<String, Object> countMap) {
BigDecimal Mad1= getBigDecimal(countMap.get("Mad1")); BigDecimal Mad1= getBigDecimal(countMap.get("Mad1"));
BigDecimal Mad2= getBigDecimal(countMap.get("Mad2")); BigDecimal Mad2= getBigDecimal(countMap.get("Mad2"));
//计算Mad1 和 Mad2 的平均值 //计算Mad1 和 Mad2 的平均值
BigDecimal MadAve = Mad1.add(Mad2).divide(new BigDecimal(2)); BigDecimal MadAve = Mad1.add(Mad2).divide(new BigDecimal(2));
return MadAve;
}
/**
* 求Mad 报出_Mad *100 判断奇偶数判断后的结果
* @param countMap
* @return
*/
public static BigDecimal countMad(Map<String, Object> countMap) {
BigDecimal MadAve= getBigDecimal(countMap.get("报出_Mad"));
//判断奇偶数的最终值 //判断奇偶数的最终值
BigDecimal result1 = MadAve.multiply(param100); BigDecimal result1 = MadAve.multiply(param100);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue(); int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
...@@ -307,15 +418,284 @@ public class CheckCountUtil { ...@@ -307,15 +418,284 @@ public class CheckCountUtil {
return Mad; return Mad;
} }
/**
* 求报出_Aad (Aad1 + Aad2)/2
* @param countMap
* @return
*/
public static BigDecimal countBCAad(Map<String, Object> countMap) {
BigDecimal Aad1= getBigDecimal(countMap.get("Aad1"));
BigDecimal Aad2= getBigDecimal(countMap.get("Aad2"));
//计算Mad1 和 Mad2 的平均值
BigDecimal AadAve = Aad1.add(Aad2).divide(new BigDecimal(2));
return AadAve;
}
/**
* 求Aad 报出_Aad *100 判断奇偶数判断后的结果
* @param countMap
* @return
*/
public static BigDecimal countAad(Map<String, Object> countMap) {
BigDecimal AadAve= getBigDecimal(countMap.get("报出_Aad"));
//判断奇偶数的最终值
BigDecimal result1 = AadAve.multiply(param100);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
BigDecimal Aad = null;
if((resultInt1&1) == 1){ //如果结果为奇数
Aad = AadAve.setScale(2,BigDecimal.ROUND_HALF_UP);
}else{
Aad = AadAve.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
return Aad;
}
/**
* 求Vad1
* @param resultMap
* @param countMap
* @return
*/
public static BigDecimal countVad1(Map<String, Object> resultMap, Map<String, Object> countMap) {
BigDecimal YZ_V1 = getBigDecimal(resultMap.get("样重V1"));
BigDecimal MZ_V1 = getBigDecimal(resultMap.get("皿重V1"));
BigDecimal SZ_V1 = getBigDecimal(resultMap.get("烧重V1"));
BigDecimal BC_Mad = getBigDecimal(resultMap.get("报出_Mad"));
//计算的核心公式结果
BigDecimal countResult = YZ_V1.add(MZ_V1).subtract(SZ_V1).divide(YZ_V1);
BigDecimal count = countResult.multiply(param100).subtract(BC_Mad);
return count;
}
/**
* 求Vad2
* @param resultMap
* @param countMap
* @return
*/
public static BigDecimal countVad2(Map<String, Object> resultMap, Map<String, Object> countMap) {
BigDecimal YZ_V2 = getBigDecimal(resultMap.get("样重V2"));
BigDecimal MZ_V2 = getBigDecimal(resultMap.get("皿重V2"));
BigDecimal SZ_V2 = getBigDecimal(resultMap.get("烧重V2"));
BigDecimal BC_Mad = getBigDecimal(countMap.get("报出_Mad"));
//计算的核心公式结果
BigDecimal countResult = YZ_V2.add(MZ_V2).subtract(SZ_V2).divide(YZ_V2);
BigDecimal count = countResult.multiply(param100).subtract(BC_Mad);
return count;
}
/**
* 求报出_Vad (Vad1+ Vad2)/2
* @param countMap
* @return
*/
public static BigDecimal countBCVad(Map<String, Object> countMap) {
BigDecimal Vad1= getBigDecimal(countMap.get("Vad1"));
BigDecimal Vad2= getBigDecimal(countMap.get("Vad2"));
//计算Vad1 和 Vad2 的平均值
BigDecimal VadAve = Vad1.add(Vad2).divide(new BigDecimal(2));
return VadAve;
}
/**
* 求Vad 报出_Vad *100 判断奇偶数判断后的结果
* @param countMap
* @return
*/
public static BigDecimal countVad(Map<String, Object> countMap) {
BigDecimal VadAve= getBigDecimal(countMap.get("报出_Vad"));
//判断奇偶数的最终值
BigDecimal result1 = VadAve.multiply(param100);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
BigDecimal Vad = null;
if((resultInt1&1) == 1){ //如果结果为奇数
Vad = VadAve.setScale(2,BigDecimal.ROUND_HALF_UP);
}else{
Vad = VadAve.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
return Vad;
}
/**
* 求Vdaf Vad *100/(100-Mad-Aad)
* @param countMap
* @return
*/
public static BigDecimal countVdaf(Map<String, Object> countMap) {
BigDecimal Vad= getBigDecimal(countMap.get("Vad"));
BigDecimal Mad= getBigDecimal(countMap.get("Mad"));
BigDecimal Aad= getBigDecimal(countMap.get("Aad"));
BigDecimal Vdaf = Vad.multiply(param100).multiply(param100.subtract(Mad).subtract(Aad));
return Vdaf;
}
/**
* 求Vdaf Vad *100/(100-Mad-Aad)
* @param countMap
* @return
*/
public static BigDecimal countK1_(Map<String, Object> countMap) {
BigDecimal Vdaf= getBigDecimal(countMap.get("Vdaf"));
BigDecimal K1_=
Vdaf.compareTo(new BigDecimal(62))==1?new BigDecimal(61.5):(
Vdaf.compareTo(new BigDecimal(56))==1?new BigDecimal(63):(
Vdaf.compareTo(new BigDecimal(49))==1?new BigDecimal(65):(
Vdaf.compareTo(new BigDecimal(45))==1?new BigDecimal(67):(
Vdaf.compareTo(new BigDecimal(37))==1?new BigDecimal(68.5):
new BigDecimal(0)
))));
return K1_;
}
/**
* 求K if 焦渣特征=1 JZB1 if 焦渣特征=1.5 JZB1_5 f 焦渣特征=2 JZB2
* @param resultMap
* @param countMap
* @return
*/
public static String countK(Map<String, Object> resultMap, Map<String, Object> countMap) {
String JZTZ= resultMap.get("焦渣特征").toString();
BigDecimal Vdaf= getBigDecimal(countMap.get("Vdaf"));
//获取焦渣特征序号对应的值
Map<String, String> map = JZTZCountUtil.getJZTZ(Vdaf);
String count = "";
if(JZTZ.equals("1")){
count = map.get(JZTZ);
}else if(JZTZ.equals("1.5")){
count = map.get(JZTZ);
}else if(JZTZ.equals("2")){
count = map.get(JZTZ);
}else if(JZTZ.equals("2.5")){
count = map.get(JZTZ);
}else if(JZTZ.equals("3")){
count = map.get(JZTZ);
}else if(JZTZ.equals("3.5")){
count = map.get(JZTZ);
}else if(JZTZ.equals("4")){
count = map.get(JZTZ);
}else if(JZTZ.equals("4.5")){
count = map.get(JZTZ);
}else if(JZTZ.equals("5")){
count = map.get(JZTZ);
}else if(JZTZ.equals("5.5")){
count = map.get(JZTZ);
}else if(JZTZ.equals("6")){
count = map.get(JZTZ);
}else if(JZTZ.equals("6.5")){
count = map.get(JZTZ);
}else if(JZTZ.equals("7")){
count = map.get(JZTZ);
}else if(JZTZ.equals("7.5")){
count = map.get(JZTZ);
}else if(JZTZ.equals("8")){
count = map.get(JZTZ);
}else{
count = "false";
}
return count;
}
/**
* 求Vdaf判断 Vdaf<35?1:0
* @param countMap
* @return
*/
public static Integer countVdafPD(Map<String, Object> countMap) {
BigDecimal Vdaf= getBigDecimal(countMap.get("Vdaf"));
Integer VdafPD = Vdaf.compareTo(new BigDecimal(35))==-1?1:0;
return VdafPD;
}
/**
* 求Mad判断 Mad>3?1:0
* @param countMap
* @return
*/
public static Integer countMadPD(Map<String, Object> countMap) {
BigDecimal BC_Mad= getBigDecimal(countMap.get("报出_Mad"));
Integer MadPD = BC_Mad.compareTo(new BigDecimal(3))==1?1:0;
return MadPD;
}
/**
* 求40Mad 0或1 Vdaf判断* Mad判断
* @param countMap
* @return
*/
public static BigDecimal count40Mad0Or1(Map<String, Object> countMap) {
BigDecimal VdafPD= getBigDecimal(countMap.get("Vdaf判断"));
BigDecimal MadPD= getBigDecimal(countMap.get("Mad判断"));
BigDecimal count = VdafPD.multiply(MadPD);
return count;
}
/**
* 求40Mad 0或1 Vdaf判断* Mad判断
* @param countMap
* @return
*/
public static BigDecimal countAd(Map<String, Object> countMap) {
BigDecimal BC_Aad= getBigDecimal(countMap.get("报出_Aad"));
BigDecimal BC_Mad= getBigDecimal(countMap.get("报出_Mad"));
BigDecimal count = BC_Aad.multiply(param100).divide(param100.subtract(BC_Mad));
return count;
}
/**
* 求Ad系数0.1或0 if Ad>20 0.1 else 0
* @param countMap
* @return
*/
public static BigDecimal countAdXS(Map<String, Object> countMap) {
BigDecimal Ad= getBigDecimal(countMap.get("Ad"));
BigDecimal count =
Ad.compareTo(new BigDecimal(20))==1?new BigDecimal(0.1):new BigDecimal(0);
return count;
}
public static BigDecimal countVdafXS(Map<String, Object> countMap) {
BigDecimal Ad= getBigDecimal(countMap.get("Ad"));
BigDecimal count =
Ad.compareTo(new BigDecimal(30))==1?new BigDecimal(0.8):(
Ad.compareTo(new BigDecimal(25))==1?new BigDecimal(0.85):(
Ad.compareTo(new BigDecimal(20))==1?new BigDecimal(0.95):(
Ad.compareTo(new BigDecimal(15))==1?new BigDecimal(0.8):(
Ad.compareTo(new BigDecimal(10))==1?new BigDecimal(0.9):
new BigDecimal(0.95)
))));
return count;
}
/**
* 求V，daf [Vdaf系数0.8~0.95]* Vdaf- [Ad系数0.1或0]*Ad
* @param countMap
* @return
*/
public static BigDecimal countV_daf(Map<String, Object> countMap) {
BigDecimal VdafXS= getBigDecimal(countMap.get("Vdaf系数0.8~0.95"));
BigDecimal Vdaf= getBigDecimal(countMap.get("Vdaf"));
BigDecimal AdXS= getBigDecimal(countMap.get("Ad系数0.1或0"));
BigDecimal Ad= getBigDecimal(countMap.get("Ad"));
BigDecimal count = VdafXS.multiply(Vdaf).subtract(AdXS.multiply(Ad));
return count;
}
/**
* 求K0， if V，daf >8 8500 if V，daf >5.5 8400 if V，daf >3 8300 else 8200
* @param countMap
* @return
*/
public static BigDecimal countK0_(Map<String, Object> countMap) {
BigDecimal V_daf= getBigDecimal(countMap.get("V,daf"));
BigDecimal count =
V_daf.compareTo(new BigDecimal(8))==1?new BigDecimal(8500):(
V_daf.compareTo(new BigDecimal(5.5))==1?new BigDecimal(8400):(
V_daf.compareTo(new BigDecimal(3))==1?new BigDecimal(8300):
new BigDecimal(8200)
));
return count;
}
} }
......
cement-business/src/main/java/cn/wise/sc/cement/business/util/JZTZCountUtil.java 0 → 100644
View file @ 5baf0b6b
package cn.wise.sc.cement.business.util;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 焦渣特征序号值计算工具类
*
* @author zhutianwei
*
*/
public class JZTZCountUtil {
public static final BigDecimal NO42 = new BigDecimal(42);
public static final BigDecimal NO38 = new BigDecimal(42);
public static final BigDecimal NO35 = new BigDecimal(42);
public static final BigDecimal NO32 = new BigDecimal(42);
public static final BigDecimal NO29 = new BigDecimal(42);
public static final BigDecimal NO23 = new BigDecimal(42);
public static final BigDecimal NO20 = new BigDecimal(42);
public static final BigDecimal NO17 = new BigDecimal(42);
public static final BigDecimal NO13_5 = new BigDecimal(42);
public static final BigDecimal NO10 = new BigDecimal(42);
/**
* 根据Vdaf获取焦渣特征编号对应值
* @param Vdaf
* @return
*/
public static Map<String, String> getJZTZ(BigDecimal Vdaf){
Map<String, String> map = new HashMap<>();
String JZTZ1 =
Vdaf.compareTo(NO42)==1?"72.5":(
Vdaf.compareTo(NO38)==1?"73":(
Vdaf.compareTo(NO35)==1?"73":(
Vdaf.compareTo(NO32)==1?"73":(
Vdaf.compareTo(NO29)==1?"76.5":(
Vdaf.compareTo(NO23)==1?"76.5":(
Vdaf.compareTo(NO20)==1?"78.5":(
Vdaf.compareTo(NO17)==1?"80":(
Vdaf.compareTo(NO13_5)==1?"80.5":(
Vdaf.compareTo(NO10)==1?"84":"false")))))))));
String JZTZ1_5 =
Vdaf.compareTo(NO42)==1?"73.5":(
Vdaf.compareTo(NO38)==1?"74.25":(
Vdaf.compareTo(NO35)==1?"74.75":(
Vdaf.compareTo(NO32)==1?"75.25":(
Vdaf.compareTo(NO29)==1?"77.25":(
Vdaf.compareTo(NO23)==1?"77.5":(
Vdaf.compareTo(NO20)==1?"79.75":(
Vdaf.compareTo(NO17)==1?"81":(
Vdaf.compareTo(NO13_5)==1?"82":(
Vdaf.compareTo(NO10)==1?"84":"false")))))))));
String JZTZ2 =
Vdaf.compareTo(NO42)==1?"74.5":(
Vdaf.compareTo(NO38)==1?"75.5":(
Vdaf.compareTo(NO35)==1?"76.5":(
Vdaf.compareTo(NO32)==1?"77.5":(
Vdaf.compareTo(NO29)==1?"78":(
Vdaf.compareTo(NO23)==1?"78.5":(
Vdaf.compareTo(NO20)==1?"81":(
Vdaf.compareTo(NO17)==1?"82.75":(
Vdaf.compareTo(NO13_5)==1?"83.5":(
Vdaf.compareTo(NO10)==1?"84":"false")))))))));
String JZTZ2_5 =
Vdaf.compareTo(NO42)==1?"75.5":(
Vdaf.compareTo(NO38)==1?"76.75":(
Vdaf.compareTo(NO35)==1?"77.5":(
Vdaf.compareTo(NO32)==1?"78.25":(
Vdaf.compareTo(NO29)==1?"79":(
Vdaf.compareTo(NO23)==1?"79.75":(
Vdaf.compareTo(NO20)==1?"81.75":(
Vdaf.compareTo(NO17)==1?"82.75":(
Vdaf.compareTo(NO13_5)==1?"84":(
Vdaf.compareTo(NO10)==1?"84.25":"false")))))))));
String JZTZ3 =
Vdaf.compareTo(NO42)==1?"76.5":(
Vdaf.compareTo(NO38)==1?"78":(
Vdaf.compareTo(NO35)==1?"78.5":(
Vdaf.compareTo(NO32)==1?"79":(
Vdaf.compareTo(NO29)==1?"80":(
Vdaf.compareTo(NO23)==1?"81":(
Vdaf.compareTo(NO20)==1?"82.5":(
Vdaf.compareTo(NO17)==1?"83.5":(
Vdaf.compareTo(NO13_5)==1?"84.5":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ3_5 =
Vdaf.compareTo(NO42)==1?"77":(
Vdaf.compareTo(NO38)==1?"78.5":(
Vdaf.compareTo(NO35)==1?"79":(
Vdaf.compareTo(NO32)==1?"79.5":(
Vdaf.compareTo(NO29)==1?"80.5":(
Vdaf.compareTo(NO23)==1?"81.5":(
Vdaf.compareTo(NO20)==1?"82.75":(
Vdaf.compareTo(NO17)==1?"83.75":(
Vdaf.compareTo(NO13_5)==1?"84.75":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ4 =
Vdaf.compareTo(NO42)==1?"77.5":(
Vdaf.compareTo(NO38)==1?"79":(
Vdaf.compareTo(NO35)==1?"79.5":(
Vdaf.compareTo(NO32)==1?"80":(
Vdaf.compareTo(NO29)==1?"81":(
Vdaf.compareTo(NO23)==1?"82":(
Vdaf.compareTo(NO20)==1?"83":(
Vdaf.compareTo(NO17)==1?"84":(
Vdaf.compareTo(NO13_5)==1?"85":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ4_5 =
Vdaf.compareTo(NO42)==1?"78.5":(
Vdaf.compareTo(NO38)==1?"79.5":(
Vdaf.compareTo(NO35)==1?"80.25":(
Vdaf.compareTo(NO32)==1?"80.75":(
Vdaf.compareTo(NO29)==1?"81.75":(
Vdaf.compareTo(NO23)==1?"82.75":(
Vdaf.compareTo(NO20)==1?"83.5":(
Vdaf.compareTo(NO17)==1?"84.5":(
Vdaf.compareTo(NO13_5)==1?"85":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ5 =
Vdaf.compareTo(NO42)==1?"79.5":(
Vdaf.compareTo(NO38)==1?"80":(
Vdaf.compareTo(NO35)==1?"81":(
Vdaf.compareTo(NO32)==1?"81.5":(
Vdaf.compareTo(NO29)==1?"82.5":(
Vdaf.compareTo(NO23)==1?"83.5":(
Vdaf.compareTo(NO20)==1?"84":(
Vdaf.compareTo(NO17)==1?"85":(
Vdaf.compareTo(NO13_5)==1?"85":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ5_5 =
Vdaf.compareTo(NO42)==1?"79.5":(
Vdaf.compareTo(NO38)==1?"80":(
Vdaf.compareTo(NO35)==1?"81":(
Vdaf.compareTo(NO32)==1?"81.5":(
Vdaf.compareTo(NO29)==1?"82.5":(
Vdaf.compareTo(NO23)==1?"83.5":(
Vdaf.compareTo(NO20)==1?"84":(
Vdaf.compareTo(NO17)==1?"85":(
Vdaf.compareTo(NO13_5)==1?"85":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ6 =
Vdaf.compareTo(NO42)==1?"79.5":(
Vdaf.compareTo(NO38)==1?"80":(
Vdaf.compareTo(NO35)==1?"81":(
Vdaf.compareTo(NO32)==1?"81.5":(
Vdaf.compareTo(NO29)==1?"82.5":(
Vdaf.compareTo(NO23)==1?"83.5":(
Vdaf.compareTo(NO20)==1?"84":(
Vdaf.compareTo(NO17)==1?"85":(
Vdaf.compareTo(NO13_5)==1?"85":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ6_5 =
Vdaf.compareTo(NO42)==1?"80.25":(
Vdaf.compareTo(NO38)==1?"81":(
Vdaf.compareTo(NO35)==1?"81.75":(
Vdaf.compareTo(NO32)==1?"82.25":(
Vdaf.compareTo(NO29)==1?"83.25":(
Vdaf.compareTo(NO23)==1?"84":(
Vdaf.compareTo(NO20)==1?"84.5":(
Vdaf.compareTo(NO17)==1?"85":(
Vdaf.compareTo(NO13_5)==1?"85":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ7 =
Vdaf.compareTo(NO42)==1?"81":(
Vdaf.compareTo(NO38)==1?"82":(
Vdaf.compareTo(NO35)==1?"82.5":(
Vdaf.compareTo(NO32)==1?"83":(
Vdaf.compareTo(NO29)==1?"84":(
Vdaf.compareTo(NO23)==1?"84.5":(
Vdaf.compareTo(NO20)==1?"85":(
Vdaf.compareTo(NO17)==1?"85":(
Vdaf.compareTo(NO13_5)==1?"85":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ7_5 =
Vdaf.compareTo(NO42)==1?"81.5":(
Vdaf.compareTo(NO38)==1?"82.25":(
Vdaf.compareTo(NO35)==1?"82.75":(
Vdaf.compareTo(NO32)==1?"83":(
Vdaf.compareTo(NO29)==1?"84.25":(
Vdaf.compareTo(NO23)==1?"84.75":(
Vdaf.compareTo(NO20)==1?"85.25":(
Vdaf.compareTo(NO17)==1?"85":(
Vdaf.compareTo(NO13_5)==1?"85":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
String JZTZ8 =
Vdaf.compareTo(NO42)==1?"82":(
Vdaf.compareTo(NO38)==1?"82.5":(
Vdaf.compareTo(NO35)==1?"83":(
Vdaf.compareTo(NO32)==1?"83.5":(
Vdaf.compareTo(NO29)==1?"84.5":(
Vdaf.compareTo(NO23)==1?"85":(
Vdaf.compareTo(NO20)==1?"85.5":(
Vdaf.compareTo(NO17)==1?"85":(
Vdaf.compareTo(NO13_5)==1?"85":(
Vdaf.compareTo(NO10)==1?"84.5":"false" )))))))));
map.put("1",JZTZ1);
map.put("1.5",JZTZ1_5);
map.put("2",JZTZ2);
map.put("2.5",JZTZ2_5);
map.put("3",JZTZ3);
map.put("3.5",JZTZ3_5);
map.put("4",JZTZ4);
map.put("4.5",JZTZ4_5);
map.put("5",JZTZ5);
map.put("5.5",JZTZ5_5);
map.put("6",JZTZ6);
map.put("6.5",JZTZ6_5);
map.put("7",JZTZ7);
map.put("7.5",JZTZ7_5);
map.put("8",JZTZ8);
return map;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment