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

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java

@@ -176,26 +176,42 @@ public class CommonServiceImpl {
 					countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
 				}else if(name.equals("Fe2O3")){
 					countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
-				}else if(name.equals("Cl")){
-					countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
 				}else if(name.equals("CaO")){
 					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")){
 					countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
 				}else if(name.equals("Mad2")){
 					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));
 				}
 
 
 
-		}
+				}
 
 
 		//输出检测项第二次循环
 		for(String name : checkResutlList){
-			if(name.equals("合量")){
-				BigDecimal countHL = CheckCountUtil.countHL(countMap);
-				countMap.put(name, countHL);
+			if(name.equals("SO3")){
+				BigDecimal countSO3 = CheckCountUtil.countSO3(countMap);
+				countMap.put(name, countSO3);
 			}else if(name.equals("KH")){
 				BigDecimal countKH = CheckCountUtil.countKH(countMap);
 				countMap.put(name, countKH);
@@ -208,15 +224,114 @@ public class CommonServiceImpl {
 			}else if(name.equals("易烧性等级")){
 				String burnupLevel = CheckCountUtil.countBurnupLevel(resultMap,countMap);
 				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")){
 				BigDecimal countMad = CheckCountUtil.countMad(countMap);
 				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/JZTZCountUtil.java

+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;
+	}
+
+
+
+
+
+}
+
+
+
+
+
+
+
+
+
+
+
+