Skip to content

S
SchoolReportGen
Commit 2bd72f88 authored by ryzeycy's avatar ryzeycy
Browse files
Options

xx

parent 6b7f8bf8
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 96 deletions
src/main/java/com/example/pdfgenerator/controller/GeneratorAllTypePdfByProvinceController.java
View file @ 2bd72f88
...@@ -325,40 +325,40 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -325,40 +325,40 @@ public class GeneratorAllTypePdfByProvinceController {
for (BasicReportParameters parameters : schoolSelf) { for (BasicReportParameters parameters : schoolSelf) {
logger.info("subjectReport:loading"); logger.info("subjectReport:loading");
String subSubject = parameters.getSubSubject(); // String subSubject = parameters.getSubSubject();
if (!subSubject.equals("生物") && !subSubject.equals("历史")) { // if (!subSubject.equals("生物") && !subSubject.equals("历史")) {
continue; // continue;
} // }
logger.info("exitCode:" + parameters.getSubSubject()); logger.info("exitCode:" + parameters.getSubSubject());
ProcessBuilder processBuilderSubject = new ProcessBuilder(); // ProcessBuilder processBuilderSubject = new ProcessBuilder();
processBuilderSubject.command("bash", "-c", parameters.getCommand()); // processBuilderSubject.command("bash", "-c", parameters.getCommand());
processBuilderSubject.redirectErrorStream(true); // 合并标准输出和错误输出 // processBuilderSubject.redirectErrorStream(true); // 合并标准输出和错误输出
Process processSubject = null; // Process processSubject = null;
try { // try {
processSubject = processBuilderSubject.start(); // processSubject = processBuilderSubject.start();
} catch (IOException e) { // } catch (IOException e) {
throw new RuntimeException(e); // throw new RuntimeException(e);
} // }
BufferedReader readerSubject = new BufferedReader(new InputStreamReader(processSubject.getInputStream())); // BufferedReader readerSubject = new BufferedReader(new InputStreamReader(processSubject.getInputStream()));
String lineSubject; // String lineSubject;
while (true) { // while (true) {
try { // try {
if (!((lineSubject = readerSubject.readLine()) != null)) break; // if (!((lineSubject = readerSubject.readLine()) != null)) break;
} catch (IOException e) { // } catch (IOException e) {
throw new RuntimeException(e); // throw new RuntimeException(e);
}
}
// while ((lineSubject = readerSubject.readLine()) != null) {
// // 如果输出了 "DONE"，表示生成完毕
// if ("DONE".equals(lineSubject)) {
// break; // 跳出循环
// }
// } // }
try { // }
int exitCodeSubject = processSubject.waitFor(); //// while ((lineSubject = readerSubject.readLine()) != null) {
} catch (InterruptedException e) { //// // 如果输出了 "DONE"，表示生成完毕
throw new RuntimeException(e); //// if ("DONE".equals(lineSubject)) {
} //// break; // 跳出循环
//// }
//// }
// try {
// int exitCodeSubject = processSubject.waitFor();
// } catch (InterruptedException e) {
// throw new RuntimeException(e);
// }
// File subjectFile = new File("/myworkSpace/subject/"); // File subjectFile = new File("/myworkSpace/subject/");
// File[] subjectFiles = subjectFile.listFiles(); // File[] subjectFiles = subjectFile.listFiles();
// assert subjectFiles != null; // assert subjectFiles != null;
...@@ -386,35 +386,35 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -386,35 +386,35 @@ public class GeneratorAllTypePdfByProvinceController {
for (ClassBasicReportParameters arg : args) { for (ClassBasicReportParameters arg : args) {
logger.info("classBasic:loading"); logger.info("classBasic:loading");
logger.info("exitCode:" + arg.getClassName()); logger.info("exitCode:" + arg.getClassName());
// ProcessBuilder processBuilderClass = new ProcessBuilder(); ProcessBuilder processBuilderClass = new ProcessBuilder();
// processBuilderClass.command("bash", "-c", arg.getCommand()); processBuilderClass.command("bash", "-c", arg.getCommand());
// processBuilderClass.redirectErrorStream(true); // 合并标准输出和错误输出 processBuilderClass.redirectErrorStream(true); // 合并标准输出和错误输出
// Process processClass = null; Process processClass = null;
// try { try {
// processClass = processBuilderClass.start(); processClass = processBuilderClass.start();
// } catch (IOException e) { } catch (IOException e) {
// throw new RuntimeException(e); throw new RuntimeException(e);
// } }
// BufferedReader readerClass = new BufferedReader(new InputStreamReader(processClass.getInputStream())); BufferedReader readerClass = new BufferedReader(new InputStreamReader(processClass.getInputStream()));
// String lineClass; String lineClass;
// while (true) { while (true) {
// try { try {
// if (!((lineClass = readerClass.readLine()) != null)) break; if (!((lineClass = readerClass.readLine()) != null)) break;
// } catch (IOException e) { } catch (IOException e) {
// throw new RuntimeException(e); throw new RuntimeException(e);
}
}
// while ((lineClass = readerClass.readLine()) != null) {
// // 如果输出了 "DONE"，表示生成完毕
// if ("DONE".equals(lineClass)) {
// break; // 跳出循环
// }
// } // }
// } try {
//// while ((lineClass = readerClass.readLine()) != null) { int exitCodeSubject = processClass.waitFor();
//// // 如果输出了 "DONE"，表示生成完毕 } catch (InterruptedException e) {
//// if ("DONE".equals(lineClass)) { throw new RuntimeException(e);
//// break; // 跳出循环 }
//// }
//// }
// try {
// int exitCodeSubject = processClass.waitFor();
// } catch (InterruptedException e) {
// throw new RuntimeException(e);
// }
// File classBasicFile = new File("/myworkSpace/Class/Basic/"); // File classBasicFile = new File("/myworkSpace/Class/Basic/");
// File[] classBasicFiles = classBasicFile.listFiles(); // File[] classBasicFiles = classBasicFile.listFiles();
// assert classBasicFiles != null; // assert classBasicFiles != null;
...@@ -439,42 +439,42 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -439,42 +439,42 @@ public class GeneratorAllTypePdfByProvinceController {
final Map<String, List<ClassBasicReportParameters>> collect = params.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getClassName)); final Map<String, List<ClassBasicReportParameters>> collect = params.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getClassName));
List<ClassBasicReportParameters> list = collect.get(arg.getClassName()); List<ClassBasicReportParameters> list = collect.get(arg.getClassName());
for (ClassBasicReportParameters classBasicReportParameters : list) { for (ClassBasicReportParameters classBasicReportParameters : list) {
String subSubject = classBasicReportParameters.getSubSubject(); // String subSubject = classBasicReportParameters.getSubSubject();
if (!subSubject.equals("历史")) { // if (!subSubject.equals("历史")) {
continue; // continue;
} // }
//
logger.info("classSubject:loading"); // logger.info("classSubject:loading");
logger.info("exitCode:" + classBasicReportParameters.getSubSubject()); // logger.info("exitCode:" + classBasicReportParameters.getSubSubject());
ProcessBuilder processBuilderClassSubject = new ProcessBuilder(); // ProcessBuilder processBuilderClassSubject = new ProcessBuilder();
processBuilderClassSubject.command("bash", "-c", classBasicReportParameters.getCommand()); // processBuilderClassSubject.command("bash", "-c", classBasicReportParameters.getCommand());
processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出 // processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出
Process processClassSubject = null; // Process processClassSubject = null;
try { // try {
processClassSubject = processBuilderClassSubject.start(); // processClassSubject = processBuilderClassSubject.start();
} catch (IOException e) { // } catch (IOException e) {
throw new RuntimeException(e); // throw new RuntimeException(e);
} // }
BufferedReader readerClassSubject = new BufferedReader(new InputStreamReader(processClassSubject.getInputStream())); // BufferedReader readerClassSubject = new BufferedReader(new InputStreamReader(processClassSubject.getInputStream()));
String lineClassSubject; // String lineClassSubject;
while (true) { // while (true) {
try { // try {
if (!((lineClassSubject = readerClassSubject.readLine()) != null)) break; // if (!((lineClassSubject = readerClassSubject.readLine()) != null)) break;
} catch (IOException e) { // } catch (IOException e) {
throw new RuntimeException(e); // throw new RuntimeException(e);
}
}
// while ((lineClassSubject = readerClassSubject.readLine()) != null) {
// // 如果输出了 "DONE"，表示生成完毕
// if ("DONE".equals(lineClassSubject)) {
// break; // 跳出循环
// }
// } // }
try { // }
int exitCodeSubjectClass = processClassSubject.waitFor(); //// while ((lineClassSubject = readerClassSubject.readLine()) != null) {
} catch (InterruptedException e) { //// // 如果输出了 "DONE"，表示生成完毕
throw new RuntimeException(e); //// if ("DONE".equals(lineClassSubject)) {
} //// break; // 跳出循环
//// }
//// }
// try {
// int exitCodeSubjectClass = processClassSubject.waitFor();
// } catch (InterruptedException e) {
// throw new RuntimeException(e);
// }
// File classSubjectFile = new File("/myworkSpace/Class/subject/"); // File classSubjectFile = new File("/myworkSpace/Class/subject/");
// File[] classSubjectFiles = classSubjectFile.listFiles(); // File[] classSubjectFiles = classSubjectFile.listFiles();
// assert classSubjectFiles != null; // assert classSubjectFiles != null;
......
src/test/java/com/example/pdfgenerator/UploadPdfToCosTest.java
View file @ 2bd72f88
...@@ -312,7 +312,7 @@ public class UploadPdfToCosTest { ...@@ -312,7 +312,7 @@ public class UploadPdfToCosTest {
"\tprovince,\n" + "\tprovince,\n" +
"\tregion1,\n" + "\tregion1,\n" +
"\texam_id"); "\texam_id");
File basicFile = new File("E:\\myworkSpace\\Class\\Subject"); File basicFile = new File("E:\\myworkSpace\\Class\\subject");
for (Map<String, Object> map : mapList) { for (Map<String, Object> map : mapList) {
String region = map.get("region").toString(); String region = map.get("region").toString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment