档案-四性检测

调试

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveExaminingReportController.java

@@ -17,10 +17,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.evisa.feign.EVisaClient;
 import org.springblade.evisa.vo.CertBeanVO;
 import org.springblade.resource.feign.NewIOSSClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.time.LocalDateTime;
@@ -82,9 +79,9 @@ public class ArchiveExaminingReportController {
         return R.data(-1);
     }
 
-    @GetMapping("/getExamining")
+    @PostMapping("/getExamining")
     @ApiOperation(value = "档案四性检测")
-    public R getExamining(ArchiveExaminingVo vo) throws InterruptedException, IOException, DocumentException {
+    public R getExamining(@RequestBody ArchiveExaminingVo vo) throws InterruptedException, IOException, DocumentException {
 
         //如果id为0则为一键检测，不为0则有报告正在进行
         if (vo.getReportId() == 0) {

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveExaminingReportImpl.java

@@ -149,8 +149,8 @@ public class ArchiveExaminingReportImpl extends BaseServiceImpl<ArchiveExamining
             }
         }
         //选中的指定文件也加入进来
-        if(StringUtils.isNotEmpty(vo.getNodeIds())){
-            Set<String> collect1 = Arrays.stream(vo.getNodeIds().split(",")).collect(Collectors.toSet());
+        if(StringUtils.isNotEmpty(vo.getFileIds())){
+            Set<String> collect1 = Arrays.stream(vo.getFileIds().split(",")).collect(Collectors.toSet());
             collect.addAll(collect1);
         }
         List<ArchiveFile> files = new ArrayList<>();
@@ -458,8 +458,8 @@ public class ArchiveExaminingReportImpl extends BaseServiceImpl<ArchiveExamining
             List<String> PdfUrls = new ArrayList<>();
             PdfUrls.add(url);
             PdfUrls.add(detailPdf);
-            String localUrl = "/www/wwwroot/Users/hongchuangyanfa/Desktop/archiveExaminingPdf/123.pdf";
-//            String localUrl = "D:\\develop\\test\\123.pdf";
+//            String localUrl = "/www/wwwroot/Users/hongchuangyanfa/Desktop/archiveExaminingPdf/123.pdf";
+            String localUrl = "D:\\tools\\html\\123.pdf";
             //合并pdf
             FileUtils.mergePdfPublicMethods(PdfUrls, localUrl);
             BladeFile bladeFile = iossClient.uploadFile("123.pdf", localUrl);