生成手机端PDF

controllers/pdf_controller.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"eta/eta_data_analysis/models"
 	"eta/eta_data_analysis/services/pdf"
+	"fmt"
 	"github.com/beego/beego/v2/server/web"
 )
 
@@ -61,6 +62,8 @@ func (pdfcontrl *PdfController) GeneratePdf() {
 		data.MobilePdfUrl = mobilePdfUrl
 		data.MobileJpgUrl = mobileJpgUrl
 	}
+	str := fmt.Sprintf("%v", data)
+	fmt.Println(str)
 	br.Data = data
 	br.Ret = 200
 	br.Success = true

services/pdf/pdf_service.go

@@ -94,12 +94,12 @@ func generateAndUploadJPEG(params PDFParams, reportUrl, pdfPath string, ossClien
 	if reportUrl == "" {
 		return
 	}
-	err = ReportToPdf(params.Width, reportUrl, pdfPath, params.Top, params.Bottom, params.Left, params.Right)
+	err = ReportToJpeg(params.Width, reportUrl, pdfPath)
 	if err != nil {
 		utils.FileLog.Info("ReportToJpeg failed: , error: \n" + err.Error())
 		return
 	}
-	resourceUrl, err = uploadFile(ossClient, pdfPath, "pdf")
+	resourceUrl, err = uploadFile(ossClient, pdfPath, "jpg")
 	if err != nil {
 		utils.FileLog.Info("文件上传失败， Err: \n" + err.Error())
 		return
@@ -152,7 +152,7 @@ func Report2pdfAndJpeg(reportUrl string, reportId int, ReportLayout string) (pdf
 		err = fmt.Errorf("生成PDF失败,error: \n" + pdfResult.err.Error() + jpegResult.err.Error())
 		return
 	}
-
+	pdfUrl, jpegUrl = pdfResult.url, jpegResult.url
 	return
 }
 

utils/oss_client.go

@@ -51,7 +51,7 @@ func (m *MinioOssService) UploadFile(fileName, filePath, savePath string) (resou
 		FileLog.Error("BucketExists: %v; err: %v", exists, errBucketExists)
 		return
 	}
-	path := fmt.Sprintf("%s/%s%s/%s", MinIoUploadDir, time.Now().Format("200601/20060102/"), savePath, fileName)
+	path := fmt.Sprintf("%s%s%s/%s", MinIoUploadDir, time.Now().Format("200601/20060102/"), savePath, fileName)
 	_, err = m.client.FPutObject(context.Background(), bucketName, path, filePath, minio.PutObjectOptions{})
 	if err != nil {
 		FileLog.Error("MinIo上传文件失败:", err)