访客安全责任书确认签名预览，入参补上附件名称，根据附件名称查询模板

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseVisitorManagementService.java

@@ -26,6 +26,6 @@ public interface QhseVisitorManagementService extends IService<QhseVisitorManage
 
     int getBlackListByIdNum(String idnumber);
 
-    void previewForAttachmentWithSignature(String signature, String fileId, HttpServletResponse response);
+    void previewForAttachmentWithSignature(String signature, String fileId, String fileName, HttpServletResponse response);
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseVisitorManagementServiceImpl.java

@@ -4,6 +4,7 @@ import com.aspose.cells.PdfCompliance;
 import com.aspose.cells.PdfSaveOptions;
 import com.aspose.words.Document;
 import com.aspose.words.SaveFormat;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.fegin.AdminFeginService;
 import com.rongwei.bscommon.sys.dao.QhseVisitorManagementDao;
@@ -57,6 +58,10 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
     @Autowired
     private FileFormatConversionServiceImpl fileFormatConversionService;
 
+
+    @Autowired
+    private SysFileItemServiceImpl sysFileItemServiceImpl;
+
     @Override
     public void generalMsInsert(MasterSlaveInsertVo masterSlaveInsert) {
         adminFeginService.generalMsInsert(masterSlaveInsert);
@@ -90,9 +95,15 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
     }
 
     @Override
-    public void previewForAttachmentWithSignature(String signature, String fileId, HttpServletResponse response) {
+    public void previewForAttachmentWithSignature(String signature, String fileId,  String fileName,HttpServletResponse response) {
+
+        SysFileItemDo tempDo = null;
+        if(StringUtils.isBlank(fileId)){
+            tempDo= sysFileItemServiceImpl.getOne(new LambdaQueryWrapper<SysFileItemDo>().eq(SysFileItemDo::getFilename, fileName).eq(SysFileItemDo::getDeleted, "0"));
+        }else {
+            tempDo = fileFormatConversionService.fileCheck(fileId);
+        }
 
-        SysFileItemDo tempDo = fileFormatConversionService.fileCheck(fileId);
         if (tempDo == null) {
             logger.error("无法根据id:{}获取到文件信息", fileId);
             throw new RuntimeException("无法获取到附件模板");
@@ -130,13 +141,13 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
             objectObjectHashMap.put("YFQM", signaturePath);
             WordUtils.MailMergeFill(objectObjectHashMap, doc);
 
-            String fileName = null;
-            try {
-               fileName = URLEncoder.encode(tempDo.getFilename(), "utf-8");
-
-            } catch (Exception e) {
-                throw new RuntimeException("文件名转换异常");
-            }
+//            String name = null;
+//            try {
+//                name = URLEncoder.encode(tempDo.getFilename(), "utf-8");
+//
+//            } catch (Exception e) {
+//                throw new RuntimeException("文件名转换异常");
+//            }
             response.setContentType("application/pdf");
 
            response.setHeader("X-Content-Length", String.valueOf(tempDo.getFilesize()));

qhse-server/src/main/java/com/rongwei/controller/QhseVisitorManagementController.java

@@ -119,9 +119,12 @@ public class QhseVisitorManagementController  {
      */
     @GetMapping("/previewForAttachmentWithSignature")
     public void previewForAttachmentWithSignature( @RequestParam("signature") String signature,
-                                                         @RequestParam("fileId") String fileId, HttpServletResponse response) {
-        logger.info("增加签名接口入参为：signature:{},fileId:{}", signature,fileId);
-        qhseVisitorManagementService.previewForAttachmentWithSignature(signature,fileId, response);
+                                                   @RequestParam("fileId") String fileId,
+                                                   @RequestParam("fileName") String fileName,
+                                                   HttpServletResponse response) {
+        logger.info("增加签名接口入参为：signature:{},fileId:{},fileName:{}", signature,fileId,fileName);
+        qhseVisitorManagementService.previewForAttachmentWithSignature(signature,fileId,fileName, response);
     }
 
+
 }