Merge branch 'feature-2022.06.27' of https://git.flowbb.cn/RK-Dev/fqgz-server into feature-2022.06.27

eladmin-system/src/main/java/me/zhengjie/appapi/service/impl/BorrowerServiceImpl.java

@@ -14,6 +14,7 @@ import me.zhengjie.appapi.plus.QueryWrapperUtil;
 import me.zhengjie.appapi.service.*;
 import me.zhengjie.appapi.util.BeanCopyUtils;
 import me.zhengjie.appapi.util.DateFormatUtils;
+import me.zhengjie.appapi.util.FileUploadUtil;
 import me.zhengjie.appapi.util.StatusEnum;
 import me.zhengjie.appapi.vo.BorrowerVo;
 import me.zhengjie.dao.OrderFileRepository;
@@ -98,10 +99,10 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, Borro
         if (notarization != null) {
             order.setNotarizationNo(notarization.getDocNo());
             order.setNotarizaitonSignTime(notarization.getAxqSignedTime());
-            order.setAuthNotarization(notarization.getSignedPdfUrl());
+            order.setAuthNotarization(FileUploadUtil.getPreviewUrl(notarization.getSignedPdfUrl()));
         }
         if (note != null) {
-            order.setAuthNote(note.getSignedPdfUrl());
+            order.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
         }
 		if (!StringUtils.isEmpty(borrowers.getNotaryUserId())) {
 			SysUserEntity user = userDao.selectById(borrowers.getNotaryUserId());

eladmin-system/src/main/java/me/zhengjie/appapi/service/impl/GuaranteeServiceImpl.java

@@ -14,6 +14,7 @@ import me.zhengjie.appapi.service.GuaranteeService;
 import me.zhengjie.appapi.service.OrderService;
 import me.zhengjie.appapi.util.BeanCopyUtils;
 import me.zhengjie.appapi.util.DateFormatUtils;
+import me.zhengjie.appapi.util.FileUploadUtil;
 import me.zhengjie.appapi.util.StatusEnum;
 import me.zhengjie.appapi.vo.GuaranteeVo;
 import me.zhengjie.dao.OrderFileRepository;
@@ -59,10 +60,10 @@ public class GuaranteeServiceImpl extends AbstractServiceImpl<IGuaranteeDao, Gua
 		if (notarization != null) {
 			order.setNotarizationNo(notarization.getDocNo());
 			order.setNotarizaitonSignTime(notarization.getAxqSignedTime());
-			order.setAuthNotarization(notarization.getSignedPdfUrl());
+			order.setAuthNotarization(FileUploadUtil.getPreviewUrl(notarization.getSignedPdfUrl()));
 		}
 		if (note != null) {
-			order.setAuthNote(note.getSignedPdfUrl());
+			order.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
 		}
 		if (!StringUtils.isEmpty(entity.getNotaryUserId())) {
 			SysUserEntity user = userDao.selectById(entity.getNotaryUserId());

eladmin-system/src/main/java/me/zhengjie/appapi/service/impl/MortgageServiceImpl.java

@@ -13,6 +13,7 @@ import me.zhengjie.appapi.service.MortgageService;
 import me.zhengjie.appapi.service.OrderService;
 import me.zhengjie.appapi.util.BeanCopyUtils;
 import me.zhengjie.appapi.util.DateFormatUtils;
+import me.zhengjie.appapi.util.FileUploadUtil;
 import me.zhengjie.appapi.util.StatusEnum;
 import me.zhengjie.appapi.vo.MortgageVo;
 import me.zhengjie.dao.OrderFileRepository;
@@ -57,10 +58,10 @@ public class MortgageServiceImpl extends AbstractServiceImpl<IMortgageDao, Mortg
 		if (notarization != null) {
 			order.setNotarizationNo(notarization.getDocNo());
 			order.setNotarizaitonSignTime(notarization.getAxqSignedTime());
-			order.setAuthNotarization(notarization.getSignedPdfUrl());
+			order.setAuthNotarization(FileUploadUtil.getPreviewUrl(notarization.getSignedPdfUrl()));
 		}
 		if (note != null) {
-			order.setAuthNote(note.getSignedPdfUrl());
+			order.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
 		}
 		if (!StringUtils.isEmpty(entity.getNotaryUserId())) {
 			SysUserEntity user = userDao.selectById(entity.getNotaryUserId());

eladmin-system/src/main/java/me/zhengjie/modules/system/executor/jobhandler/GenerateNotarizationJob.java

@@ -79,7 +79,7 @@ public class GenerateNotarizationJob {
             List<OrderFileEntity> orderFileList = orderFileRepository.canBeSignedNotarization(collection);
             for (OrderFileEntity orderFile : orderFileList) {
                 try {
-                    if(StringUtils.isEmpty(orderFile.getDocNo())) {
+                    if(StringUtils.isEmpty(orderFile.getAxqContractNo())) {
                         signNotarization(orderFile);
                     }
                     if(StringUtils.isEmpty(orderFile.getSignedPdfUrl())) {
@@ -141,9 +141,9 @@ public class GenerateNotarizationJob {
      * @param orderFile
      */
     private void downloadNotarization(OrderFileEntity orderFile) throws Exception {
-        String orderType = StepStatusEnum.getType(Integer.valueOf(orderFile.getContractId()));
+        String orderType = StepStatusEnum.getType(orderFile.getContractId());
         CFCACertUtil.proxySwitchOn = "dev".equals(AppConfigInfo.APP_ENV_TYPE);
-        String uplaodPath = orderFile.getBusinessNo() + "/" + orderType + "/" ;
+        String uplaodPath = orderFile.getBusinessNo() + "/" + orderType + "/";
         String path = uplaodPath + "notary-signed-" + orderFile.getBusinessNo() + "/";
         String filePath = CFCACertUtil.download(path, orderFile.getAxqContractNo());
         saveAuthNorizationUrlById(filePath, orderFile.getId());

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/NotaryOrderServiceImpl.java

@@ -443,27 +443,14 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 		// 生成并保存未签名公证书
 		ModelEntity modelEntity = modelRepository.getModelEntity(notaryOrderEntity.getNotaryOfficeId(), code, "1");
 		String result = "";
-		String htmlFilePath = "";
-		String pdfFilePath = "";
+		String htmlPath = "";
+		String pdfPath = "";
 		try {
 			InputStream inputStream = NotaryNoteServiceImpl.class.getClassLoader().getResourceAsStream("template/note/notary-model.html");
 			result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
 			String content = result.replace("${ModelContent}", TextTempletUtil.replaceContent(modelEntity.getContent(), map));
-			String htmlFileDir = AppConfigInfo.APP_UPLOAD_PATH + "notary-html-" + notaryOrderEntity.getBusinessNo() + "/";
-			Path path = Paths.get(htmlFileDir);
-			if (!Files.exists(path)) {
-				Files.createDirectory(path);
-			}
-			htmlFilePath = htmlFileDir + req.getPartyId() + ".html";
-			Files.write(Paths.get(htmlFilePath), content.getBytes(StandardCharsets.UTF_8));
-			//
-			String pdfFileDir = AppConfigInfo.APP_UPLOAD_PATH + "notary-pdf-" + notaryOrderEntity.getBusinessNo() + "/";
-			path = Paths.get(pdfFileDir);
-			if (!Files.exists(path)) {
-				Files.createDirectory(path);
-			}
-			pdfFilePath = pdfFileDir + req.getPartyId() + ".pdf";
-			HtmlConvertPdf.createPdfFile(content, pdfFilePath);
+			htmlPath = FileUploadUtil.saveHtml(content, notaryOrderEntity.getBusinessNo(), req.getPartyId());
+			pdfPath = FileUploadUtil.savePdf(content, notaryOrderEntity.getBusinessNo(), req.getPartyId());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -473,8 +460,8 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 		notaryOrderFile.setContractId(req.getPartyId());
 		notaryOrderFile.setCode(code);
 		notaryOrderFile.setDocNo(String.valueOf(currentNum));
-		notaryOrderFile.setHtmlUrl(htmlFilePath);
-		notaryOrderFile.setPdfUrl(pdfFilePath);
+		notaryOrderFile.setHtmlUrl(htmlPath);
+		notaryOrderFile.setPdfUrl(pdfPath);
 		notaryOrderFile.setSortNum(modelEntity.getSort());
 		notaryOrderFile.setCreateTime(new Date());
 		notaryOrderFile.setCreatorId(SecurityUtils.getCurrentUserId());