多线程测试生成PDF

src/main/java/com/example/pdfgenerator/controller/GeneratorAllTypePdfByProvinceController.java

@@ -231,23 +231,24 @@ public class GeneratorAllTypePdfByProvinceController {
 
         ExecutorService executorService = Executors.newFixedThreadPool(5);
 
-        List<RetryCommand>  retryCommands = new ArrayList<>();
+
 
         //分组开始执行记录
         for (String key : schoolReport.keySet()) {
-            logger.info("province:"+key+ "Gen...............................................................");
+            logger.info("province:"+key+ "Gen");
             List<BasicReportParameters>  schoolBasicReport = schoolReport.get(key);
             List<BasicReportParameters>  schoolSubject = schoolSubjectReport.get(key);
             List<ClassBasicReportParameters> classBasicReport = classReport.get(key);
             List<ClassBasicReportParameters> classSubject = classSubjectReport.get(key);
             for (BasicReportParameters schoolLevel : schoolBasicReport) {
                 executorService.submit(() -> {
-                    logger.info("school:"+schoolLevel.getSchool()+"loading---------------------------------------------------------------");
+                    List<RetryCommand>  retryCommands = new ArrayList<>();
+                    logger.info("school:"+schoolLevel.getSchool()+"loading");
                     Map<String, List<BasicReportParameters>>  schoolMap= schoolSubject.stream().collect(Collectors.groupingBy(BasicReportParameters::getSchool));
                     Map<String, List<ClassBasicReportParameters>> classBasic = classBasicReport.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getSchool));
                     final Map<String, List<ClassBasicReportParameters>> subjectClass = classSubject.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getSchool));
                     List<BasicReportParameters> schoolSelf =  schoolMap.get(schoolLevel.getSchool());
-                    logger.info("basicReport:loading******************************************");
+                    logger.info("basicReport:loading");
                     logger.info("exitCode:"+schoolLevel.getSchool());
                     ProcessBuilder processBuilder = new ProcessBuilder();
                     processBuilder.command("bash", "-c", schoolLevel.getCommand());
@@ -295,7 +296,7 @@ public class GeneratorAllTypePdfByProvinceController {
                         }
                     }
                     for (BasicReportParameters parameters : schoolSelf) {
-                        logger.info("subjectReport:loading***************************************************************");
+                        logger.info("subjectReport:loading");
                         logger.info("exitCode:"+parameters.getSubSubject());
                         ProcessBuilder processBuilderSubject = new ProcessBuilder();
                         processBuilderSubject.command("bash", "-c", parameters.getCommand());
@@ -345,7 +346,7 @@ public class GeneratorAllTypePdfByProvinceController {
                     List<ClassBasicReportParameters> args = classBasic.get(schoolLevel.getSchool());
                     List<ClassBasicReportParameters> params = subjectClass.get(schoolLevel.getSchool());
                     for (ClassBasicReportParameters arg : args) {
-                        logger.info("classBasic:loading++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+                        logger.info("classBasic:loading");
                         logger.info("exitCode:"+arg.getClassName());
                         ProcessBuilder processBuilderClass = new ProcessBuilder();
                         processBuilderClass.command("bash", "-c", arg.getCommand());
@@ -394,7 +395,7 @@ public class GeneratorAllTypePdfByProvinceController {
                         final Map<String, List<ClassBasicReportParameters>> collect = params.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getClassName));
                         List<ClassBasicReportParameters> list = collect.get(arg.getClassName());
                         for (ClassBasicReportParameters classBasicReportParameters : list) {
-                            logger.info("classSubject:loading++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+                            logger.info("classSubject:loading");
                             logger.info("exitCode:"+classBasicReportParameters.getSubSubject());
                             ProcessBuilder processBuilderClassSubject = new ProcessBuilder();
                             processBuilderClassSubject.command("bash", "-c", classBasicReportParameters.getCommand());
@@ -443,31 +444,23 @@ public class GeneratorAllTypePdfByProvinceController {
                             }
                         }
                     }
-                    //插入数据
-                    int rowsAffected = reportJdbcTemplate.update("UPDATE school_report_task_generate SET status = ? WHERE exam_id = ? AND region = ? AND province = ? AND school = ?",1,schoolLevel.getExamId(),schoolLevel.getRegion(),schoolLevel.getProvince(),schoolLevel.getSchool());
-
-                    logger.info("Rows affected:" + rowsAffected);
-
-                });
-            }
-        }
 
                     if(retryCommands.size()!=0){
                         logger.info("size"+retryCommands.size());
                         for (RetryCommand retryCommand : retryCommands) {
                             String command = retryCommand.getRetryCommand();
-                Object params = retryCommand.getParams();
+                            Object arguments = retryCommand.getParams();
                             String filePrefix = "";
-                if ( params instanceof BasicReportParameters){
-                    BasicReportParameters  parametersOne  = (BasicReportParameters) params;
+                            if ( arguments instanceof BasicReportParameters){
+                                BasicReportParameters  parametersOne  = (BasicReportParameters) arguments;
                                 filePrefix  = parametersOne.getPrefix();
                             }
-                if (params instanceof ClassBasicReportParameters) {
-                    ClassBasicReportParameters parametersTwo = (ClassBasicReportParameters) params;
+                            if (arguments instanceof ClassBasicReportParameters) {
+                                ClassBasicReportParameters parametersTwo = (ClassBasicReportParameters) arguments;
                                 filePrefix  = parametersTwo.getPrefix();
                             }
 
-                logger.info("RetryCommand:loading++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+                            logger.info("RetryCommand:loading");
                             ProcessBuilder processBuilderClassSubject = new ProcessBuilder();
                             processBuilderClassSubject.command("bash", "-c", command);
                             processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出
@@ -513,6 +506,16 @@ public class GeneratorAllTypePdfByProvinceController {
 
                     }
 
+                    //插入数据
+                    int rowsAffected = reportJdbcTemplate.update("UPDATE school_report_task_generate SET status = ? WHERE exam_id = ? AND region = ? AND province = ? AND school = ?",1,schoolLevel.getExamId(),schoolLevel.getRegion(),schoolLevel.getProvince(),schoolLevel.getSchool());
+
+                    logger.info("Rows affected:" + rowsAffected);
+
+                });
+            }
+        }
+
+
         return ResponseEntity.ok("操作成功");
 
     }