检查内容

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

@@ -590,7 +590,7 @@ public class FormulaUtils {
         return matcher.replaceAll("").replaceAll(getRegex(), "").replaceAll("(设计|合格).*","");
     }
     private static String getRegex() {
-        return "(在合格标准内|满足设计要求|质量评定|评定|判定|项目|总数|抽测|实测|偏差|尺量)";
+        return "(在合格标准内|满足设计要求|质量评定|评定|判定|项目|总数|抽测|实测|偏差|尺量|关键|一般)";
     }
 
 
@@ -599,7 +599,7 @@ public class FormulaUtils {
         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);
     }
 
@@ -647,12 +647,15 @@ public class FormulaUtils {
             ,"墙面平整度(mm)_施工缝、变形缝处≤20_实测值或实测偏差值"
             ,"基底承载力(KPa)_不小于设计_实测值或实测偏差值"
             ,"1△_拱部超挖(mm)_Ⅱ、Ⅲ、Ⅳ级围岩（中硬岩 、软岩）_平均150，最大250_实测值或实测偏差值"
+            ,"实 测 项 目_关键项目_压实度(%)_上路堤_轻、中及重交通荷载等级_0.8～1.5m_≥94_≥94_≥93_检查情况 (实测值)"
     );
 
-/*    public static void main(String[] args) {
+/*
+    public static void main(String[] args) {
         itemNames.stream().map(FormulaUtils::parseItemName).forEach(System.out::println);
-      // itemNames.stream().map(FormulaUtils::checkItemName).forEach(System.out::println);
-    }*/
+       //itemNames.stream().map(FormulaUtils::checkItemName).forEach(System.out::println);
+    }
+*/
 
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -255,10 +255,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             data.add(baseInfo);
         }
     }
-
-
-    @Cacheable(cacheNames = "data-model")
-    public List<TreeNodeVOByTabType> baseList() {
+   public static final List<TreeNodeVOByTabType> TN_TAB_LIST ;
+    static {
         Map<String, String[]> titleMap = new LinkedHashMap<>();
         titleMap.put(BaseInfo.TBN_CH, new String[]{BaseInfo.TBN, BaseInfo.ID});
         titleMap.put(MeterPeriodInfo.TBN_CH, new String[]{MeterPeriodInfo.TBN, MeterPeriodInfo.ID});
@@ -268,7 +266,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         titleMap.put(SubInterimMeterPaySummary.TBN_CH, new String[]{SubInterimMeterPaySummary.TBN, SubInterimMeterPaySummary.ID});
         titleMap.put(InterimMeterPaySummary.TBN_CH, new String[]{InterimMeterPaySummary.TBN, InterimMeterPaySummary.ID});
         titleMap.put(InterimMeter.TBN_CH, new String[]{InterimMeter.TBN, InterimMeter.ID});
-        return titleMap.entrySet().stream().map(kv -> {
+        TN_TAB_LIST=titleMap.entrySet().stream().map(kv -> {
             TreeNodeVOByTabType tn = new TreeNodeVOByTabType();
             tn.setTitle(kv.getKey());
             tn.setTabType(SelectorModel.NODE_NAME);
@@ -282,6 +280,11 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         }).collect(Collectors.toList());
     }
 
+    @Cacheable(cacheNames = "data-model")
+    public List<TreeNodeVOByTabType> baseList() {
+        return TN_TAB_LIST;
+    }
+
     @Override
     public List<WbsTreePrivateDTO2> findWbsTreePrivateSameLevel(String projectId, String parentId, String wbsId) {
         return baseMapper.selectNodeListByCondition(projectId, parentId, wbsId);