wangliang 4 år sedan
förälder
incheckning
95f40f0fd9

+ 6 - 8
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/htmltopdf/HtmltopdfUtil.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/htmltopdf/HtmlToPdfUtil.java

@@ -15,8 +15,8 @@ import java.io.File;
  * @Author: wangliang
  * @Date: 2021/4/7
  */
-public class HtmltopdfUtil {
-    private final static Logger log = LoggerFactory.getLogger(HtmltopdfUtil.class);
+public class HtmlToPdfUtil {
+    private final static Logger log = LoggerFactory.getLogger(HtmlToPdfUtil.class);
 
     /**
      * html转pdf
@@ -61,10 +61,8 @@ public class HtmltopdfUtil {
         boolean result = true;
         try {
             Process proc = Runtime.getRuntime().exec(cmd.toString());
-            HtmlToPdfInterceptor error = new HtmlToPdfInterceptor(proc.getErrorStream());
-            HtmlToPdfInterceptor output = new HtmlToPdfInterceptor(proc.getInputStream());
-            error.start();
-            output.start();
+            new HtmlToPdfInterceptor(proc.getErrorStream()).start();
+            new HtmlToPdfInterceptor(proc.getInputStream()).start();
             proc.waitFor();
         } catch (Exception e) {
             log.error("请求出错", e);
@@ -74,8 +72,8 @@ public class HtmltopdfUtil {
     }
 
 //    public static void main(String[] args) {
-////        HtmltopdfUtil.convert("http://www.baidu.com", "/Users/king/Downloads/baidu.pdf", PageSizeEnum.A4);
+////        HtmlToPdfUtil.convert("http://www.baidu.com", "/Users/king/Downloads/baidu.pdf", PageSizeEnum.A4);
 //        String filename = "3120ee49668e4bf48fd8c161a2abb73b的副本";
-//        HtmltopdfUtil.convert("/Users/king/Downloads/测试附件/" + filename + ".html", "/Users/king/Downloads/pdf/" + filename + "A4.pdf", PageSizeEnum.A3);
+//        HtmlToPdfUtil.convert("/Users/king/Downloads/测试附件/" + filename + ".html", "/Users/king/Downloads/pdf/" + filename + "A4.pdf", PageSizeEnum.A3);
 //    }
 }

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -252,7 +252,7 @@ public class SysController {
     @ApiResponses({@ApiResponse(code = 200, message = "学校信息", response = EditResult.class)})
     @Aac(auth = BOOL.FALSE)
     public Result queryBySchoolCode(@ApiParam(value = "机构code", required = true) @RequestParam String code) {
-//        HtmltopdfUtil.convert("/Users/king/Downloads/测试附件/3120ee49668e4bf48fd8c161a2abb73b的副本.html", "/Users/king/Downloads/测试附件/new_test1.pdf", PageSizeEnum.A3);
+//        HtmlToPdfUtil.convert("/Users/king/Downloads/测试附件/3120ee49668e4bf48fd8c161a2abb73b的副本.html", "/Users/king/Downloads/测试附件/new_test1.pdf", PageSizeEnum.A3);
         if (!Objects.equals(code.toUpperCase(), RoleTypeEnum.ADMIN.name())) {
             BasicSchool basicSchool = cacheService.schoolCache(code);
             if (Objects.isNull(basicSchool)) {