merge 档案管理

atms-api/src/main/java/pwc/taxtech/atms/controller/TaxDocumentController.java

@@ -115,8 +115,8 @@ public class TaxDocumentController {
      */
     @PostMapping("/previewPDF")
     @ResponseBody
-    public void previewPDF(@RequestBody TaxDocumentDto taxDocumentDto) {
-        taxDocumentService.previewPDF(taxDocumentDto.getPath());
+    public String previewPDF(HttpServletResponse response ,@RequestBody TaxDocumentDto taxDocumentDto) {
+        return taxDocumentService.previewPDF2(response,taxDocumentDto.getPath());
         /*InputStream is = null;
         ByteArrayOutputStream os = null;
         try {

atms-api/src/main/java/pwc/taxtech/atms/service/impl/FileTypesServiceImpl.java

@@ -175,9 +175,11 @@ public class FileTypesServiceImpl {
      * @param fileTypes
      */
     private void requiredFieldFormatToJson(FileTypes fileTypes) {
-        if (fileTypes.getRequiredField().size() > 0) {
+        if (null != fileTypes.getRequiredField() && fileTypes.getRequiredField().size() > 0) {
             String requiredFieldJson = JSONObject.toJSONString(fileTypes.getRequiredField());
             fileTypes.setRequiredFieldJson(requiredFieldJson);
+        }else{
+            throw new RuntimeException("必填字段没有填写");
         }
     }
 

atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java

@@ -432,10 +432,11 @@ public class TaxDocumentServiceImpl {
         }
     }
 
-    public void previewPDF(String path) {
+    public void previewPDF(HttpServletResponse response ,String path) {
         String imageType = "PNG";
         OutputStream sos = null;
         try {
+            sos = response.getOutputStream();
             PDFToImg(sos, path, getPDFNum(path), imageType);
         } catch (IOException e) {
             log.error("PDF转换图片异常: " + e.getMessage());
@@ -1217,4 +1218,45 @@ public class TaxDocumentServiceImpl {
         }
         return is;
     }
+
+    public String previewPDF2(HttpServletResponse response , String path) {
+        InputStream is = null;
+        ByteArrayOutputStream os = null;
+        String dUrlData;
+        //pdf源路径
+        byte[] buff = new byte[1024];
+        int len;
+        try {
+            is = getInputStreamByUrl(path);
+            os = new ByteArrayOutputStream();
+            while ((len = is.read(buff)) != -1) {
+                os.write(buff, 0, len);
+            }
+
+            os.flush();
+            os.toByteArray();
+            dUrlData = Base64.getEncoder().encodeToString(os.toByteArray());
+        } catch (IOException e) {
+            log.error(e.getMessage());
+            throw new RuntimeException("pdf转换错误");
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    log.error(e.getMessage());
+                    throw new RuntimeException("pdf转换错误");
+                }
+            }
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    log.error(e.getMessage());
+                    throw new RuntimeException("pdf转换错误");
+                }
+            }
+        }
+        return dUrlData;
+    }
 }