土工平台修改

src/main/java/com/patzn/cloud/service/lims/common/CollectUtil.java

@@ -13,10 +13,10 @@ import java.util.List;
 public class CollectUtil {
 
     public static void main(String[] args) {
-        File file = new File("D://颗粒分析试验 GB SieveS-99.txt");
+        File file = new File("D://三轴压缩S-10r.txt");
         try {
             FileInputStream io = new FileInputStream(file);
-            txt2StringKeliFenxi(io);
+            txt2String(io);
         }catch (Exception e){
 
         }
@@ -277,10 +277,29 @@ public class CollectUtil {
 
             List<String> allStringList = new ArrayList<>();
 
+            String e50 = "";
+
             while((s = brCheck.readLine())!=null){
                 allStringList.add(s);
+
+
+
                 String content = s.replace(" ","");
+
+                if (content.contains("剪切峰值50%ε50")){
+                    String [] e50s=content.split("│");
+                    if (e50s.length>3){
+                        SoilExperimentCollectData njlData = new SoilExperimentCollectData();
+                        njlData.setName("剪切峰值50%ε50");
+                        njlData.setTestValue(e50s[2]);
+                        dataList.add(njlData);
+                    }
+                }
+
                 sbAll.append(content);
+
+
+
             }
 
             if (sbAll.toString().contains("无侧限抗压强度试验")){