测试生成上传任务表

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

@@ -217,6 +217,7 @@ public class GeneratorAllTypePdfByProvinceController {
                 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("exitCode:"+schoolLevel.getSchool());
                 ProcessBuilder processBuilder = new ProcessBuilder();
                 processBuilder.command("bash", "-c", schoolLevel.getCommand());
                 processBuilder.redirectErrorStream(true); // 合并标准输出和错误输出
@@ -226,7 +227,6 @@ public class GeneratorAllTypePdfByProvinceController {
                 while ((line = reader.readLine()) != null) {
                 }
                 int exitCode = process.waitFor();
-                logger.info("exitCode:"+schoolLevel.getSchool());
                 //上传文件
                 File basicFile = new File("/myworkSpace/basic/");
                 File[] basicFiles = basicFile.listFiles();
@@ -247,6 +247,7 @@ public class GeneratorAllTypePdfByProvinceController {
                 }
                 for (BasicReportParameters parameters : schoolSelf) {
                     logger.info("subjectReport:loading***************************************************************");
+                    logger.info("exitCode:"+parameters.getSubSubject());
                     ProcessBuilder processBuilderSubject = new ProcessBuilder();
                     processBuilderSubject.command("bash", "-c", parameters.getCommand());
                     processBuilderSubject.redirectErrorStream(true); // 合并标准输出和错误输出
@@ -256,7 +257,6 @@ public class GeneratorAllTypePdfByProvinceController {
                     while ((lineSubject = readerSubject.readLine()) != null) {
                     }
                     int exitCodeSubject = processSubject.waitFor();
-                    logger.info("exitCode:"+parameters.getSubSubject());
                     File subjectFile = new File("/myworkSpace/subject/");
                     File[] subjectFiles = subjectFile.listFiles();
                     assert subjectFiles != null;
@@ -279,6 +279,7 @@ public class GeneratorAllTypePdfByProvinceController {
                 List<ClassBasicReportParameters> params = subjectClass.get(schoolLevel.getSchool());
                 for (ClassBasicReportParameters arg : args) {
                     logger.info("classBasic:loading++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+                    logger.info("exitCode:"+arg.getClassName());
                     ProcessBuilder processBuilderClass = new ProcessBuilder();
                     processBuilderClass.command("bash", "-c", arg.getCommand());
                     processBuilderClass.redirectErrorStream(true); // 合并标准输出和错误输出
@@ -288,7 +289,6 @@ public class GeneratorAllTypePdfByProvinceController {
                     while ((lineClass = readerClass.readLine()) != null) {
                     }
                     int exitCodeSubject = processClass.waitFor();
-                    logger.info("exitCode:"+arg.getClassName());
                     File classBasicFile = new File("/myworkSpace/Class/Basic/");
                     File[] classBasicFiles = classBasicFile.listFiles();
                     assert classBasicFiles != null;
@@ -310,6 +310,7 @@ public class GeneratorAllTypePdfByProvinceController {
                     List<ClassBasicReportParameters> list = collect.get(arg.getClassName());
                     for (ClassBasicReportParameters classBasicReportParameters : list) {
                         logger.info("classSubject:loading++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+                        logger.info("exitCode:"+classBasicReportParameters.getSubSubject());
                         ProcessBuilder processBuilderClassSubject = new ProcessBuilder();
                         processBuilderClassSubject.command("bash", "-c", classBasicReportParameters.getCommand());
                         processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出
@@ -319,7 +320,6 @@ public class GeneratorAllTypePdfByProvinceController {
                         while ((lineClassSubject = readerClassSubject.readLine()) != null) {
                         }
                         int exitCodeSubjectClass = processClassSubject.waitFor();
-                        logger.info("exitCode:"+classBasicReportParameters.getSubSubject());
                         File classSubjectFile = new File("/myworkSpace/Class/subject/");
                         File[] classSubjectFiles = classSubjectFile.listFiles();
                         assert classSubjectFiles != null;