Skip to content

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

测试服务器生成的效率

parent ee95caf5
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 127 deletions
src/main/java/com/example/pdfgenerator/config/CommonConfig.java
View file @ bacc9730
...@@ -20,7 +20,6 @@ public class CommonConfig { ...@@ -20,7 +20,6 @@ public class CommonConfig {
Region region = new Region("ap-beijing"); Region region = new Region("ap-beijing");
ClientConfig clientConfig = new ClientConfig(region); ClientConfig clientConfig = new ClientConfig(region);
clientConfig.setHttpProtocol(HttpProtocol.https); clientConfig.setHttpProtocol(HttpProtocol.https);
// 3 生成 cos 客户端。 // 3 生成 cos 客户端。
return new COSClient(cred, clientConfig); return new COSClient(cred, clientConfig);
} }
......
src/main/java/com/example/pdfgenerator/controller/GeneratorAllTypePdfByProvinceController.java
View file @ bacc9730
...@@ -145,22 +145,22 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -145,22 +145,22 @@ public class GeneratorAllTypePdfByProvinceController {
for (BasicReportParameters parameter : synthesisSchoolSubjectReportParameters) { for (BasicReportParameters parameter : synthesisSchoolSubjectReportParameters) {
if(parameter.getRegion().equals("改革")||parameter.getRegion().equals("改革A")||parameter.getRegion().equals("改革3+3")||parameter.getRegion().equals("改革3+1+2")){ if(parameter.getRegion().equals("改革")||parameter.getRegion().equals("改革A")||parameter.getRegion().equals("改革3+3")||parameter.getRegion().equals("改革3+1+2")){
String command = "node /myworkSpace/puppeteer2.js \"http://schoolreport.cssat.cn/pdf/subject?province=condition5&school=condition1&examId=condition4&region=conditionC&subSubject=condition6&subjectType=常规\" pdf"; String command = "node D:/myworkSpace/puppeteer2.js \"http://schoolreport.cssat.cn/pdf/subject?province=condition5&school=condition1&examId=condition4&region=conditionC&subSubject=condition6&subjectType=常规\" pdf";
String fileName = "/myworkSpace/subject/" + parameter.getRegion() + parameter.getProvince() + parameter.getSchool() + parameter.getSubSubject() + parameter.getExamId() + ".pdf"; String fileName = "D:/myworkSpace/subject/" + parameter.getRegion() + parameter.getProvince() + parameter.getSchool() + parameter.getSubSubject() + parameter.getExamId() + ".pdf";
command = command.replace("condition1", parameter.getSchool()).replace("condition5", parameter.getProvince()).replace("conditionC", parameter.getRegion()).replace("condition4", parameter.getExamId()).replace("condition6", parameter.getSubSubject()) command = command.replace("condition1", parameter.getSchool()).replace("condition5", parameter.getProvince()).replace("conditionC", parameter.getRegion()).replace("condition4", parameter.getExamId()).replace("condition6", parameter.getSubSubject())
.concat(" ").concat(fileName); .concat(" ").concat(fileName);
parameter.setCommand(command); parameter.setCommand(command);
parameter.setPrefix("/myworkSpace/subject/"); parameter.setPrefix("D:/myworkSpace/subject/");
fileToUrl.put(fileName.replace("/myworkSpace/subject/",""),"PdfSubject/"+fileName.replace("/myworkSpace/subject/","")); fileToUrl.put(fileName.replace("D:/myworkSpace/subject/",""),"PdfSubject/"+fileName.replace("D:/myworkSpace/subject/",""));
}else{ }else{
String command = "node /myworkSpace/puppeteer2.js \"http://schoolreport.cssat.cn/pdf/subject?province=condition5&school=condition1&examId=condition4&region=非改革&branch=condition3&subSubject=condition6&subjectType=常规\" pdf"; String command = "node D:/myworkSpace/puppeteer2.js \"http://schoolreport.cssat.cn/pdf/subject?province=condition5&school=condition1&examId=condition4&region=非改革&branch=condition3&subSubject=condition6&subjectType=常规\" pdf";
String fileName = "/myworkSpace/subject/" + parameter.getRegion() + parameter.getProvince() + parameter.getSchool() + parameter.getSubSubject() + parameter.getExamId() + ".pdf"; String fileName = "D:/myworkSpace/subject/" + parameter.getRegion() + parameter.getProvince() + parameter.getSchool() + parameter.getSubSubject() + parameter.getExamId() + ".pdf";
command = command.replace("condition1", parameter.getSchool()).replace("condition5", parameter.getProvince()).replace("condition3", parameter.getRegion()).replace("condition4", parameter.getExamId()).replace("condition6", parameter.getSubSubject()) command = command.replace("condition1", parameter.getSchool()).replace("condition5", parameter.getProvince()).replace("condition3", parameter.getRegion()).replace("condition4", parameter.getExamId()).replace("condition6", parameter.getSubSubject())
.concat(" ").concat(fileName); .concat(" ").concat(fileName);
parameter.setCommand(command); parameter.setCommand(command);
parameter.setPrefix("/myworkSpace/subject/"); parameter.setPrefix("D:/myworkSpace/subject/");
fileToUrl.put(fileName.replace("/myworkSpace/subject/",""),"PdfSubject/"+fileName.replace("/myworkSpace/subject/","")); fileToUrl.put(fileName.replace("D:/myworkSpace/subject/",""),"PdfSubject/"+fileName.replace("D:/myworkSpace/subject/",""));
} }
} }
...@@ -168,21 +168,21 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -168,21 +168,21 @@ public class GeneratorAllTypePdfByProvinceController {
for (BasicReportParameters synthesisSchoolReportParameter : synthesisSchoolReportParameters) { for (BasicReportParameters synthesisSchoolReportParameter : synthesisSchoolReportParameters) {
if(synthesisSchoolReportParameter.getRegion().equals("改革")||synthesisSchoolReportParameter.getRegion().equals("改革A")||synthesisSchoolReportParameter.getRegion().equals("改革3+3")||synthesisSchoolReportParameter.getRegion().equals("改革3+1+2")){ if(synthesisSchoolReportParameter.getRegion().equals("改革")||synthesisSchoolReportParameter.getRegion().equals("改革A")||synthesisSchoolReportParameter.getRegion().equals("改革3+3")||synthesisSchoolReportParameter.getRegion().equals("改革3+1+2")){
String command = "node /myworkSpace/puppeteer.js \"http://schoolreport.cssat.cn/pdf/basic?province=condition5&school=condition1&examId=condition4&region=conditionC&subjectType=常规\" pdf "; String command = "node D:/myworkSpace/puppeteer.js \"http://schoolreport.cssat.cn/pdf/basic?province=condition5&school=condition1&examId=condition4&region=conditionC&subjectType=常规\" pdf ";
String fileName = "/myworkSpace/basic/"+synthesisSchoolReportParameter.getRegion()+synthesisSchoolReportParameter.getProvince()+synthesisSchoolReportParameter.getSchool()+synthesisSchoolReportParameter.getExamId()+".pdf"; String fileName = "D:/myworkSpace/basic/"+synthesisSchoolReportParameter.getRegion()+synthesisSchoolReportParameter.getProvince()+synthesisSchoolReportParameter.getSchool()+synthesisSchoolReportParameter.getExamId()+".pdf";
command = command.replace("condition1", synthesisSchoolReportParameter.getSchool()).replace("condition5", synthesisSchoolReportParameter.getProvince()).replace("conditionC",synthesisSchoolReportParameter.getRegion()).replace("condition4", synthesisSchoolReportParameter.getExamId()) command = command.replace("condition1", synthesisSchoolReportParameter.getSchool()).replace("condition5", synthesisSchoolReportParameter.getProvince()).replace("conditionC",synthesisSchoolReportParameter.getRegion()).replace("condition4", synthesisSchoolReportParameter.getExamId())
.concat(" ").concat(fileName); .concat(" ").concat(fileName);
synthesisSchoolReportParameter.setCommand(command); synthesisSchoolReportParameter.setCommand(command);
synthesisSchoolReportParameter.setPrefix("/myworkSpace/basic/"); synthesisSchoolReportParameter.setPrefix("D:/myworkSpace/basic/");
fileToUrl.put(fileName.replace("/myworkSpace/basic/",""),"PdfDir/"+fileName.replace("/myworkSpace/basic/","")); fileToUrl.put(fileName.replace("D:/myworkSpace/basic/",""),"PdfDir/"+fileName.replace("D:/myworkSpace/basic/",""));
}else{ }else{
String command = "node /myworkSpace/puppeteer.js \"http://schoolreport.cssat.cn/pdf/basic?province=condition5&school=condition1&examId=condition4&region=非改革&branch=condition3&subjectType=常规\" pdf "; String command = "node D:/myworkSpace/puppeteer.js \"http://schoolreport.cssat.cn/pdf/basic?province=condition5&school=condition1&examId=condition4&region=非改革&branch=condition3&subjectType=常规\" pdf ";
String fileName = "/myworkSpace/basic/"+synthesisSchoolReportParameter.getRegion()+synthesisSchoolReportParameter.getProvince()+synthesisSchoolReportParameter.getSchool()+synthesisSchoolReportParameter.getExamId()+".pdf"; String fileName = "D:/myworkSpace/basic/"+synthesisSchoolReportParameter.getRegion()+synthesisSchoolReportParameter.getProvince()+synthesisSchoolReportParameter.getSchool()+synthesisSchoolReportParameter.getExamId()+".pdf";
command = command.replace("condition1", synthesisSchoolReportParameter.getSchool()).replace("condition5", synthesisSchoolReportParameter.getProvince()).replace("condition3",synthesisSchoolReportParameter.getRegion()).replace("condition4", synthesisSchoolReportParameter.getExamId()) command = command.replace("condition1", synthesisSchoolReportParameter.getSchool()).replace("condition5", synthesisSchoolReportParameter.getProvince()).replace("condition3",synthesisSchoolReportParameter.getRegion()).replace("condition4", synthesisSchoolReportParameter.getExamId())
.concat(" ").concat(fileName); .concat(" ").concat(fileName);
synthesisSchoolReportParameter.setCommand(command); synthesisSchoolReportParameter.setCommand(command);
synthesisSchoolReportParameter.setPrefix("/myworkSpace/basic/"); synthesisSchoolReportParameter.setPrefix("D:/myworkSpace/basic/");
fileToUrl.put(fileName.replace("/myworkSpace/basic/",""),"PdfDir/"+fileName.replace("/myworkSpace/basic/","")); fileToUrl.put(fileName.replace("D:/myworkSpace/basic/",""),"PdfDir/"+fileName.replace("D:/myworkSpace/basic/",""));
} }
} }
...@@ -192,22 +192,22 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -192,22 +192,22 @@ public class GeneratorAllTypePdfByProvinceController {
for (ClassBasicReportParameters synthesisClassSubjectReportParameter : synthesisClassSubjectReportParameters) { for (ClassBasicReportParameters synthesisClassSubjectReportParameter : synthesisClassSubjectReportParameters) {
if (synthesisClassSubjectReportParameter.getRegion().equals("改革")||synthesisClassSubjectReportParameter.getRegion().equals("改革A")||synthesisClassSubjectReportParameter.getRegion().equals("改革3+3")||synthesisClassSubjectReportParameter.getRegion().equals("改革3+1+2")) { if (synthesisClassSubjectReportParameter.getRegion().equals("改革")||synthesisClassSubjectReportParameter.getRegion().equals("改革A")||synthesisClassSubjectReportParameter.getRegion().equals("改革3+3")||synthesisClassSubjectReportParameter.getRegion().equals("改革3+1+2")) {
String command = "node /myworkSpace/pdfOfClassSubjectGen.js \"http://schoolreport.cssat.cn/pdf/classSubject?province=condition5&school=condition1&examId=condition4&region=conditionC&subSubject=condition6&subjectType=常规&className=conditionA\" pdf"; String command = "node D:/myworkSpace/pdfOfClassSubjectGen.js \"http://schoolreport.cssat.cn/pdf/classSubject?province=condition5&school=condition1&examId=condition4&region=conditionC&subSubject=condition6&subjectType=常规&className=conditionA\" pdf";
String fileName = "/myworkSpace/Class/subject/" + synthesisClassSubjectReportParameter.getRegion() + synthesisClassSubjectReportParameter.getProvince() + synthesisClassSubjectReportParameter.getSchool() + synthesisClassSubjectReportParameter.getSubSubject() + synthesisClassSubjectReportParameter.getExamId() + synthesisClassSubjectReportParameter.getSubSubject() + synthesisClassSubjectReportParameter.getClassName().replace(" ","")+ ".pdf"; String fileName = "D:/myworkSpace/Class/subject/" + synthesisClassSubjectReportParameter.getRegion() + synthesisClassSubjectReportParameter.getProvince() + synthesisClassSubjectReportParameter.getSchool() + synthesisClassSubjectReportParameter.getSubSubject() + synthesisClassSubjectReportParameter.getExamId() + synthesisClassSubjectReportParameter.getSubSubject() + synthesisClassSubjectReportParameter.getClassName().replace(" ","")+ ".pdf";
command = command.replace("condition1", synthesisClassSubjectReportParameter.getSchool()).replace("condition5", synthesisClassSubjectReportParameter.getProvince()).replace("conditionC", synthesisClassSubjectReportParameter.getRegion()).replace("condition4", synthesisClassSubjectReportParameter.getExamId()).replace("condition6", synthesisClassSubjectReportParameter.getSubSubject()).replace("conditionA",synthesisClassSubjectReportParameter.getClassName()) command = command.replace("condition1", synthesisClassSubjectReportParameter.getSchool()).replace("condition5", synthesisClassSubjectReportParameter.getProvince()).replace("conditionC", synthesisClassSubjectReportParameter.getRegion()).replace("condition4", synthesisClassSubjectReportParameter.getExamId()).replace("condition6", synthesisClassSubjectReportParameter.getSubSubject()).replace("conditionA",synthesisClassSubjectReportParameter.getClassName())
.concat(" ").concat(fileName); .concat(" ").concat(fileName);
fileToUrl.put(fileName.replace("/myworkSpace/Class/subject/",""),"/class/"+synthesisClassSubjectReportParameter.getExamId()+"/"+synthesisClassSubjectReportParameter.getProvince()+"/"+synthesisClassSubjectReportParameter.getSchool()+"/班级学科报告/"+synthesisClassSubjectReportParameter.getClassName()+"/"+synthesisClassSubjectReportParameter.getSubSubject()+"/"+fileName.replace("/myworkSpace/Class/subject/","")); fileToUrl.put(fileName.replace("D:/myworkSpace/Class/subject/",""),"/class/"+synthesisClassSubjectReportParameter.getExamId()+"/"+synthesisClassSubjectReportParameter.getProvince()+"/"+synthesisClassSubjectReportParameter.getSchool()+"/班级学科报告/"+synthesisClassSubjectReportParameter.getClassName()+"/"+synthesisClassSubjectReportParameter.getSubSubject()+"/"+fileName.replace("D:/myworkSpace/Class/subject/",""));
synthesisClassSubjectReportParameter.setCommand(command); synthesisClassSubjectReportParameter.setCommand(command);
synthesisClassSubjectReportParameter.setPrefix("/myworkSpace/Class/subject/"); synthesisClassSubjectReportParameter.setPrefix("D:/myworkSpace/Class/subject/");
} else { } else {
String command = "node /myworkSpace/pdfOfClassSubjectGen.js \"http://schoolreport.cssat.cn/pdf/classSubject?province=condition5&school=condition1&examId=condition4&region=非改革&branch=condition3&subSubject=condition6&subjectType=常规&className=conditionA\" pdf"; String command = "node D:/myworkSpace/pdfOfClassSubjectGen.js \"http://schoolreport.cssat.cn/pdf/classSubject?province=condition5&school=condition1&examId=condition4&region=非改革&branch=condition3&subSubject=condition6&subjectType=常规&className=conditionA\" pdf";
String fileName = "/myworkSpace/Class/subject/" + synthesisClassSubjectReportParameter.getRegion() + synthesisClassSubjectReportParameter.getProvince() + synthesisClassSubjectReportParameter.getSchool() + synthesisClassSubjectReportParameter.getSubSubject() + synthesisClassSubjectReportParameter.getExamId() + synthesisClassSubjectReportParameter.getSubSubject() + synthesisClassSubjectReportParameter.getClassName().replace(" ","")+".pdf"; String fileName = "D:/myworkSpace/Class/subject/" + synthesisClassSubjectReportParameter.getRegion() + synthesisClassSubjectReportParameter.getProvince() + synthesisClassSubjectReportParameter.getSchool() + synthesisClassSubjectReportParameter.getSubSubject() + synthesisClassSubjectReportParameter.getExamId() + synthesisClassSubjectReportParameter.getSubSubject() + synthesisClassSubjectReportParameter.getClassName().replace(" ","")+".pdf";
command = command.replace("condition1", synthesisClassSubjectReportParameter.getSchool()).replace("condition5", synthesisClassSubjectReportParameter.getProvince()).replace("condition3", synthesisClassSubjectReportParameter.getRegion()).replace("condition4", synthesisClassSubjectReportParameter.getExamId()).replace("condition6", synthesisClassSubjectReportParameter.getSubSubject()).replace("conditionA",synthesisClassSubjectReportParameter.getClassName()) command = command.replace("condition1", synthesisClassSubjectReportParameter.getSchool()).replace("condition5", synthesisClassSubjectReportParameter.getProvince()).replace("condition3", synthesisClassSubjectReportParameter.getRegion()).replace("condition4", synthesisClassSubjectReportParameter.getExamId()).replace("condition6", synthesisClassSubjectReportParameter.getSubSubject()).replace("conditionA",synthesisClassSubjectReportParameter.getClassName())
.concat(" ").concat(fileName); .concat(" ").concat(fileName);
fileToUrl.put(fileName.replace("/myworkSpace/Class/subject/",""),"/class/"+synthesisClassSubjectReportParameter.getExamId()+"/"+synthesisClassSubjectReportParameter.getProvince()+"/"+synthesisClassSubjectReportParameter.getSchool()+"/班级学科报告/"+synthesisClassSubjectReportParameter.getClassName()+"/"+synthesisClassSubjectReportParameter.getSubSubject()+"/"+fileName.replace("/myworkSpace/Class/subject/","")); fileToUrl.put(fileName.replace("D:/myworkSpace/Class/subject/",""),"/class/"+synthesisClassSubjectReportParameter.getExamId()+"/"+synthesisClassSubjectReportParameter.getProvince()+"/"+synthesisClassSubjectReportParameter.getSchool()+"/班级学科报告/"+synthesisClassSubjectReportParameter.getClassName()+"/"+synthesisClassSubjectReportParameter.getSubSubject()+"/"+fileName.replace("D:/myworkSpace/Class/subject/",""));
synthesisClassSubjectReportParameter.setCommand(command); synthesisClassSubjectReportParameter.setCommand(command);
synthesisClassSubjectReportParameter.setPrefix("/myworkSpace/Class/subject/"); synthesisClassSubjectReportParameter.setPrefix("D:/myworkSpace/Class/subject/");
} }
} }
...@@ -217,33 +217,33 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -217,33 +217,33 @@ public class GeneratorAllTypePdfByProvinceController {
if(synthesisClassReportParameter.getRegion().equals("改革")||synthesisClassReportParameter.getRegion().equals("改革A")||synthesisClassReportParameter.getRegion().equals("改革3+3")||synthesisClassReportParameter.getRegion().equals("改革3+1+2")){ if(synthesisClassReportParameter.getRegion().equals("改革")||synthesisClassReportParameter.getRegion().equals("改革A")||synthesisClassReportParameter.getRegion().equals("改革3+3")||synthesisClassReportParameter.getRegion().equals("改革3+1+2")){
String command = "node /myworkSpace/pdfOfClassBasicGen.js \"http://schoolreport.cssat.cn/pdf/classBasic?province=condition5&school=condition1&examId=condition4&region=conditionC&subjectType=常规&className=conditionA\" pdf "; String command = "node D:/myworkSpace/pdfOfClassBasicGen.js \"http://schoolreport.cssat.cn/pdf/classBasic?province=condition5&school=condition1&examId=condition4&region=conditionC&subjectType=常规&className=conditionA\" pdf ";
String fileName = "/myworkSpace/Class/Basic/"+synthesisClassReportParameter.getRegion()+synthesisClassReportParameter.getProvince()+synthesisClassReportParameter.getSchool()+ synthesisClassReportParameter.getClassName()+synthesisClassReportParameter.getExamId()+".pdf"; String fileName = "D:/myworkSpace/Class/Basic/"+synthesisClassReportParameter.getRegion()+synthesisClassReportParameter.getProvince()+synthesisClassReportParameter.getSchool()+ synthesisClassReportParameter.getClassName()+synthesisClassReportParameter.getExamId()+".pdf";
command = command.replace("condition1", synthesisClassReportParameter.getSchool()).replace("condition5", synthesisClassReportParameter.getProvince()).replace("conditionC",synthesisClassReportParameter.getRegion()).replace("condition4", synthesisClassReportParameter.getExamId()).replace("conditionA",synthesisClassReportParameter.getClassName()) command = command.replace("condition1", synthesisClassReportParameter.getSchool()).replace("condition5", synthesisClassReportParameter.getProvince()).replace("conditionC",synthesisClassReportParameter.getRegion()).replace("condition4", synthesisClassReportParameter.getExamId()).replace("conditionA",synthesisClassReportParameter.getClassName())
.concat(" ").concat(fileName); .concat(" ").concat(fileName);
fileToUrl.put(fileName.replace("/myworkSpace/Class/Basic/",""),"/class/"+synthesisClassReportParameter.getExamId()+"/"+synthesisClassReportParameter.getProvince()+"/"+synthesisClassReportParameter.getSchool()+"/班级综合报告/"+synthesisClassReportParameter.getClassName()+"/"+fileName.replace("/myworkSpace/Class/Basic/","")); fileToUrl.put(fileName.replace("D:/myworkSpace/Class/Basic/",""),"/class/"+synthesisClassReportParameter.getExamId()+"/"+synthesisClassReportParameter.getProvince()+"/"+synthesisClassReportParameter.getSchool()+"/班级综合报告/"+synthesisClassReportParameter.getClassName()+"/"+fileName.replace("D:/myworkSpace/Class/Basic/",""));
synthesisClassReportParameter.setCommand(command); synthesisClassReportParameter.setCommand(command);
synthesisClassReportParameter.setPrefix("/myworkSpace/Class/Basic/"); synthesisClassReportParameter.setPrefix("D:/myworkSpace/Class/Basic/");
} else { } else {
String command = "node/myworkSpace/pdfOfClassBasicGen.js \"http://schoolreport.cssat.cn/pdf/classBasic?province=condition5&school=condition1&examId=condition4&region=非改革&branch=condition3&subjectType=常规&className=conditionA\" pdf "; String command = "nodeD:/myworkSpace/pdfOfClassBasicGen.js \"http://schoolreport.cssat.cn/pdf/classBasic?province=condition5&school=condition1&examId=condition4&region=非改革&branch=condition3&subjectType=常规&className=conditionA\" pdf ";
String fileName = "/myworkSpace/Class/Basic/"+synthesisClassReportParameter.getRegion()+synthesisClassReportParameter.getProvince()+synthesisClassReportParameter.getSchool()+synthesisClassReportParameter.getClassName()+synthesisClassReportParameter.getExamId()+".pdf"; String fileName = "D:/myworkSpace/Class/Basic/"+synthesisClassReportParameter.getRegion()+synthesisClassReportParameter.getProvince()+synthesisClassReportParameter.getSchool()+synthesisClassReportParameter.getClassName()+synthesisClassReportParameter.getExamId()+".pdf";
command = command.replace("condition1", synthesisClassReportParameter.getSchool()).replace("condition5", synthesisClassReportParameter.getProvince()).replace("condition3",synthesisClassReportParameter.getRegion()).replace("condition4", synthesisClassReportParameter.getExamId()).replace("conditionA",synthesisClassReportParameter.getClassName()) command = command.replace("condition1", synthesisClassReportParameter.getSchool()).replace("condition5", synthesisClassReportParameter.getProvince()).replace("condition3",synthesisClassReportParameter.getRegion()).replace("condition4", synthesisClassReportParameter.getExamId()).replace("conditionA",synthesisClassReportParameter.getClassName())
.concat(" ").concat(fileName); .concat(" ").concat(fileName);
fileToUrl.put(fileName.replace("/myworkSpace/Class/Basic/",""),"/class/"+synthesisClassReportParameter.getExamId()+"/"+synthesisClassReportParameter.getProvince()+"/"+synthesisClassReportParameter.getSchool()+"/班级综合报告/"+synthesisClassReportParameter.getClassName()+"/"+fileName.replace("/myworkSpace/Class/Basic/","")); fileToUrl.put(fileName.replace("D:/myworkSpace/Class/Basic/",""),"/class/"+synthesisClassReportParameter.getExamId()+"/"+synthesisClassReportParameter.getProvince()+"/"+synthesisClassReportParameter.getSchool()+"/班级综合报告/"+synthesisClassReportParameter.getClassName()+"/"+fileName.replace("D:/myworkSpace/Class/Basic/",""));
synthesisClassReportParameter.setCommand(command); synthesisClassReportParameter.setCommand(command);
synthesisClassReportParameter.setPrefix("/myworkSpace/Class/Basic/"); synthesisClassReportParameter.setPrefix("D:/myworkSpace/Class/Basic/");
} }
} }
...@@ -277,7 +277,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -277,7 +277,7 @@ public class GeneratorAllTypePdfByProvinceController {
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("cmd.exe", "/c", schoolLevel.getCommand());
processBuilder.redirectErrorStream(true); // 合并标准输出和错误输出 processBuilder.redirectErrorStream(true); // 合并标准输出和错误输出
Process process = null; Process process = null;
try { try {
...@@ -306,7 +306,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -306,7 +306,7 @@ public class GeneratorAllTypePdfByProvinceController {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
//上传文件 //上传文件
File basicFile = new File("/myworkSpace/basic/"); File basicFile = new File("D:/myworkSpace/basic/");
File[] basicFiles = basicFile.listFiles(); File[] basicFiles = basicFile.listFiles();
assert basicFiles != null; assert basicFiles != null;
for (File file : basicFiles) { for (File file : basicFiles) {
...@@ -331,7 +331,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -331,7 +331,7 @@ public class GeneratorAllTypePdfByProvinceController {
logger.info("subjectReport:loading"); logger.info("subjectReport:loading");
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("cmd.exe", "/c", parameters.getCommand());
processBuilderSubject.redirectErrorStream(true); // 合并标准输出和错误输出 processBuilderSubject.redirectErrorStream(true); // 合并标准输出和错误输出
Process processSubject = null; Process processSubject = null;
try { try {
...@@ -359,7 +359,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -359,7 +359,7 @@ public class GeneratorAllTypePdfByProvinceController {
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
File subjectFile = new File("/myworkSpace/subject/"); File subjectFile = new File("D:/myworkSpace/subject/");
File[] subjectFiles = subjectFile.listFiles(); File[] subjectFiles = subjectFile.listFiles();
assert subjectFiles != null; assert subjectFiles != null;
for (File file : subjectFiles) { for (File file : subjectFiles) {
...@@ -387,7 +387,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -387,7 +387,7 @@ public class GeneratorAllTypePdfByProvinceController {
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("cmd.exe", "/c", arg.getCommand());
processBuilderClass.redirectErrorStream(true); // 合并标准输出和错误输出 processBuilderClass.redirectErrorStream(true); // 合并标准输出和错误输出
Process processClass = null; Process processClass = null;
try { try {
...@@ -415,7 +415,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -415,7 +415,7 @@ public class GeneratorAllTypePdfByProvinceController {
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
File classBasicFile = new File("/myworkSpace/Class/Basic/"); File classBasicFile = new File("D:/myworkSpace/Class/Basic/");
File[] classBasicFiles = classBasicFile.listFiles(); File[] classBasicFiles = classBasicFile.listFiles();
assert classBasicFiles != null; assert classBasicFiles != null;
for (File file : classBasicFiles) { for (File file : classBasicFiles) {
...@@ -442,7 +442,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -442,7 +442,7 @@ public class GeneratorAllTypePdfByProvinceController {
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("cmd.exe", "/c", classBasicReportParameters.getCommand());
processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出 processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出
Process processClassSubject = null; Process processClassSubject = null;
try { try {
...@@ -470,7 +470,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -470,7 +470,7 @@ public class GeneratorAllTypePdfByProvinceController {
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
File classSubjectFile = new File("/myworkSpace/Class/subject/"); File classSubjectFile = new File("D:/myworkSpace/Class/subject/");
File[] classSubjectFiles = classSubjectFile.listFiles(); File[] classSubjectFiles = classSubjectFile.listFiles();
assert classSubjectFiles != null; assert classSubjectFiles != null;
for (File file : classSubjectFiles) { for (File file : classSubjectFiles) {
...@@ -512,7 +512,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -512,7 +512,7 @@ public class GeneratorAllTypePdfByProvinceController {
logger.info("RetryCommand:ls"); logger.info("RetryCommand:ls");
ProcessBuilder processBuilderClassSubject = new ProcessBuilder(); ProcessBuilder processBuilderClassSubject = new ProcessBuilder();
processBuilderClassSubject.command("bash", "-c", command); processBuilderClassSubject.command("cmd.exe", "/c", command);
processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出 processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出
Process processClassSubject = null; Process processClassSubject = null;
try { try {
......
src/test/java/com/example/pdfgenerator/DataProcessing/ClassIncrement.java
View file @ bacc9730
...@@ -22,11 +22,12 @@ import java.util.stream.Collectors; ...@@ -22,11 +22,12 @@ import java.util.stream.Collectors;
public class ClassIncrement { public class ClassIncrement {
@Test @Test
public void GeProvinceQuesTypeSituation(){ public void GeProvinceQuesTypeSituation(){
String sql = "select region1" + String sql = "select region1" +
" as region,province from base_province_subject_tda20241215 where subject_type = '常规' group by region1,province"; " as region,province from base_province_subject_tda20250227 where subject_type = '常规' group by region1,province";
JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
List<Params> params = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Params.class)); List<Params> params = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Params.class));
for (Params param : params) { for (Params param : params) {
...@@ -43,25 +44,25 @@ public class ClassIncrement { ...@@ -43,25 +44,25 @@ public class ClassIncrement {
"sub_subject,\n" + "sub_subject,\n" +
"stu_id\n" + "stu_id\n" +
"from\n" + "from\n" +
"base_student_ques_type_tda20241215\n" + "base_student_ques_type_tda20250227\n" +
"where\n" + "where\n" +
"region1 = '"+region+"'\n" + "region1 = '"+region+"'\n" +
"AND province = '"+province+"'\n" + "AND province = '"+province+"'\n" +
"\t\t\tAND subject_type = '常规' \n" + "\t\t\tAND subject_type = '常规' \n" +
"\t\t\tAND exam_id = 'TDA20241215G3'\n"; "\t\t\tAND exam_id = 'TDA20250227G3'\n";
List<DtoArgs> list = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(DtoArgs.class)); List<DtoArgs> list = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(DtoArgs.class));
Map<String, List<DtoArgs>> collect = list.stream().collect(Collectors.groupingBy(DtoArgs::getSubSubject)); Map<String, List<DtoArgs>> collect = list.stream().collect(Collectors.groupingBy(DtoArgs::getSubSubject));
for(String subject : collect.keySet()){ for(String subject : collect.keySet()){
String sql2 = "SELECT\n" + String sql2 = "SELECT\n" +
"\tstu_id \n" + "\tstu_id \n" +
"FROM\n" + "FROM\n" +
"\tbase_student_subject_tda20241215 \n" + "\tbase_student_subject_tda20250227 \n" +
"WHERE\n" + "WHERE\n" +
"\tstu_subject_score_rate_province_pct_rank >= ( 1-0.27 ) \n" + "\tstu_subject_score_rate_province_pct_rank >= ( 1-0.27 ) \n" +
"\tAND region1 = '"+region+"' \n" + "\tAND region1 = '"+region+"' \n" +
"\tAND province = '"+province+"' \n" + "\tAND province = '"+province+"' \n" +
"\tAND subject_type = '常规' \n" + "\tAND subject_type = '常规' \n" +
"\tAND exam_id = 'TDA20241215G3' \n" + "\tAND exam_id = 'TDA20250227G3' \n" +
"\tAND sub_subject = '"+subject+"'"; "\tAND sub_subject = '"+subject+"'";
List<String> excellentIds = jdbcTemplate.queryForList(sql2,String.class); List<String> excellentIds = jdbcTemplate.queryForList(sql2,String.class);
...@@ -93,7 +94,7 @@ public class ClassIncrement { ...@@ -93,7 +94,7 @@ public class ClassIncrement {
params.put("Mean",resultMean); params.put("Mean",resultMean);
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
namedParameterJdbcTemplate.update("insert into province_ques_type_excellent20241215(region,province,sub_subject,mean,ques_type) value (:region,:province,:subSubject,:Mean,:quesType)",new MapSqlParameterSource(params)); namedParameterJdbcTemplate.update("insert into province_ques_type_excellent20250227(region,province,sub_subject,mean,ques_type) value (:region,:province,:subSubject,:Mean,:quesType)",new MapSqlParameterSource(params));
} }
} }
...@@ -104,7 +105,7 @@ public class ClassIncrement { ...@@ -104,7 +105,7 @@ public class ClassIncrement {
@Test @Test
public void GeProvinceExcellentDifficultySituations(){ public void GeProvinceExcellentDifficultySituations(){
String sql = "select region1 as region,province from base_province_subject_tda20241215 where subject_type = '常规' group by region1,province"; String sql = "select region1 as region,province from base_province_subject_tda20250227 where subject_type = '常规' group by region1,province";
JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
List<Params> params = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Params.class)); List<Params> params = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Params.class));
for (Params param : params) { for (Params param : params) {
...@@ -126,8 +127,8 @@ public class ClassIncrement { ...@@ -126,8 +127,8 @@ public class ClassIncrement {
"\tb.`ques_max_score`,\n" + "\tb.`ques_max_score`,\n" +
"\tb.`stu_id`\n" + "\tb.`stu_id`\n" +
"\tFROM\n" + "\tFROM\n" +
"\tbase_area_question_tda20241215 a\n" + "\tbase_area_question_tda20250227 a\n" +
"\tleft join base_student_question_tda20241215 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject` and a.region1 = b.region1 and a.subject_type = b.subject_type\n" + "\tleft join base_student_question_tda20250227 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject` and a.region1 = b.region1 and a.subject_type = b.subject_type\n" +
"\twhere a.subject_type = '常规' and a.region1 = '"+region+"' and b.province = '"+province+"'"; "\twhere a.subject_type = '常规' and a.region1 = '"+region+"' and b.province = '"+province+"'";
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
...@@ -139,7 +140,7 @@ public class ClassIncrement { ...@@ -139,7 +140,7 @@ public class ClassIncrement {
for (String subject : collect.keySet()) { for (String subject : collect.keySet()) {
String sql2 = "select stu_id from base_student_subject_tda20241215 where sub_subject = '"+subject+"' and region1 = '"+region+"' and province = '"+province +"' and stu_subject_score_rate_province_pct_rank >= 0.73 and subject_type = '常规'"; String sql2 = "select stu_id from base_student_subject_tda20250227 where sub_subject = '"+subject+"' and region1 = '"+region+"' and province = '"+province +"' and stu_subject_score_rate_province_pct_rank >= 0.73 and subject_type = '常规'";
List<String> excellentIds = namedParameterJdbcTemplate.queryForList(sql2,new HashMap<>(),String.class); List<String> excellentIds = namedParameterJdbcTemplate.queryForList(sql2,new HashMap<>(),String.class);
...@@ -232,11 +233,11 @@ public class ClassIncrement { ...@@ -232,11 +233,11 @@ public class ClassIncrement {
put("scoreMean", nanResult); put("scoreMean", nanResult);
}}; }};
namedParameterJdbcTemplate.update("insert into province_excellent_difficult20241215(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsYi)); namedParameterJdbcTemplate.update("insert into province_excellent_difficult20250227(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsYi));
namedParameterJdbcTemplate.update("insert into province_excellent_difficult20241215(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi)); namedParameterJdbcTemplate.update("insert into province_excellent_difficult20250227(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi));
namedParameterJdbcTemplate.update("insert into province_excellent_difficult20241215(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsZhong)); namedParameterJdbcTemplate.update("insert into province_excellent_difficult20250227(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsZhong));
namedParameterJdbcTemplate.update("insert into province_excellent_difficult20241215(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan)); namedParameterJdbcTemplate.update("insert into province_excellent_difficult20250227(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan));
namedParameterJdbcTemplate.update("insert into province_excellent_difficult20241215(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsNan)); namedParameterJdbcTemplate.update("insert into province_excellent_difficult20250227(sub_subject,difficult,region,province,score_mean) value(:subSubject,:difficult,:region,:province,:scoreMean)",new MapSqlParameterSource(paramsNan));
} }
......
src/test/java/com/example/pdfgenerator/DataProcessing/Garbge.java
View file @ bacc9730
...@@ -25,7 +25,7 @@ public class Garbge { ...@@ -25,7 +25,7 @@ public class Garbge {
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
String sql = "select region1 from base_school_subject_tda20241215 where subject_type = '常规' group by region1"; String sql = "select region1 from base_school_subject_tda20250227 where subject_type = '常规' group by region1";
List<String> regions = jdbcTemplate.queryForList(sql, String.class); List<String> regions = jdbcTemplate.queryForList(sql, String.class);
for (String region : regions) { for (String region : regions) {
...@@ -41,7 +41,7 @@ public class Garbge { ...@@ -41,7 +41,7 @@ public class Garbge {
"sub_subject,\n" + "sub_subject,\n" +
"stu_id\n" + "stu_id\n" +
"from\n" + "from\n" +
"base_student_knowledge_tda20241215\n" + "base_student_knowledge_tda20250227\n" +
"where\n" + "where\n" +
"region1 = '"+region+"' and subject_type = '常规'"; "region1 = '"+region+"' and subject_type = '常规'";
...@@ -52,7 +52,7 @@ public class Garbge { ...@@ -52,7 +52,7 @@ public class Garbge {
String sql2 = "select \n" + String sql2 = "select \n" +
"stu_id\n" + "stu_id\n" +
"from \n" + "from \n" +
"base_student_subject_tda20241215\n" + "base_student_subject_tda20250227\n" +
"where\n" + "where\n" +
"sub_subject = '"+subject+"'\n" + "sub_subject = '"+subject+"'\n" +
"and\n" + "and\n" +
...@@ -81,7 +81,7 @@ public class Garbge { ...@@ -81,7 +81,7 @@ public class Garbge {
paramsYi.put("rate",resultRate); paramsYi.put("rate",resultRate);
reportJdbcTemplate.update("insert into knowledge_region_excellent20241215(sub_subject,knowledge,region,rate) value (:subSubject,:knowledge,:region,:rate)",new MapSqlParameterSource(paramsYi)); reportJdbcTemplate.update("insert into knowledge_region_excellent20250227(sub_subject,knowledge,region,rate) value (:subSubject,:knowledge,:region,:rate)",new MapSqlParameterSource(paramsYi));
} }
......
src/test/java/com/example/pdfgenerator/DataProcessing/GenerateTaskPool.java
View file @ bacc9730
...@@ -28,7 +28,7 @@ public class GenerateTaskPool { ...@@ -28,7 +28,7 @@ public class GenerateTaskPool {
"\tschool,\n" + "\tschool,\n" +
"\t0 as status\n" + "\t0 as status\n" +
"FROM\n" + "FROM\n" +
"\tbase_school_subject_tda20241215 \n" + "\tbase_school_subject_tda20250227 \n" +
"GROUP BY\n" + "GROUP BY\n" +
"\tregion1,\n" + "\tregion1,\n" +
"\tprovince,\n" + "\tprovince,\n" +
......
src/test/java/com/example/pdfgenerator/DataProcessing/NumberTwo.java
View file @ bacc9730
...@@ -22,7 +22,7 @@ public class NumberTwo { ...@@ -22,7 +22,7 @@ public class NumberTwo {
public void ProvinceExKnow(){ public void ProvinceExKnow(){
JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
String sql = "select region1 as region,province from base_school_subject_tda20241215 where subject_type = '常规' group by region1,province"; String sql = "select region1 as region,province from base_school_subject_tda20250227 where subject_type = '常规' group by region1,province";
List<Params> paramsList = namedParameterJdbcTemplate.query(sql,new BeanPropertyRowMapper<>(Params.class)); List<Params> paramsList = namedParameterJdbcTemplate.query(sql,new BeanPropertyRowMapper<>(Params.class));
for (Params param : paramsList) { for (Params param : paramsList) {
provinceExe(param.getRegion(),param.getProvince(),namedParameterJdbcTemplate); provinceExe(param.getRegion(),param.getProvince(),namedParameterJdbcTemplate);
...@@ -37,7 +37,7 @@ public class NumberTwo { ...@@ -37,7 +37,7 @@ public class NumberTwo {
"sub_subject,\n" + "sub_subject,\n" +
"stu_id\n" + "stu_id\n" +
"from\n" + "from\n" +
"base_student_knowledge_tda20241215\n" + "base_student_knowledge_tda20250227\n" +
"where\n" + "where\n" +
"region1 = '"+region+"' and subject_type = '常规' and province = '"+province+"'"; "region1 = '"+region+"' and subject_type = '常规' and province = '"+province+"'";
...@@ -49,12 +49,12 @@ public class NumberTwo { ...@@ -49,12 +49,12 @@ public class NumberTwo {
String sql3 = "\t\t\t\tSELECT\n" + String sql3 = "\t\t\t\tSELECT\n" +
"\t\t\tstu_id \n" + "\t\t\tstu_id \n" +
"\t\tFROM\n" + "\t\tFROM\n" +
"\t\t\tbase_student_subject_tda20241215 \n" + "\t\t\tbase_student_subject_tda20250227 \n" +
"\t\tWHERE\n" + "\t\tWHERE\n" +
"\t\t\tprovince = '"+province+"' \n" + "\t\t\tprovince = '"+province+"' \n" +
"\t\t\tAND region1 = '"+region+"' \n" + "\t\t\tAND region1 = '"+region+"' \n" +
"\t\t\tAND subject_type = '常规' \n" + "\t\t\tAND subject_type = '常规' \n" +
"\t\t\tAND exam_id = 'TDA20241215G3' \n" + "\t\t\tAND exam_id = 'TDA20250227G3' \n" +
"\t\t\tAND sub_subject = '"+subject+"' \n" + "\t\t\tAND sub_subject = '"+subject+"' \n" +
"\t\t\tAND stu_subject_score_rate_province_pct_rank >= (1-0.27) "; "\t\t\tAND stu_subject_score_rate_province_pct_rank >= (1-0.27) ";
...@@ -80,7 +80,7 @@ public class NumberTwo { ...@@ -80,7 +80,7 @@ public class NumberTwo {
}}; }};
paramsYi.put("rate",result); paramsYi.put("rate",result);
reportTemplate.update("insert into knowledge_province_excellent20241215(sub_subject,knowledge,region,rate,province) value (:subSubject,:knowledge,:region,:rate,:province)",new MapSqlParameterSource(paramsYi)); reportTemplate.update("insert into knowledge_province_excellent20250227(sub_subject,knowledge,region,rate,province) value (:subSubject,:knowledge,:region,:rate,:province)",new MapSqlParameterSource(paramsYi));
} }
} }
......
src/test/java/com/example/pdfgenerator/DataProcessing/PdfGeneratorApplicationTests.java
View file @ bacc9730
...@@ -34,7 +34,7 @@ class PdfGeneratorApplicationTests { ...@@ -34,7 +34,7 @@ class PdfGeneratorApplicationTests {
"\tschool,\n" + "\tschool,\n" +
"\tclass as className\n" + "\tclass as className\n" +
"FROM\n" + "FROM\n" +
"\tbase_class_subject_tda20241215 \n" + "\tbase_class_subject_tda20250227 \n" +
"WHERE\n" + "WHERE\n" +
"\tsubject_type = '常规' \n" + "\tsubject_type = '常规' \n" +
"GROUP BY\n" + "GROUP BY\n" +
...@@ -63,8 +63,8 @@ class PdfGeneratorApplicationTests { ...@@ -63,8 +63,8 @@ class PdfGeneratorApplicationTests {
"\tb.stu_ques_score,\n" + "\tb.stu_ques_score,\n" +
"\tb.`ques_max_score`,b.stu_ques_score\n" + "\tb.`ques_max_score`,b.stu_ques_score\n" +
"\tFROM\n" + "\tFROM\n" +
"\tbase_area_question_tda20241215 a\n" + "\tbase_area_question_tda20250227 a\n" +
"\tleft join base_student_question_tda20241215 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject`\n" +"and a.region1 = b.region1 "+ "\tleft join base_student_question_tda20250227 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject`\n" +"and a.region1 = b.region1 "+
"\twhere b.school = '"+school+"' and b.subject_type = '常规' and a.region1 = '"+region+"'"+"and class = '"+className+"'"; "\twhere b.school = '"+school+"' and b.subject_type = '常规' and a.region1 = '"+region+"'"+"and class = '"+className+"'";
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
...@@ -168,11 +168,11 @@ class PdfGeneratorApplicationTests { ...@@ -168,11 +168,11 @@ class PdfGeneratorApplicationTests {
put("region",region); put("region",region);
put("scoreMean", nanResult); put("scoreMean", nanResult);
}}; }};
namedParameterJdbcTemplate.update("insert into class_diffficult20241215(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi)); namedParameterJdbcTemplate.update("insert into class_diffficult20250227(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi));
namedParameterJdbcTemplate.update("insert into class_diffficult20241215(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi)); namedParameterJdbcTemplate.update("insert into class_diffficult20250227(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi));
namedParameterJdbcTemplate.update("insert into class_diffficult20241215(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong)); namedParameterJdbcTemplate.update("insert into class_diffficult20250227(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong));
namedParameterJdbcTemplate.update("insert into class_diffficult20241215(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan)); namedParameterJdbcTemplate.update("insert into class_diffficult20250227(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan));
namedParameterJdbcTemplate.update("insert into class_diffficult20241215(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan)); namedParameterJdbcTemplate.update("insert into class_diffficult20250227(class,school,sub_subject,difficult,region,score_mean) value(:class,:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan));
} }
} }
...@@ -181,7 +181,7 @@ class PdfGeneratorApplicationTests { ...@@ -181,7 +181,7 @@ class PdfGeneratorApplicationTests {
JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
String sql = "select school,region1 as region from base_school_subject_tda20241215 where subject_type = '常规' group by school,region1"; String sql = "select school,region1 as region from base_school_subject_tda20250227 where subject_type = '常规' group by school,region1";
List<Dto> listParams = reportJdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Dto.class)); List<Dto> listParams = reportJdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Dto.class));
...@@ -205,8 +205,8 @@ class PdfGeneratorApplicationTests { ...@@ -205,8 +205,8 @@ class PdfGeneratorApplicationTests {
"\tb.stu_ques_score,\n" + "\tb.stu_ques_score,\n" +
"\tb.`ques_max_score`\n" + "\tb.`ques_max_score`\n" +
"\tFROM\n" + "\tFROM\n" +
"\tbase_area_question_tda20241215 a\n" + "\tbase_area_question_tda20250227 a\n" +
"\tleft join base_student_question_tda20241215 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject`\n" +"and a.region1 = b.region1 "+ "\tleft join base_student_question_tda20250227 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject`\n" +"and a.region1 = b.region1 "+
"\twhere b.school = '"+school+"' and b.subject_type = '常规' and a.region1 = '"+region+"'"; "\twhere b.school = '"+school+"' and b.subject_type = '常规' and a.region1 = '"+region+"'";
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
...@@ -327,11 +327,11 @@ class PdfGeneratorApplicationTests { ...@@ -327,11 +327,11 @@ class PdfGeneratorApplicationTests {
put("scoreMean", nanResult); put("scoreMean", nanResult);
}}; }};
namedParameterJdbcTemplate.update("insert into school_diffficult20241215(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi)); namedParameterJdbcTemplate.update("insert into school_diffficult20250227(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi));
namedParameterJdbcTemplate.update("insert into school_diffficult20241215(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi)); namedParameterJdbcTemplate.update("insert into school_diffficult20250227(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi));
namedParameterJdbcTemplate.update("insert into school_diffficult20241215(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong)); namedParameterJdbcTemplate.update("insert into school_diffficult20250227(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong));
namedParameterJdbcTemplate.update("insert into school_diffficult20241215(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan)); namedParameterJdbcTemplate.update("insert into school_diffficult20250227(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan));
namedParameterJdbcTemplate.update("insert into school_diffficult20241215(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan)); namedParameterJdbcTemplate.update("insert into school_diffficult20250227(school,sub_subject,difficult,region,score_mean) value(:school,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan));
} }
// DeFenLu deFenLu = yi.get(0); // DeFenLu deFenLu = yi.get(0);
} }
...@@ -342,7 +342,7 @@ class PdfGeneratorApplicationTests { ...@@ -342,7 +342,7 @@ class PdfGeneratorApplicationTests {
public void TestInsertRegion(){ public void TestInsertRegion(){
JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
String sql = "select region1 from base_school_subject_tda20241215 where subject_type = '常规' group by region1"; String sql = "select region1 from base_school_subject_tda20250227 where subject_type = '常规' group by region1";
List<String> listParams = reportJdbcTemplate.queryForList(sql,String.class); List<String> listParams = reportJdbcTemplate.queryForList(sql,String.class);
...@@ -366,8 +366,8 @@ class PdfGeneratorApplicationTests { ...@@ -366,8 +366,8 @@ class PdfGeneratorApplicationTests {
"\tb.stu_ques_score,\n" + "\tb.stu_ques_score,\n" +
"\tb.`ques_max_score`\n" + "\tb.`ques_max_score`\n" +
"\tFROM\n" + "\tFROM\n" +
"\tbase_area_question_tda20241215 a\n" + "\tbase_area_question_tda20250227 a\n" +
"\tleft join base_student_question_tda20241215 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject` and a.region1 = b.region1 and a.subject_type = b.subject_type\n" + "\tleft join base_student_question_tda20250227 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject` and a.region1 = b.region1 and a.subject_type = b.subject_type\n" +
"\twhere a.subject_type = '常规' and a.region1 = '"+region+"'\n"; "\twhere a.subject_type = '常规' and a.region1 = '"+region+"'\n";
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
...@@ -463,11 +463,11 @@ class PdfGeneratorApplicationTests { ...@@ -463,11 +463,11 @@ class PdfGeneratorApplicationTests {
put("scoreMean", nanResult); put("scoreMean", nanResult);
}}; }};
namedParameterJdbcTemplate.update("insert into region_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi)); namedParameterJdbcTemplate.update("insert into region_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi));
namedParameterJdbcTemplate.update("insert into region_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi)); namedParameterJdbcTemplate.update("insert into region_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi));
namedParameterJdbcTemplate.update("insert into region_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong)); namedParameterJdbcTemplate.update("insert into region_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong));
namedParameterJdbcTemplate.update("insert into region_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan)); namedParameterJdbcTemplate.update("insert into region_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan));
namedParameterJdbcTemplate.update("insert into region_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan)); namedParameterJdbcTemplate.update("insert into region_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan));
} }
...@@ -479,7 +479,7 @@ class PdfGeneratorApplicationTests { ...@@ -479,7 +479,7 @@ class PdfGeneratorApplicationTests {
JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
String sql = "select region1 as region ,province from base_school_subject_tda20241215 where subject_type = '常规' group by region1,province"; String sql = "select region1 as region ,province from base_school_subject_tda20250227 where subject_type = '常规' group by region1,province";
List<Params> paramsList = reportJdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Params.class)); List<Params> paramsList = reportJdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Params.class));
...@@ -507,8 +507,8 @@ class PdfGeneratorApplicationTests { ...@@ -507,8 +507,8 @@ class PdfGeneratorApplicationTests {
"\tb.stu_ques_score,\n" + "\tb.stu_ques_score,\n" +
"\tb.`ques_max_score`\n" + "\tb.`ques_max_score`\n" +
"\tFROM\n" + "\tFROM\n" +
"\tbase_area_question_tda20241215 a\n" + "\tbase_area_question_tda20250227 a\n" +
"\tleft join base_student_question_tda20241215 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject` and a.region1 = b.region1 and a.subject_type = b.subject_type\n" + "\tleft join base_student_question_tda20250227 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject` and a.region1 = b.region1 and a.subject_type = b.subject_type\n" +
"\twhere a.subject_type = '常规' and a.region1 = '"+region+"' and b.province = '"+province+"'"; "\twhere a.subject_type = '常规' and a.region1 = '"+region+"' and b.province = '"+province+"'";
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
...@@ -605,11 +605,11 @@ class PdfGeneratorApplicationTests { ...@@ -605,11 +605,11 @@ class PdfGeneratorApplicationTests {
put("region",region); put("region",region);
put("scoreMean", nanResult); put("scoreMean", nanResult);
}}; }};
namedParameterJdbcTemplate.update("insert into province_difficult20241215(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi)); namedParameterJdbcTemplate.update("insert into province_difficult20250227(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi));
namedParameterJdbcTemplate.update("insert into province_difficult20241215(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi)); namedParameterJdbcTemplate.update("insert into province_difficult20250227(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi));
namedParameterJdbcTemplate.update("insert into province_difficult20241215(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong)); namedParameterJdbcTemplate.update("insert into province_difficult20250227(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong));
namedParameterJdbcTemplate.update("insert into province_difficult20241215(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan)); namedParameterJdbcTemplate.update("insert into province_difficult20250227(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan));
namedParameterJdbcTemplate.update("insert into province_difficult20241215(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan)); namedParameterJdbcTemplate.update("insert into province_difficult20250227(province,sub_subject,difficult,region,score_mean) value(:province,:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan));
} }
...@@ -622,7 +622,7 @@ class PdfGeneratorApplicationTests { ...@@ -622,7 +622,7 @@ class PdfGeneratorApplicationTests {
JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
String sql = "select region1 from base_school_subject_tda20241215 where subject_type ='常规' group by region1"; String sql = "select region1 from base_school_subject_tda20250227 where subject_type ='常规' group by region1";
List<String> regions = jdbcTemplate.queryForList(sql,new Object[]{},String.class); List<String> regions = jdbcTemplate.queryForList(sql,new Object[]{},String.class);
for (String region : regions) { for (String region : regions) {
...@@ -645,8 +645,8 @@ class PdfGeneratorApplicationTests { ...@@ -645,8 +645,8 @@ class PdfGeneratorApplicationTests {
" b.`ques_max_score`,\n" + " b.`ques_max_score`,\n" +
" b.`stu_id`\n" + " b.`stu_id`\n" +
" FROM\n" + " FROM\n" +
" base_area_question_tda20241215 a\n" + " base_area_question_tda20250227 a\n" +
" left join base_student_question_tda20241215 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject` and a.region1 = b.region1 and a.subject_type = b.subject_type\n" + " left join base_student_question_tda20250227 b on a.ques_no = b.ques_no and a.sub_subject = b.`sub_subject` and a.region1 = b.region1 and a.subject_type = b.subject_type\n" +
" where a.subject_type = '常规' and a.region1 = '"+region+"'"; " where a.subject_type = '常规' and a.region1 = '"+region+"'";
...@@ -666,7 +666,7 @@ class PdfGeneratorApplicationTests { ...@@ -666,7 +666,7 @@ class PdfGeneratorApplicationTests {
//这个级别开始晒数据 //这个级别开始晒数据
String sql2 = "select stu_id from base_student_subject_tda20241215 where sub_subject = '"+subject+"' and region1 = '"+region+"' and stu_subject_score_rate_region_pct_rank >= 0.73 and subject_type = '常规'"; String sql2 = "select stu_id from base_student_subject_tda20250227 where sub_subject = '"+subject+"' and region1 = '"+region+"' and stu_subject_score_rate_region_pct_rank >= 0.73 and subject_type = '常规'";
List<String> excellent = namedParameterJdbcTemplate.queryForList(sql2,new HashMap<>(),String.class); List<String> excellent = namedParameterJdbcTemplate.queryForList(sql2,new HashMap<>(),String.class);
...@@ -752,11 +752,11 @@ class PdfGeneratorApplicationTests { ...@@ -752,11 +752,11 @@ class PdfGeneratorApplicationTests {
put("scoreMean", nanResult); put("scoreMean", nanResult);
}}; }};
namedParameterJdbcTemplate.update("insert into region_excellent_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi)); namedParameterJdbcTemplate.update("insert into region_excellent_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsYi));
namedParameterJdbcTemplate.update("insert into region_excellent_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi)); namedParameterJdbcTemplate.update("insert into region_excellent_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoYi));
namedParameterJdbcTemplate.update("insert into region_excellent_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong)); namedParameterJdbcTemplate.update("insert into region_excellent_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsZhong));
namedParameterJdbcTemplate.update("insert into region_excellent_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan)); namedParameterJdbcTemplate.update("insert into region_excellent_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsJiaoNan));
namedParameterJdbcTemplate.update("insert into region_excellent_difficult20241215(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan)); namedParameterJdbcTemplate.update("insert into region_excellent_difficult20250227(sub_subject,difficult,region,score_mean) value(:subSubject,:difficult,:region,:scoreMean)",new MapSqlParameterSource(paramsNan));
} }
...@@ -765,7 +765,7 @@ class PdfGeneratorApplicationTests { ...@@ -765,7 +765,7 @@ class PdfGeneratorApplicationTests {
@Test @Test
public void ExcellentAswTimeProvince(){ public void ExcellentAswTimeProvince(){
String sql = "select region1 as region,province from base_province_subject_tda20241215 where subject_type = '常规' group by region1,province"; String sql = "select region1 as region,province from base_province_subject_tda20250227 where subject_type = '常规' group by region1,province";
JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate jdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
List<Params> params = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Params.class)); List<Params> params = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(Params.class));
for (Params param : params) { for (Params param : params) {
...@@ -783,7 +783,7 @@ class PdfGeneratorApplicationTests { ...@@ -783,7 +783,7 @@ class PdfGeneratorApplicationTests {
"stu_ques_asw_time,\n" + "stu_ques_asw_time,\n" +
"sub_subject\n" + "sub_subject\n" +
"from \n" + "from \n" +
"base_student_question_log_time_tda20241215\n" + "base_student_question_log_time_tda20250227\n" +
"where\n" + "where\n" +
"region1 = '"+region+"'\n" + "region1 = '"+region+"'\n" +
"and \n" + "and \n" +
...@@ -791,7 +791,7 @@ class PdfGeneratorApplicationTests { ...@@ -791,7 +791,7 @@ class PdfGeneratorApplicationTests {
"and \n" + "and \n" +
"subject_type='常规'\n" + "subject_type='常规'\n" +
"and \n" + "and \n" +
"exam_id = 'TDA20241215G3'\n" ; "exam_id = 'TDA20250227G3'\n" ;
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
List<DtoAsw> listDtoAsw = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(DtoAsw.class)); List<DtoAsw> listDtoAsw = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(DtoAsw.class));
...@@ -801,7 +801,7 @@ class PdfGeneratorApplicationTests { ...@@ -801,7 +801,7 @@ class PdfGeneratorApplicationTests {
//科目粒度 //科目粒度
for (String subject : collect.keySet()) { for (String subject : collect.keySet()) {
System.out.println("operator"+subject+"科目"); System.out.println("operator"+subject+"科目");
String sql2 = "select stu_id from base_student_subject_tda20241215 where " + String sql2 = "select stu_id from base_student_subject_tda20250227 where " +
"region1 = '"+region+"'\n" + "region1 = '"+region+"'\n" +
"and \n" + "and \n" +
"sub_subject = '"+subject+"'\n" + "sub_subject = '"+subject+"'\n" +
...@@ -810,7 +810,7 @@ class PdfGeneratorApplicationTests { ...@@ -810,7 +810,7 @@ class PdfGeneratorApplicationTests {
"and \n" + "and \n" +
"subject_type= '常规'\n" + "subject_type= '常规'\n" +
"and \n" + "and \n" +
"exam_id = 'TDA20241215G3'\n" + "exam_id = 'TDA20250227G3'\n" +
"and \n" + "and \n" +
"stu_subject_score_rate_province_pct_rank >= (1-0.27)"; "stu_subject_score_rate_province_pct_rank >= (1-0.27)";
...@@ -834,7 +834,7 @@ class PdfGeneratorApplicationTests { ...@@ -834,7 +834,7 @@ class PdfGeneratorApplicationTests {
put("quesNo",ques_no); put("quesNo",ques_no);
put("time",avgTime); put("time",avgTime);
}}; }};
namedParameterJdbcTemplate.update("insert into province_excellent_asw_time20241215(sub_subject,province,region,ques_no,time) value (:subSubject,:province,:region,:quesNo,:time)",new MapSqlParameterSource(params)); namedParameterJdbcTemplate.update("insert into province_excellent_asw_time20250227(sub_subject,province,region,ques_no,time) value (:subSubject,:province,:region,:quesNo,:time)",new MapSqlParameterSource(params));
} }
} }
...@@ -843,7 +843,7 @@ class PdfGeneratorApplicationTests { ...@@ -843,7 +843,7 @@ class PdfGeneratorApplicationTests {
@Test @Test
public void ExcellentRegionAswTime(){ public void ExcellentRegionAswTime(){
String sql = "select region1 from base_province_subject_tda20241215 where subject_type = '常规' group by region1\n"; String sql = "select region1 from base_province_subject_tda20250227 where subject_type = '常规' group by region1\n";
JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
List<String> regions = reportJdbcTemplate.queryForList(sql,String.class); List<String> regions = reportJdbcTemplate.queryForList(sql,String.class);
for (String region : regions) { for (String region : regions) {
...@@ -860,13 +860,13 @@ class PdfGeneratorApplicationTests { ...@@ -860,13 +860,13 @@ class PdfGeneratorApplicationTests {
"stu_id,\n" + "stu_id,\n" +
"stu_ques_asw_time\n" + "stu_ques_asw_time\n" +
"from \n" + "from \n" +
"base_student_question_log_time_tda20241215\n" + "base_student_question_log_time_tda20250227\n" +
"where\n" + "where\n" +
"region1 = '"+region+"'\n" + "region1 = '"+region+"'\n" +
"and \n" + "and \n" +
"subject_type= '常规'\n" + "subject_type= '常规'\n" +
"and \n" + "and \n" +
"exam_id = 'TDA20241215G3'\n"; "exam_id = 'TDA20250227G3'\n";
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
List<DtoAsw> list = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(DtoAsw.class)); List<DtoAsw> list = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(DtoAsw.class));
...@@ -874,14 +874,14 @@ class PdfGeneratorApplicationTests { ...@@ -874,14 +874,14 @@ class PdfGeneratorApplicationTests {
Map<String, List<DtoAsw>> collect = list.stream().collect(Collectors.groupingBy(DtoAsw::getSubSubject)); Map<String, List<DtoAsw>> collect = list.stream().collect(Collectors.groupingBy(DtoAsw::getSubSubject));
for (String subject : collect.keySet()) { for (String subject : collect.keySet()) {
String sql2 = "select stu_id from base_student_subject_tda20241215 where " + String sql2 = "select stu_id from base_student_subject_tda20250227 where " +
"region1 = '"+region+"'\n" + "region1 = '"+region+"'\n" +
"and \n" + "and \n" +
"sub_subject = '"+subject+"'\n" + "sub_subject = '"+subject+"'\n" +
"and \n" + "and \n" +
"subject_type= '常规'\n" + "subject_type= '常规'\n" +
"and \n" + "and \n" +
"exam_id = 'TDA20241215G3'\n" + "exam_id = 'TDA20250227G3'\n" +
"and \n" + "and \n" +
"stu_subject_score_rate_region_pct_rank >= (1-0.27)"; "stu_subject_score_rate_region_pct_rank >= (1-0.27)";
List<String> yousheng = jdbcTemplate.queryForList(sql2,String.class); List<String> yousheng = jdbcTemplate.queryForList(sql2,String.class);
...@@ -899,7 +899,7 @@ class PdfGeneratorApplicationTests { ...@@ -899,7 +899,7 @@ class PdfGeneratorApplicationTests {
put("time",avgTime); put("time",avgTime);
}}; }};
namedParameterJdbcTemplate.update("insert into region_excellent_asw_time20241215(sub_subject,region,ques_no,time) value (:subSubject,:region,:quesNo,:time)",new MapSqlParameterSource(params)); namedParameterJdbcTemplate.update("insert into region_excellent_asw_time20250227(sub_subject,region,ques_no,time) value (:subSubject,:region,:quesNo,:time)",new MapSqlParameterSource(params));
} }
} }
...@@ -908,7 +908,7 @@ class PdfGeneratorApplicationTests { ...@@ -908,7 +908,7 @@ class PdfGeneratorApplicationTests {
@Test @Test
public void testQuesType(){ public void testQuesType(){
String sql = "select region1 from base_province_subject_tda20241215 where subject_type = '常规' group by region1\n"; String sql = "select region1 from base_province_subject_tda20250227 where subject_type = '常规' group by region1\n";
JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
List<String> regions = reportJdbcTemplate.queryForList(sql,String.class); List<String> regions = reportJdbcTemplate.queryForList(sql,String.class);
for (String region : regions) { for (String region : regions) {
...@@ -924,11 +924,11 @@ class PdfGeneratorApplicationTests { ...@@ -924,11 +924,11 @@ class PdfGeneratorApplicationTests {
"sub_subject,\n" + "sub_subject,\n" +
"stu_id\n" + "stu_id\n" +
"from\n" + "from\n" +
"base_student_ques_type_tda20241215\n" + "base_student_ques_type_tda20250227\n" +
"where\n" + "where\n" +
"region1 = '"+region+"'\n" + "region1 = '"+region+"'\n" +
"\t\t\tAND subject_type = '常规' \n" + "\t\t\tAND subject_type = '常规' \n" +
"\t\t\tAND exam_id = 'TDA20241215G3'\n"; "\t\t\tAND exam_id = 'TDA20250227G3'\n";
List<DtoArgs> list = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(DtoArgs.class)); List<DtoArgs> list = jdbcTemplate.query(sql,new Object[]{},new BeanPropertyRowMapper<>(DtoArgs.class));
Map<String, List<DtoArgs>> collect = list.stream().collect(Collectors.groupingBy(DtoArgs::getSubSubject)); Map<String, List<DtoArgs>> collect = list.stream().collect(Collectors.groupingBy(DtoArgs::getSubSubject));
...@@ -936,12 +936,12 @@ class PdfGeneratorApplicationTests { ...@@ -936,12 +936,12 @@ class PdfGeneratorApplicationTests {
String sql2 = "SELECT\n" + String sql2 = "SELECT\n" +
"\tstu_id \n" + "\tstu_id \n" +
"FROM\n" + "FROM\n" +
"\tbase_student_subject_tda20241215 \n" + "\tbase_student_subject_tda20250227 \n" +
"WHERE\n" + "WHERE\n" +
"\tstu_subject_score_rate_region_pct_rank >= ( 1-0.27 ) \n" + "\tstu_subject_score_rate_region_pct_rank >= ( 1-0.27 ) \n" +
"\tAND region1 = '"+region+"' \n" + "\tAND region1 = '"+region+"' \n" +
"\tAND subject_type = '常规' \n" + "\tAND subject_type = '常规' \n" +
"\tAND exam_id = 'TDA20241215G3' \n" + "\tAND exam_id = 'TDA20250227G3' \n" +
"\tAND sub_subject = '"+subject+"'"; "\tAND sub_subject = '"+subject+"'";
List<String> youshengIds = jdbcTemplate.queryForList(sql2, String.class); List<String> youshengIds = jdbcTemplate.queryForList(sql2, String.class);
...@@ -971,7 +971,7 @@ class PdfGeneratorApplicationTests { ...@@ -971,7 +971,7 @@ class PdfGeneratorApplicationTests {
params.put("Mean",resultMean); params.put("Mean",resultMean);
NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
namedParameterJdbcTemplate.update("insert into region_ques_type_excellent20241215(region,sub_subject,mean,ques_type) value (:region,:subSubject,:Mean,:quesType)",new MapSqlParameterSource(params)); namedParameterJdbcTemplate.update("insert into region_ques_type_excellent20250227(region,sub_subject,mean,ques_type) value (:region,:subSubject,:Mean,:quesType)",new MapSqlParameterSource(params));
} }
} }
......
src/test/java/com/example/pdfgenerator/GenerateTable/GenerateSchool.java
View file @ bacc9730
...@@ -14,7 +14,7 @@ public class GenerateSchool { ...@@ -14,7 +14,7 @@ public class GenerateSchool {
public void GenerateSchool(){ public void GenerateSchool(){
JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate(); JdbcTemplate reportJdbcTemplate = MyDataSourceConfig.getReportJdbcTemplate();
String examId = "TDA20241215G3"; String examId = "TDA20250227G3";
String suffix = examId.replace("TDA","").replace("G2","").replace("G3",""); String suffix = examId.replace("TDA","").replace("G2","").replace("G3","");
......
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