Skip to content

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

xx

parent 09a511db
Expand all Show whitespace changes
Inline Side-by-side
Showing with 630 additions and 58 deletions
src/main/java/com/example/pdfgenerator/controller/GeneratorAllTypePdfByProvinceController.java
View file @ d5fb53cc
......@@ -48,7 +48,7 @@ public class GeneratorAllTypePdfByProvinceController {
"school,exam_id,province,region1 as region,sub_subject\n" +
"from \n" +
"base_school_subject_tda"+suffix+" \n" +
" where subject_type = '常规' \n";
" where subject_type = '常规' and sub_subject in('历史','物理') \n";
String synthesisSchoolReportSql = "select \n" +
"school,exam_id,province,region1 as region\n" +
......@@ -65,7 +65,7 @@ public class GeneratorAllTypePdfByProvinceController {
"FROM\n" +
"\tbase_student_subject_tda"+suffix+"\n" +
"where\n" +
"subject_type = '常规' \n " ;
"subject_type = '常规' and sub_subject in('历史','物理') \n " ;
String synthesisClassReportSql = "SELECT\n" +
"\tclass AS class_name,\n" +
......@@ -271,35 +271,35 @@ public class GeneratorAllTypePdfByProvinceController {
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); // 合并标准输出和错误输出
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);
}
}
// while ((line = reader.readLine()) != null) {
// // 如果输出了 "DONE"，表示生成完毕
// if ("DONE".equals(line)) {
// break; // 跳出循环
// 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);
// }
// }
//// while ((line = reader.readLine()) != null) {
//// // 如果输出了 "DONE"，表示生成完毕
//// if ("DONE".equals(line)) {
//// break; // 跳出循环
//// }
//// }
// try {
// int exitCode = process.waitFor();
// } catch (InterruptedException e) {
// throw new RuntimeException(e);
// }
try {
int exitCode = process.waitFor();
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//上传文件
// File basicFile = new File("/myworkSpace/basic/");
// File[] basicFiles = basicFile.listFiles();
......@@ -381,35 +381,35 @@ public class GeneratorAllTypePdfByProvinceController {
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); // 合并标准输出和错误输出
Process processClass = null;
try {
processClass = processBuilderClass.start();
} catch (IOException e) {
throw new RuntimeException(e);
}
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) {
// // 如果输出了 "DONE"，表示生成完毕
// if ("DONE".equals(lineClass)) {
// break; // 跳出循环
// 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);
// }
// 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) {
//// // 如果输出了 "DONE"，表示生成完毕
//// if ("DONE".equals(lineClass)) {
//// break; // 跳出循环
//// }
//// }
// try {
// int exitCodeSubject = processClass.waitFor();
// } catch (InterruptedException e) {
// throw new RuntimeException(e);
// }
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;
......
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