项目名解析

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -631,11 +631,11 @@ public class FormulaUtils {
 
 
     private static boolean isContainKeywords(String s) {
-        List<String> keywords = Arrays.asList( "：", "个","附录","抽查","测","求","小于","大于","检查","仪","按","不","各","记录","且","规定","值或实","≤","≥","平均");
+        List<String> keywords = Arrays.asList( "：", "个","附录","抽查","测","求","小于","大于","检查","仪","按","不","各","记录","检验","且","规定","值或实","≤","≥","平均");
         return keywords.stream().anyMatch(s::contains);
     }
     private static boolean isContainKeywords2(String s) {
-        List<String> keywords = Arrays.asList( "项目");
+        List<String> keywords = Arrays.asList( "项目","检查","附录","记录","检验结果","结果");
         return keywords.stream().anyMatch(s::contains);
     }
 
@@ -685,14 +685,13 @@ public class FormulaUtils {
             ,"基底承载力(KPa)_不小于设计_实测值或实测偏差值"
             ,"1△_拱部超挖(mm)_Ⅱ、Ⅲ、Ⅳ级围岩（中硬岩 、软岩）_平均150，最大250_实测值或实测偏差值"
             ,"实 测 项 目_关键项目_压实度(%)_上路堤_轻、中及重交通荷载等级_0.8～1.5m_≥94_≥94_≥93_检查情况 (实测值)"
+            ,"表面平整度（mm）_片石_≤35_检验结果"
     );
 
-/*
-    public static void main(String[] args) {
-        itemNames.stream().map(FormulaUtils::parseItemName).forEach(System.out::println);
-       //itemNames.stream().map(FormulaUtils::checkItemName).forEach(System.out::println);
-    }
-*/
+/*    public static void main(String[] args) {
+//        itemNames.stream().map(FormulaUtils::parseItemName).forEach(System.out::println);
+       itemNames.stream().map(FormulaUtils::checkItemName).forEach(System.out::println);
+    }*/