xx

src/main/java/com/example/pdfgenerator/config/MyDataSourceConfig.java

@@ -47,7 +47,7 @@ public class MyDataSourceConfig {
 
         System.err.println("print init reportSource...");
         //外网
-        String url = "jdbc:mysql://192.168.0.14:3306/tda_20250918?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8";
+        String url = "jdbc:mysql://192.168.0.14:3306/tda_20251030?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8";
         DruidDataSource dataSource  = getDataSource(url);
         dataSource.setUsername("root");
         dataSource.setPassword("Thussat@2023");

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

@@ -42,7 +42,7 @@ public class GeneratorAllTypePdfByProvinceController {
     @RequestMapping("/GeneratorByProvinceName")
     public ResponseEntity generatorName(@RequestParam("examId")String examId, @RequestParam(value = "provinceName",required = false)String provinceName,@RequestParam(value = "schoolName",required = false)String schoolName) throws IOException, InterruptedException {
 
-        String suffix  = examId.trim().replace("TDA","").replace("G3","").replace("G2","").replace("G11","").replace("G12","").trim();
+        String suffix  = examId.trim().replace("TDA","").replace("G3","").replace("G2","").replace("G10","").replace("G11","").replace("G12","").trim();
 
         String  synthesisSchoolSubjectReportSql = "select \n" +
                 "school,exam_id,province,region1 as  region,sub_subject\n" +
@@ -272,7 +272,7 @@ public class GeneratorAllTypePdfByProvinceController {
                 logger.info("basicReport:loading");
                 logger.info("exitCode:"+schoolLevel.getSchool());
                 ProcessBuilder processBuilder = new ProcessBuilder();
-                    processBuilder.command("cmd.exe", "-c", schoolLevel.getCommand());
+                processBuilder.command("bash", "-c", schoolLevel.getCommand());
                 processBuilder.redirectErrorStream(true); // 合并标准输出和错误输出
                 Process process = null;
                 try {
@@ -326,7 +326,7 @@ public class GeneratorAllTypePdfByProvinceController {
                     logger.info("subjectReport:loading");
                     logger.info("exitCode:"+parameters.getSubSubject());
                     ProcessBuilder processBuilderSubject = new ProcessBuilder();
-                        processBuilderSubject.command("cmd.exe", "-c", parameters.getCommand());
+                    processBuilderSubject.command("bash", "-c", parameters.getCommand());
                     processBuilderSubject.redirectErrorStream(true); // 合并标准输出和错误输出
                     Process processSubject = null;
                     try {
@@ -382,7 +382,7 @@ public class GeneratorAllTypePdfByProvinceController {
                     logger.info("classBasic:loading");
                     logger.info("exitCode:"+arg.getClassName());
                     ProcessBuilder processBuilderClass = new ProcessBuilder();
-                        processBuilderClass.command("cmd.exe", "-c", arg.getCommand());
+                    processBuilderClass.command("bash", "-c", arg.getCommand());
                     processBuilderClass.redirectErrorStream(true); // 合并标准输出和错误输出
                     Process processClass = null;
                     try {
@@ -437,7 +437,7 @@ public class GeneratorAllTypePdfByProvinceController {
                         logger.info("classSubject:loading");
                         logger.info("exitCode:"+classBasicReportParameters.getSubSubject());
                         ProcessBuilder processBuilderClassSubject = new ProcessBuilder();
-                            processBuilderClassSubject.command("cmd.exe", "-c", classBasicReportParameters.getCommand());
+                        processBuilderClassSubject.command("bash", "-c", classBasicReportParameters.getCommand());
                         processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出
                         Process processClassSubject = null;
                         try {
@@ -507,7 +507,7 @@ public class GeneratorAllTypePdfByProvinceController {
 
                         logger.info("RetryCommand:ls");
                         ProcessBuilder processBuilderClassSubject = new ProcessBuilder();
-                            processBuilderClassSubject.command("cmd.exe", "-c", command);
+                        processBuilderClassSubject.command("bash", "-c", command);
                         processBuilderClassSubject.redirectErrorStream(true); // 合并标准输出和错误输出
                         Process processClassSubject = null;
                         try {