测试生成上传任务表

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

@@ -210,6 +210,7 @@ public class PDFGeByProvinceBatchController {
 
         Map<String, List<ClassBasicReportParameters>>  classSubjectReport = synthesisClassSubjectReportParameters.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getProvince));
 
+        ExecutorService executorService = Executors.newFixedThreadPool(10);
 
         //分组开始执行记录
         for (String key : schoolReport.keySet()) {
@@ -219,22 +220,39 @@ public class PDFGeByProvinceBatchController {
             List<ClassBasicReportParameters> classBasicReport = classReport.get(key);
             List<ClassBasicReportParameters> classSubject = classSubjectReport.get(key);
             for (BasicReportParameters schoolLevel : schoolBasicReport) {
-                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******************************************");
-                ProcessBuilder processBuilder = new ProcessBuilder();
-                processBuilder.command("bash", "-c", schoolLevel.getCommand());
-                processBuilder.redirectErrorStream(true); // 合并标准输出和错误输出
-                Process process = processBuilder.start();
-                BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-                String line;
-                while ((line = reader.readLine()) != null) {
-                }
-                int exitCode = process.waitFor();
-                logger.info("exitCode:"+schoolLevel.getSchool());
+                executorService.submit(() -> {
+                    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******************************************");
+                    ProcessBuilder processBuilder = new ProcessBuilder();
+                    processBuilder.command("bash", "-c", schoolLevel.getCommand());
+                    processBuilder.redirectErrorStream(true); // 合并标准输出和错误输出
+                    Process process = null;
+                    try {
+                        process = processBuilder.start();
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+                    String line;
+                    while (true) {
+                        try {
+                            if (!((line = reader.readLine()) != null)) break;
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                    try {
+                        int exitCode = process.waitFor();
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    logger.info("exitCode:"+schoolLevel.getSchool());
+                });
+
                 //上传文件
 //                File basicFile = new File("/myworkSpace/basic/");
 //                File[] basicFiles = basicFile.listFiles();