单线程测试生成pdf

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

@@ -11,7 +11,6 @@ import com.qcloud.cos.model.PutObjectResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
@@ -26,8 +25,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 
@@ -46,7 +43,7 @@ public class GeneratorAllTypePdfByProvinceController {
     private static final String bucketName = "schoolreportpdf-1317275686";
 
     @RequestMapping("/GeneratorByProvinceName")
-    public ResponseEntity generatorName(@RequestParam("examId")String examId, @RequestParam(value = "provinceName",required = false)String provinceName) throws IOException, InterruptedException {
+    public void generatorName(@RequestParam("examId")String examId,@RequestParam(value = "provinceName",required = false)String provinceName) throws IOException, InterruptedException {
 
         String suffix  = examId.trim().replace("TDA","").replace("G3","").replace("G2","").trim();
 
@@ -205,7 +202,6 @@ public class GeneratorAllTypePdfByProvinceController {
 
         Map<String, List<ClassBasicReportParameters>>  classSubjectReport = synthesisClassSubjectReportParameters.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getProvince));
 
-        ExecutorService executorService = Executors.newFixedThreadPool(8);
 
         //分组开始执行记录
         for (String key : schoolReport.keySet()) {
@@ -215,7 +211,7 @@ public class GeneratorAllTypePdfByProvinceController {
             List<ClassBasicReportParameters> classBasicReport = classReport.get(key);
             List<ClassBasicReportParameters> classSubject = classSubjectReport.get(key);
             for (BasicReportParameters schoolLevel : schoolBasicReport) {
-                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));
@@ -226,26 +222,12 @@ public class GeneratorAllTypePdfByProvinceController {
                 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);
-                    }
+                Process process = processBuilder.start();
                 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);
+                while ((line = reader.readLine()) != null) {
                 }
-                    }
-                    try {
                 int exitCode = process.waitFor();
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
                 //上传文件
                 File basicFile = new File("/myworkSpace/basic/");
                 File[] basicFiles = basicFile.listFiles();
@@ -270,26 +252,12 @@ public class GeneratorAllTypePdfByProvinceController {
                     ProcessBuilder processBuilderSubject = new ProcessBuilder();
                     processBuilderSubject.command("bash", "-c", parameters.getCommand());
                     processBuilderSubject.redirectErrorStream(true); // 合并标准输出和错误输出
-                        Process processSubject = null;
-                        try {
-                            processSubject = processBuilderSubject.start();
-                        } catch (IOException e) {
-                            throw new RuntimeException(e);
-                        }
+                    Process processSubject = processBuilderSubject.start();
                     BufferedReader readerSubject = new BufferedReader(new InputStreamReader(processSubject.getInputStream()));
                     String lineSubject;
-                        while (true) {
-                            try {
-                                if (!((lineSubject = readerSubject.readLine()) != null)) break;
-                            } catch (IOException e) {
-                                throw new RuntimeException(e);
+                    while ((lineSubject = readerSubject.readLine()) != null) {
                     }
-                        }
-                        try {
                     int exitCodeSubject = processSubject.waitFor();
-                        } catch (InterruptedException e) {
-                            throw new RuntimeException(e);
-                        }
                     File subjectFile = new File("/myworkSpace/subject/");
                     File[] subjectFiles = subjectFile.listFiles();
                     assert subjectFiles != null;
@@ -316,26 +284,12 @@ public class GeneratorAllTypePdfByProvinceController {
                     ProcessBuilder processBuilderClass = new ProcessBuilder();
                     processBuilderClass.command("bash", "-c", arg.getCommand());
                     processBuilderClass.redirectErrorStream(true); // 合并标准输出和错误输出
-                        Process processClass = null;
-                        try {
-                            processClass = processBuilderClass.start();
-                        } catch (IOException e) {
-                            throw new RuntimeException(e);
-                        }
+                    Process processClass = processBuilderClass.start();
                     BufferedReader readerClass = new BufferedReader(new InputStreamReader(processClass.getInputStream()));
                     String lineClass;
-                        while (true) {
-                            try {
-                                if (!((lineClass = readerClass.readLine()) != null)) break;
-                            } catch (IOException e) {
-                                throw new RuntimeException(e);
-                            }
+                    while ((lineClass = readerClass.readLine()) != null) {
                     }
-                        try {
                     int exitCodeSubject = processClass.waitFor();
-                        } catch (InterruptedException e) {
-                            throw new RuntimeException(e);
-                        }
                     File classBasicFile = new File("/myworkSpace/Class/Basic/");
                     File[] classBasicFiles = classBasicFile.listFiles();
                     assert classBasicFiles != null;
@@ -361,26 +315,12 @@ public class GeneratorAllTypePdfByProvinceController {
                         ProcessBuilder processBuilderClassSubject = new ProcessBuilder();
                         processBuilderClassSubject.command("bash", "-c", classBasicReportParameters.getCommand());
                         processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出
-                            Process processClassSubject = null;
-                            try {
-                                processClassSubject = processBuilderClassSubject.start();
-                            } catch (IOException e) {
-                                throw new RuntimeException(e);
-                            }
+                        Process processClassSubject = processBuilderClassSubject.start();
                         BufferedReader readerClassSubject = new BufferedReader(new InputStreamReader(processClassSubject.getInputStream()));
                         String lineClassSubject;
-                            while (true) {
-                                try {
-                                    if (!((lineClassSubject = readerClassSubject.readLine()) != null)) break;
-                                } catch (IOException e) {
-                                    throw new RuntimeException(e);
-                                }
+                        while ((lineClassSubject = readerClassSubject.readLine()) != null) {
                         }
-                            try {
                         int exitCodeSubjectClass = processClassSubject.waitFor();
-                            } catch (InterruptedException e) {
-                                throw new RuntimeException(e);
-                            }
                         File classSubjectFile = new File("/myworkSpace/Class/subject/");
                         File[] classSubjectFiles = classSubjectFile.listFiles();
                         assert classSubjectFiles != null;
@@ -405,12 +345,11 @@ 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 null;
+
     }
 
 }