push

yd-oss-api/src/main/java/com/yd/oss/api/service/impl/ApiPdfServiceImpl.java

@@ -27,7 +27,7 @@ public class ApiPdfServiceImpl implements ApiPdfService {
     public Result<ApiGeneratePdfResponse> generatePDF(ApiGeneratePdfRequest request) {
     public Result<ApiGeneratePdfResponse> generatePDF(ApiGeneratePdfRequest request) {
         ApiGeneratePdfResponse response = new ApiGeneratePdfResponse();
         ApiGeneratePdfResponse response = new ApiGeneratePdfResponse();
         try {
         try {
-            String url = pdfService.generatePDF(request.getDataObject(),request.getObjectId(),request.getTemplateType());
+            String url = pdfService.generatePDF(request.getDataObject(),request.getObjectId(),request.getTemplateType(),request.getCustomFileName());
             response.setUrl(url);
             response.setUrl(url);
             return Result.success(response);
             return Result.success(response);
         } catch (IOException e) {
         } catch (IOException e) {

yd-oss-feign/src/main/java/com/yd/oss/feign/request/ApiGeneratePdfRequest.java

@@ -19,4 +19,9 @@ public class ApiGeneratePdfRequest<T> {
      * 生成文件的模板类型
      * 生成文件的模板类型
      */
      */
     private String templateType;
     private String templateType;
+
+    /**
+     * 自定义文件名（有值用自定义文件名上传，无值用默认生成的规则文件名）
+     */
+    private String customFileName;
 }
 }

yd-oss-service/src/main/java/com/yd/oss/service/service/PdfService.java

@@ -4,5 +4,5 @@ import java.io.IOException;
 
 
 public interface PdfService<T> {
 public interface PdfService<T> {
 
 
-    String generatePDF(T dataObject,String objectId, String templateType) throws IOException;
+    String generatePDF(T dataObject,String objectId, String templateType,String customFileName) throws IOException;
 }
 }

yd-oss-service/src/main/java/com/yd/oss/service/service/impl/PdfServiceImpl.java

@@ -9,6 +9,7 @@ import com.yd.oss.service.dto.FileProdDto;
 import com.yd.oss.service.service.*;
 import com.yd.oss.service.service.*;
 import com.yd.oss.service.utils.PdfUtil;
 import com.yd.oss.service.utils.PdfUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.poi.xwpf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.Primary;
@@ -45,10 +46,11 @@ public class PdfServiceImpl<T> implements PdfService<T> {
      * @param dataObject
      * @param dataObject
      * @param objectId
      * @param objectId
      * @param templateType
      * @param templateType
+     * @param customFileName 自定义文件名
      * @return
      * @return
      * @throws IOException
      * @throws IOException
      */
      */
-    public String generatePDF(T dataObject, String objectId, String templateType) throws IOException {
+    public String generatePDF(T dataObject, String objectId, String templateType,String customFileName) throws IOException {
         // 获取模板信息
         // 获取模板信息
         FileProdDto fileProdDto = iFileTemplateService.getFileProd("", templateType);
         FileProdDto fileProdDto = iFileTemplateService.getFileProd("", templateType);
 
 
@@ -68,7 +70,13 @@ public class PdfServiceImpl<T> implements PdfService<T> {
             convertWordToPdf(tempInputFile, tempPdfFile, dataObject, fileProdDto);
             convertWordToPdf(tempInputFile, tempPdfFile, dataObject, fileProdDto);
 
 
             // 上传到OSS
             // 上传到OSS
-            String objectName = "insurance_schedules/" + objectId + "_" + System.currentTimeMillis() + ".pdf";
+            String objectName = "";
+            if (StringUtils.isNotBlank(customFileName)) {
+                objectName = "insurance_schedules/" + System.currentTimeMillis() + "/" + customFileName + ".pdf";
+            }else {
+                objectName = "insurance_schedules/" + objectId + "_" + System.currentTimeMillis() + ".pdf";
+            }
+
             uploadToOSS(tempPdfFile, fileProdDto.getBucketName(), objectName);
             uploadToOSS(tempPdfFile, fileProdDto.getBucketName(), objectName);
 
 
             // 生成访问URL
             // 生成访问URL