|
|
@@ -3,6 +3,12 @@ package com.mixsmart.utils;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.aliyun.oss.OSS;
|
|
|
+import com.aliyun.oss.OSSClientBuilder;
|
|
|
+import com.aliyun.oss.model.CannedAccessControlList;
|
|
|
+import com.aliyun.oss.model.ObjectMetadata;
|
|
|
+import com.aliyun.oss.model.PutObjectRequest;
|
|
|
+import com.aliyun.oss.model.PutObjectResult;
|
|
|
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
|
|
import org.apache.poi.ss.usermodel.*;
|
|
|
import java.awt.Color;
|
|
|
@@ -23,6 +29,7 @@ import org.jfree.chart.title.TextTitle;
|
|
|
import org.jfree.data.xy.DefaultXYDataset;
|
|
|
import org.jfree.ui.RectangleInsets;
|
|
|
import org.jsoup.Jsoup;
|
|
|
+import org.springblade.common.utils.SnowFlakeUtil;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.core.tool.utils.IoUtil;
|
|
|
import org.springblade.core.tool.utils.ResourceUtil;
|
|
|
@@ -372,7 +379,7 @@ 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);
|
|
|
}
|
|
|
|
|
|
@@ -411,6 +418,8 @@ public class FormulaUtils {
|
|
|
,"单桩每延米喷粉 （浆）量_不小于设计_查施工记录_实测值或偏差值"
|
|
|
,"搭接宽度(mm)_≥150【纵向】_尺量：抽查2%_实测值或实测偏差值",
|
|
|
"搭接宽度(mm)_≥50(横向)_尺量：抽查2%_实测值或实测偏差值"
|
|
|
+ ,"竖直度（mm）_挖孔桩_0.5%桩长，且≤200_铅锤线：每桩检测_实测值或实测偏差值"
|
|
|
+ , "2△_压浆压力值 （Mpa）_满足施工技术 规范规定_查油压表读书;每管道检查_实测值或实测偏差值"
|
|
|
);
|
|
|
|
|
|
/* public static void main(String[] args) {
|
|
|
@@ -568,4 +577,7 @@ public class FormulaUtils {
|
|
|
// }
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
yangyj