Skip to content

S
SchoolReportGen
Commit ead7ef44 authored by 霍传世's avatar 霍传世
Browse files
Options

单线程测试生成pdf

parent f21eb8d4
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 163 deletions
src/main/java/com/example/pdfgenerator/controller/GeneratorAllTypePdfByProvinceController.java
View file @ ead7ef44
...@@ -11,7 +11,6 @@ import com.qcloud.cos.model.PutObjectResult; ...@@ -11,7 +11,6 @@ import com.qcloud.cos.model.PutObjectResult;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -26,8 +25,6 @@ import java.util.Arrays; ...@@ -26,8 +25,6 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -46,7 +43,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -46,7 +43,7 @@ public class GeneratorAllTypePdfByProvinceController {
private static final String bucketName = "schoolreportpdf-1317275686"; private static final String bucketName = "schoolreportpdf-1317275686";
@RequestMapping("/GeneratorByProvinceName") @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(); String suffix = examId.trim().replace("TDA","").replace("G3","").replace("G2","").trim();
...@@ -205,7 +202,6 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -205,7 +202,6 @@ public class GeneratorAllTypePdfByProvinceController {
Map<String, List<ClassBasicReportParameters>> classSubjectReport = synthesisClassSubjectReportParameters.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getProvince)); Map<String, List<ClassBasicReportParameters>> classSubjectReport = synthesisClassSubjectReportParameters.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getProvince));
ExecutorService executorService = Executors.newFixedThreadPool(8);
//分组开始执行记录 //分组开始执行记录
for (String key : schoolReport.keySet()) { for (String key : schoolReport.keySet()) {
...@@ -215,43 +211,58 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -215,43 +211,58 @@ public class GeneratorAllTypePdfByProvinceController {
List<ClassBasicReportParameters> classBasicReport = classReport.get(key); List<ClassBasicReportParameters> classBasicReport = classReport.get(key);
List<ClassBasicReportParameters> classSubject = classSubjectReport.get(key); List<ClassBasicReportParameters> classSubject = classSubjectReport.get(key);
for (BasicReportParameters schoolLevel : schoolBasicReport) { for (BasicReportParameters schoolLevel : schoolBasicReport) {
executorService.submit(() -> {
logger.info("school:"+schoolLevel.getSchool()+"loading---------------------------------------------------------------"); logger.info("school:"+schoolLevel.getSchool()+"loading---------------------------------------------------------------");
Map<String, List<BasicReportParameters>> schoolMap= schoolSubject.stream().collect(Collectors.groupingBy(BasicReportParameters::getSchool)); Map<String, List<BasicReportParameters>> schoolMap= schoolSubject.stream().collect(Collectors.groupingBy(BasicReportParameters::getSchool));
Map<String, List<ClassBasicReportParameters>> classBasic = classBasicReport.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::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)); final Map<String, List<ClassBasicReportParameters>> subjectClass = classSubject.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getSchool));
List<BasicReportParameters> schoolSelf = schoolMap.get(schoolLevel.getSchool()); List<BasicReportParameters> schoolSelf = schoolMap.get(schoolLevel.getSchool());
logger.info("basicReport:loading******************************************"); logger.info("basicReport:loading******************************************");
logger.info("exitCode:"+schoolLevel.getSchool()); logger.info("exitCode:"+schoolLevel.getSchool());
ProcessBuilder processBuilder = new ProcessBuilder(); ProcessBuilder processBuilder = new ProcessBuilder();
processBuilder.command("bash", "-c", schoolLevel.getCommand()); processBuilder.command("bash", "-c", schoolLevel.getCommand());
processBuilder.redirectErrorStream(true); // 合并标准输出和错误输出 processBuilder.redirectErrorStream(true); // 合并标准输出和错误输出
Process process = null; Process process = processBuilder.start();
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
String line;
while ((line = reader.readLine()) != null) {
}
int exitCode = process.waitFor();
//上传文件
File basicFile = new File("/myworkSpace/basic/");
File[] basicFiles = basicFile.listFiles();
assert basicFiles != null;
for (File file : basicFiles) {
PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, "PdfTest/"+file.getName(), file);
try { try {
process = processBuilder.start(); PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
} catch (IOException e) { logger.info(putObjectResult.getRequestId());
throw new RuntimeException(e); file.delete();
} } catch (CosServiceException e) {
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); logger.info("cos服务出现问题");
String line; e.printStackTrace();
while (true) { } catch (CosClientException e) {
try { logger.info("cos客户端出现问题"+file.getName()+"文件上传有误,重新上传");
if (!((line = reader.readLine()) != null)) break; e.printStackTrace();
} catch (IOException e) {
throw new RuntimeException(e);
}
} }
try { }
int exitCode = process.waitFor(); for (BasicReportParameters parameters : schoolSelf) {
} catch (InterruptedException e) { logger.info("subjectReport:loading***************************************************************");
throw new RuntimeException(e); logger.info("exitCode:"+parameters.getSubSubject());
ProcessBuilder processBuilderSubject = new ProcessBuilder();
processBuilderSubject.command("bash", "-c", parameters.getCommand());
processBuilderSubject.redirectErrorStream(true); // 合并标准输出和错误输出
Process processSubject = processBuilderSubject.start();
BufferedReader readerSubject = new BufferedReader(new InputStreamReader(processSubject.getInputStream()));
String lineSubject;
while ((lineSubject = readerSubject.readLine()) != null) {
} }
//上传文件 int exitCodeSubject = processSubject.waitFor();
File basicFile = new File("/myworkSpace/basic/"); File subjectFile = new File("/myworkSpace/subject/");
File[] basicFiles = basicFile.listFiles(); File[] subjectFiles = subjectFile.listFiles();
assert basicFiles != null; assert subjectFiles != null;
for (File file : basicFiles) { for (File file : subjectFiles) {
PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, "PdfTest/"+file.getName(), file); PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, "PdfSubjectTest/"+file.getName(), file);
try { try {
PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest); PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
logger.info(putObjectResult.getRequestId()); logger.info(putObjectResult.getRequestId());
...@@ -264,82 +275,57 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -264,82 +275,57 @@ public class GeneratorAllTypePdfByProvinceController {
e.printStackTrace(); e.printStackTrace();
} }
} }
for (BasicReportParameters parameters : schoolSelf) { }
logger.info("subjectReport:loading***************************************************************"); List<ClassBasicReportParameters> args = classBasic.get(schoolLevel.getSchool());
logger.info("exitCode:"+parameters.getSubSubject()); List<ClassBasicReportParameters> params = subjectClass.get(schoolLevel.getSchool());
ProcessBuilder processBuilderSubject = new ProcessBuilder(); for (ClassBasicReportParameters arg : args) {
processBuilderSubject.command("bash", "-c", parameters.getCommand()); logger.info("classBasic:loading++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
processBuilderSubject.redirectErrorStream(true); // 合并标准输出和错误输出 logger.info("exitCode:"+arg.getClassName());
Process processSubject = null; ProcessBuilder processBuilderClass = new ProcessBuilder();
try { processBuilderClass.command("bash", "-c", arg.getCommand());
processSubject = processBuilderSubject.start(); processBuilderClass.redirectErrorStream(true); // 合并标准输出和错误输出
} catch (IOException e) { Process processClass = processBuilderClass.start();
throw new RuntimeException(e); BufferedReader readerClass = new BufferedReader(new InputStreamReader(processClass.getInputStream()));
} String lineClass;
BufferedReader readerSubject = new BufferedReader(new InputStreamReader(processSubject.getInputStream())); while ((lineClass = readerClass.readLine()) != null) {
String lineSubject;
while (true) {
try {
if (!((lineSubject = readerSubject.readLine()) != null)) break;
} catch (IOException e) {
throw new RuntimeException(e);
}
}
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;
for (File file : subjectFiles) {
PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, "PdfSubjectTest/"+file.getName(), file);
try {
PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
logger.info(putObjectResult.getRequestId());
file.delete();
} catch (CosServiceException e) {
logger.info("cos服务出现问题");
e.printStackTrace();
} catch (CosClientException e) {
logger.info("cos客户端出现问题"+file.getName()+"文件上传有误,重新上传");
e.printStackTrace();
}
}
} }
List<ClassBasicReportParameters> args = classBasic.get(schoolLevel.getSchool()); int exitCodeSubject = processClass.waitFor();
List<ClassBasicReportParameters> params = subjectClass.get(schoolLevel.getSchool()); File classBasicFile = new File("/myworkSpace/Class/Basic/");
for (ClassBasicReportParameters arg : args) { File[] classBasicFiles = classBasicFile.listFiles();
logger.info("classBasic:loading++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); assert classBasicFiles != null;
logger.info("exitCode:"+arg.getClassName()); for (File file : classBasicFiles) {
ProcessBuilder processBuilderClass = new ProcessBuilder(); PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, fileToUrl.get(file.getName()), file);
processBuilderClass.command("bash", "-c", arg.getCommand());
processBuilderClass.redirectErrorStream(true); // 合并标准输出和错误输出
Process processClass = null;
try { try {
processClass = processBuilderClass.start(); PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
} catch (IOException e) { logger.info(putObjectResult.getRequestId());
throw new RuntimeException(e); file.delete();
} } catch (CosServiceException e) {
BufferedReader readerClass = new BufferedReader(new InputStreamReader(processClass.getInputStream())); logger.info("cos服务出现问题");
String lineClass; e.printStackTrace();
while (true) { } catch (CosClientException e) {
try { logger.info("cos客户端出现问题"+file.getName()+"文件上传有误,重新上传");
if (!((lineClass = readerClass.readLine()) != null)) break; e.printStackTrace();
} catch (IOException e) {
throw new RuntimeException(e);
}
} }
try { }
int exitCodeSubject = processClass.waitFor(); final Map<String, List<ClassBasicReportParameters>> collect = params.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getClassName));
} catch (InterruptedException e) { List<ClassBasicReportParameters> list = collect.get(arg.getClassName());
throw new RuntimeException(e); 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); // 合并标准输出和错误输出
Process processClassSubject = processBuilderClassSubject.start();
BufferedReader readerClassSubject = new BufferedReader(new InputStreamReader(processClassSubject.getInputStream()));
String lineClassSubject;
while ((lineClassSubject = readerClassSubject.readLine()) != null) {
} }
File classBasicFile = new File("/myworkSpace/Class/Basic/"); int exitCodeSubjectClass = processClassSubject.waitFor();
File[] classBasicFiles = classBasicFile.listFiles(); File classSubjectFile = new File("/myworkSpace/Class/subject/");
assert classBasicFiles != null; File[] classSubjectFiles = classSubjectFile.listFiles();
for (File file : classBasicFiles) { assert classSubjectFiles != null;
for (File file : classSubjectFiles) {
logger.info(file.getName()+"=file—>key="+fileToUrl.get(file.getName()));
PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, fileToUrl.get(file.getName()), file); PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, fileToUrl.get(file.getName()), file);
try { try {
PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest); PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
...@@ -353,64 +339,17 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -353,64 +339,17 @@ public class GeneratorAllTypePdfByProvinceController {
e.printStackTrace(); e.printStackTrace();
} }
} }
final Map<String, List<ClassBasicReportParameters>> collect = params.stream().collect(Collectors.groupingBy(ClassBasicReportParameters::getClassName));
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); // 合并标准输出和错误输出
Process processClassSubject = null;
try {
processClassSubject = processBuilderClassSubject.start();
} catch (IOException e) {
throw new RuntimeException(e);
}
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);
}
}
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;
for (File file : classSubjectFiles) {
logger.info(file.getName()+"=file—>key="+fileToUrl.get(file.getName()));
PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, fileToUrl.get(file.getName()), file);
try {
PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
logger.info(putObjectResult.getRequestId());
file.delete();
} catch (CosServiceException e) {
logger.info("cos服务出现问题");
e.printStackTrace();
} catch (CosClientException e) {
logger.info("cos客户端出现问题"+file.getName()+"文件上传有误,重新上传");
e.printStackTrace();
}
}
}
} }
//插入数据 }
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()); //插入数据
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); logger.info("Rows affected:" + rowsAffected);
});
} }
} }
return 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