日志相关

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ContractLogClient.java

@@ -16,6 +16,9 @@ public interface ContractLogClient {
 
     String API_PREFIX = "/contractLog";
 
+    @PostMapping(API_PREFIX + "/updateTheLogPdfUrl")
+    void updateTheLogPdfUrl(@RequestParam String theLogId, @RequestParam String pdfUrl);
+
     @GetMapping(API_PREFIX + "/queryContractLogByPrimaryKeyIdAndRecordTime")
     JSONObject queryContractLogByPrimaryKeyIdAndRecordTime(@RequestParam String nodePrimaryKeyId, @RequestParam String recordTime);
 

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ContractLogClientImpl.java

@@ -29,6 +29,11 @@ public class ContractLogClientImpl implements ContractLogClient {
 
     private final IContractLogWbsService contractLogWbsService;
 
+    @Override
+    public void updateTheLogPdfUrl(String theLogId, String pdfUrl) {
+        this.contractLogService.update(Wrappers.<ContractLog>lambdaUpdate().set(ContractLog::getPdfUrl, pdfUrl).eq(ContractLog::getId, theLogId));
+    }
+
     @Override
     public JSONObject queryContractLogByPrimaryKeyIdAndRecordTime(String nodePrimaryKeyId, String recordTime) {
         ContractLog log = this.contractLogService.getOne(Wrappers.<ContractLog>lambdaQuery()

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -1883,17 +1883,25 @@ public class ExcelTabController extends BladeController {
             }
 
             if(pdfUrls.size() > 0){
-                String mergePdfPath = file_path + "/pdf//" + theLogId + ".pdf";
-                File oldMergePdf = ResourceUtil.getFile(mergePdfPath);
-                if (oldMergePdf.exists()) {
-                    oldMergePdf.delete();
-                }
+                try{
+                    String mergePdfPath = file_path + "/pdf//" + theLogId + ".pdf";
+                    File oldMergePdf = ResourceUtil.getFile(mergePdfPath);
+                    if (oldMergePdf.exists()) {
+                        oldMergePdf.delete();
+                    }
 
-                FileUtils.mergePdfPublicMethods(pdfUrls, mergePdfPath);
+                    FileUtils.mergePdfPublicMethods(pdfUrls, mergePdfPath);
 
-                BladeFile mergeFile = newIOSSClient.uploadFile(theLogId + new Date().getTime() + ".pdf", mergePdfPath);
+                    BladeFile mergeFile = newIOSSClient.uploadFile(theLogId + new Date().getTime() + ".pdf", mergePdfPath);
 
-                return R.data(mergeFile.getLink());
+                    //修改记录
+                    this.contractLogClient.updateTheLogPdfUrl(theLogJson.getString("id"), mergeFile.getLink());
+
+                    return R.data(mergeFile.getLink());
+                }catch (Exception e){
+                    e.printStackTrace();
+                    return R.fail("数据异常");
+                }
             }
 
         }