土工平台修改

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

@@ -13,15 +13,69 @@ import java.util.List;
 public class CollectUtil {
 
     public static void main(String[] args) {
-        File file = new File("D://界限含水率(联合测定)S-1.txt");
+        File file = new File("D://颗粒分析试验 GB SieveS-99.txt");
         try {
             FileInputStream io = new FileInputStream(file);
-            txt2StringWuxing(io);
+            txt2StringKeliFenxi(io);
         }catch (Exception e){
 
         }
 
     }
+
+
+    public static List<SoilExperimentCollectDataVO> txt2StringKeliFenxi(InputStream io){
+        StringBuilder result = new StringBuilder();
+        List<SoilExperimentCollectDataVO> dataList = new ArrayList<>();
+
+        try {
+            InputStreamReader inputReader = new InputStreamReader(io,"GBK");
+
+            BufferedReader brCheck = new BufferedReader(inputReader);//构造一个BufferedReader类来读取文件
+
+            BufferedReader br = new BufferedReader(inputReader);//构造一个BufferedReader类来读取文件
+            String s = null;
+            StringBuffer sbAll = new StringBuffer();
+
+            List<String> allStringList = new ArrayList<>();
+
+            String gcbh = "";
+            String sampleCode = "";
+
+            while((s = brCheck.readLine())!=null){
+
+
+//                s = s.replace("─","").replace("┌","").
+//                        replace("┬","").replace("┐","").
+//                        replace("├","").replace("┼","").
+//                        replace("┴","").replace("└","").
+//                        replace("┘","").replace("┤","").
+//                        replace("─","").replace("─","");
+
+                System.out.println(s);
+
+
+
+                allStringList.add(s);
+                String content = s.replace(" ","");
+                sbAll.append(content);
+            }
+
+            System.out.println();
+            System.out.println(sampleCode);
+
+        }catch (Exception e){
+
+        }
+
+        return dataList;
+    }
+
+
+
+
+
+
     public static List<SoilExperimentCollectDataVO> txt2StringWuxing(InputStream io){
         StringBuilder result = new StringBuilder();
         List<SoilExperimentCollectDataVO> dataList = new ArrayList<>();

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExpReportServiceImpl.java

@@ -148,6 +148,8 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
     @Transactional(rollbackFor = Exception.class)
     @Override
     public SoilReport generateReport(Long entrustId,Long templateId, Long[] expReportIds) {
+
+      try {
           RestAssert.fail(null == templateId,"请选择报告模板");
           RestAssert.fail(ArrayUtils.isEmpty(expReportIds),"请选择试验项目报告");
           SoilExpReportTemplate template = soilExpReportTemplateService.getById(templateId);
@@ -341,7 +343,7 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
               try {
                   workbook =  new Workbook(exportToExcelInputStream(xssfWorkbook));
               }catch (Exception e){
-
+                  logger.error(" workbook =  new Workbook(exportToExcelInputStream(xssfWorkbook));"+e.getMessage());
               }
           }
           for (SoilExpReport report:reportList) {
@@ -351,7 +353,7 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
                       bookList.add(book);
                   }
               }catch (Exception e){
-
+                  logger.error("   Workbook book = new Workbook(ossClient.download(report.getObjectKey()));"+e.getMessage());
               }
           }
           for (SoilAppendix appendix:appendixList) {
@@ -362,7 +364,7 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
                       bookList.add(book);
                   }
               }catch (Exception e){
-
+                  logger.error(" Workbook book =   new Workbook(ossClient.download(appendix.getObjectKey()));;"+e.getMessage());
               }
 
           }
@@ -397,6 +399,13 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
           }else{
               return null;
           }
+      }catch (Exception e){
+          logger.error("生成汇总报告失败------"+e.getMessage());
+          RestAssert.fail("生成失败，请联系管理员！");
+      }
+
+
+
         return null;
     }
 

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java

@@ -3168,6 +3168,8 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
                         replaceMap.put("#{title}","附录"+(count)+" "+type.getExperiment()+"试验成果图\n" +
                                 "APPENDIX "+count+" "+testEnglish);
+
+                        replaceMap.put("#{reportCode}",StringHandleUtils.getString(type.getEntrustCode()));
                         try {
                             HSSFWorkbookUtil.replaceModel(replaceMap,xssfWorkbook);
                             HSSFWorkbookUtil.insertImage(xssfWorkbook,fileMap,true);