Merge branch 'pool_424_pdf_remote_gen' of eta_server/eta_data_analysis into master

controllers/pdf_controller.go

@@ -0,0 +1,83 @@
+package controllers
+
+import (
+	"encoding/json"
+	"eta/eta_data_analysis/models"
+	"eta/eta_data_analysis/services/pdf"
+	"fmt"
+	"github.com/beego/beego/v2/server/web"
+)
+
+type PdfController struct {
+	web.Controller
+}
+
+// GeneratePdf
+// @Title 生成PDF
+// @Description 合同套餐列表
+// @Param   DayFlag  query  int  false
+// @Param   WeekFlag  query  int  false
+// @Success 200 {object} company.GetUnusualRenewListGroupMonthResp
+// @router /generate_pdf [post]
+func (pdfcontrl *PdfController) GeneratePdf() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		pdfcontrl.Data["json"] = br
+		_ = pdfcontrl.ServeJSON()
+	}()
+
+	var req PdfRequest
+	err := json.Unmarshal(pdfcontrl.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	var data PdfResponse
+	var pdfUrl, jpgUrl, mobilePdfUrl, mobileJpgUrl string
+	if req.FreeLayout {
+		pdfUrl, jpgUrl, err = pdf.Report2pdfAndJpeg(req.ReportUrl, req.ReportId, pdf.FreeLayout)
+		if err != nil {
+			br.Msg = "生成PDF失败！"
+			br.ErrMsg = "生成PDF失败，Err:" + err.Error()
+			return
+		}
+		data.PdfUrl = pdfUrl
+		data.JpgUrl = jpgUrl
+	} else {
+		pdfUrl, jpgUrl, err = pdf.Report2pdfAndJpeg(req.ReportUrl, req.ReportId, pdf.PC)
+		if err != nil {
+			br.Msg = "生成PDF失败！"
+			br.ErrMsg = "生成PDF失败，Err:" + err.Error()
+			return
+		}
+		mobilePdfUrl, mobileJpgUrl, err = pdf.Report2pdfAndJpeg(req.ReportUrl, req.ReportId, pdf.Mobile)
+		if err != nil {
+			br.Msg = "生成PDF失败！"
+			br.ErrMsg = "生成PDF失败，Err:" + err.Error()
+			return
+		}
+		data.PdfUrl = pdfUrl
+		data.JpgUrl = jpgUrl
+		data.MobilePdfUrl = mobilePdfUrl
+		data.MobileJpgUrl = mobileJpgUrl
+	}
+	str := fmt.Sprintf("%v", data)
+	fmt.Println(str)
+	br.Data = data
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "生成PDF成功"
+}
+
+type PdfRequest struct {
+	ReportUrl  string `json:"ReportUrl"`
+	ReportId   int    `json:"ReportId"`
+	FreeLayout bool   `json:"FreeLayout"`
+}
+type PdfResponse struct {
+	PdfUrl       string `json:"PdfUrl"`
+	JpgUrl       string `json:"JpgUrl"`
+	MobilePdfUrl string `json:"MobilePdfUrl"`
+	MobileJpgUrl string `json:"MobileJpgUrl"`
+}

eta_data_analysis.iml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.7 (eta_data_analysis)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+  </component>
+</module>

go.mod

@@ -1,9 +1,10 @@
 module eta/eta_data_analysis
 
-go 1.19
+go 1.21.7
 
 require (
 	github.com/PuerkitoBio/goquery v1.9.2
+	github.com/aws/aws-sdk-go v1.55.7
 	github.com/beego/bee/v2 v2.1.0
 	github.com/beego/beego/v2 v2.1.4
 	github.com/chromedp/cdproto v0.0.0-20240202021202-6d0b6a386732
@@ -17,8 +18,22 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/tealeg/xlsx v1.0.5
 	github.com/xuri/excelize/v2 v2.8.0
-	golang.org/x/net v0.24.0
-	golang.org/x/text v0.14.0
+	golang.org/x/net v0.26.0
+	golang.org/x/text v0.16.0
+)
+
+require (
+	github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.2.2 // indirect
+	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/go-ini/ini v1.67.0 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/minio/md5-simd v1.1.2 // indirect
+	github.com/rs/xid v1.5.0 // indirect
+	golang.org/x/time v0.4.0 // indirect
 )
 
 require (
@@ -42,6 +57,7 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/metakeule/fmtdate v1.1.2 // indirect
+	github.com/minio/minio-go/v7 v7.0.74
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -54,8 +70,8 @@ require (
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
 	github.com/xuri/efp v0.0.0-20230802181842-ad255f2331ca // indirect
 	github.com/xuri/nfp v0.0.0-20230819163627-dc951e3ffe1a // indirect
-	golang.org/x/crypto v0.22.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -8,9 +8,17 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
+github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.2.2 h1:YNsVAVaO3xAfNqnsjcOeZx+htocoFR2Oh8onhVp7PcM=
+github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.2.2/go.mod h1:FTzydeQVmR24FI0D6XWUOMKckjXehM/jgMn1xC+DA9M=
+github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g=
+github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
+github.com/aliyun/aliyun-oss-go-sdk/v3 v3.0.0 h1:2nASaRzv3sew6ekk5Csxgfo3GKjhlLuzXq0qg30fhvc=
+github.com/aliyun/aliyun-oss-go-sdk/v3 v3.0.0/go.mod h1:Ssn0UMjRcWoLWREpAkxvL2QNgKAsxQWiN0ZL+NXJQSc=
 github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
 github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
 github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA=
+github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE=
+github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/beego/bee/v2 v2.1.0 h1:4WngbAnkvVOyKy74WXcRH3clon76wkjhuzrV2mx2fQU=
 github.com/beego/bee/v2 v2.1.0/go.mod h1:wDhKy5TNxv46LHKsK2gyxo38ObCOm9PbCN89lWHK3EU=
 github.com/beego/beego/v2 v2.1.4 h1:99d8+sUmQyfaArQIjjzWGE+KYU9M1GkfWec74nXQxFY=
@@ -41,13 +49,18 @@ github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGii
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw=
+github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/garyburd/redigo v1.6.3/go.mod h1:rTb6epsqigu3kYKBnaF028A7Tf/Aw5s0cqA47doKKqw=
 github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
+github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
+github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -62,6 +75,8 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.3.2 h1:zlnbNHxumkRvfPWgfXu8RBwyNR1x8wh9cf5PTOCqs9Q=
 github.com/gobwas/ws v1.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -98,24 +113,36 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
 github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
@@ -129,6 +156,10 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/metakeule/fmtdate v1.1.2 h1:n9M7H9HfAqp+6OA98wXGMdcAr6omshSNVct65Bks1lQ=
 github.com/metakeule/fmtdate v1.1.2/go.mod h1:2JyMFlKxeoGy1qS6obQukT0AL0Y4iNANQL8scbSdT4E=
+github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
+github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
+github.com/minio/minio-go/v7 v7.0.74 h1:fTo/XlPBTSpo3BAMshlwKL5RspXRv9us5UeHEGYCFe0=
+github.com/minio/minio-go/v7 v7.0.74/go.mod h1:qydcVzV8Hqtj1VtEocfxbmVFa2siu6HGa+LDEPogjD8=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -139,7 +170,6 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/mozillazg/go-pinyin v0.20.0 h1:BtR3DsxpApHfKReaPO1fCqF4pThRwH9uwvXzm+GnMFQ=
 github.com/mozillazg/go-pinyin v0.20.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
-github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -187,6 +217,9 @@ github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTK
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/shakinm/xlsReader v0.9.12 h1:F6GWYtCzfzQqdIuqZJ0MU3YJ7uwH1ofJtmTKyWmANQk=
 github.com/shakinm/xlsReader v0.9.12/go.mod h1:ME9pqIGf+547L4aE4YTZzwmhsij+5K9dR+k84OO6WSs=
 github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
@@ -208,7 +241,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=
@@ -229,8 +263,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo=
 golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -246,8 +280,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -274,8 +308,8 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -289,8 +323,10 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
+golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
@@ -313,6 +349,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
@@ -322,6 +359,8 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	_ "eta/eta_data_analysis/routers"
 	"eta/eta_data_analysis/services"
-
 	beego "github.com/beego/beego/v2/server/web"
 )
 
@@ -13,7 +12,6 @@ func main() {
 		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	}
 	go services.Task()
-
 	// 最大内存调整
 	beego.BConfig.MaxMemory = 1024 * 1024 * 512
 

routers/commentsRouter.go

@@ -7,6 +7,12 @@ import (
 
 func init() {
 
+<<<<<<< HEAD
+    beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"] = append(beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"],
+        beego.ControllerComments{
+            Method: "GeneratePdf",
+            Router: `/generate_pdf`,
+=======
     beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:KplerController"] = append(beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:KplerController"],
         beego.ControllerComments{
             Method: "GetFlowData",
@@ -29,6 +35,7 @@ func init() {
         beego.ControllerComments{
             Method: "GetZoneData",
             Router: `/getZoneData`,
+>>>>>>> master
             AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,

routers/router.go

@@ -24,9 +24,15 @@ func init() {
 				&controllers.RzdController{},
 			),
 		),
+<<<<<<< HEAD
+		web.NSNamespace("/pdf",
+			web.NSInclude(
+				&controllers.PdfController{},
+=======
 		web.NSNamespace("/kpler",
 			web.NSInclude(
 				&controllers.KplerController{},
+>>>>>>> master
 			),
 		),
 	)

services/pdf/pdf_service.go

@@ -0,0 +1,304 @@
+package pdf
+
+import (
+	"eta/eta_data_analysis/utils"
+	"fmt"
+	"os"
+	"os/exec"
+	"path"
+	"strconv"
+	"sync"
+)
+
+const (
+	Mobile     = "mobile"
+	PC         = "pc"
+	FreeLayout = "freeLayout"
+)
+
+var (
+	PdfParamsMap = map[string]PDFParams{
+		PC: {
+			Top:    20,
+			Bottom: 20,
+			Left:   20,
+			Right:  20,
+			Width:  1200,
+		},
+		Mobile: {
+			Top:    20,
+			Bottom: 20,
+			Left:   20,
+			Right:  20,
+			Width:  600,
+		},
+		FreeLayout: {
+			Top:    0,
+			Bottom: 0,
+			Left:   0,
+			Right:  0,
+			Width:  1200,
+		},
+	}
+	pdfPathTemplate  = "./static/%s_%d.pdf"
+	jpegPathTemplate = "./static/%s_%d.jpg"
+)
+
+type PDFParams struct {
+	Top    int
+	Bottom int
+	Left   int
+	Right  int
+	Width  int
+}
+
+func uploadFile(ossClient utils.OssClient, filePath string, fileType string) (resourceUrl string, err error) {
+	file, err := os.Open(filePath)
+	if err != nil {
+		utils.FileLog.Info("Open failed: , error: \n" + err.Error())
+		return
+	}
+	defer func() { _ = file.Close() }()
+
+	ext := path.Ext(file.Name())
+	randStr := utils.GetRandStringNoSpecialChar(28)
+	fileName := randStr + ext
+	resourceUrl, err = ossClient.UploadFile(fileName, filePath, fileType)
+	if err != nil {
+		utils.FileLog.Info("文件上传失败， Err: \n" + err.Error())
+		return
+	}
+	defer func() {
+		_ = os.Remove(filePath)
+	}()
+	return
+}
+func generateAndUploadPDF(params PDFParams, reportUrl, pdfPath string, ossClient utils.OssClient) (resourceUrl string, err error) {
+	if reportUrl == "" {
+		return
+	}
+	err = ReportToPdf(params.Width, reportUrl, pdfPath, params.Top, params.Bottom, params.Left, params.Right)
+	if err != nil {
+		utils.FileLog.Info("ReportToPdf failed: , error: \n" + err.Error())
+		return
+	}
+	resourceUrl, err = uploadFile(ossClient, pdfPath, "pdf")
+	if err != nil {
+		utils.FileLog.Info("文件上传失败， Err: \n" + err.Error())
+		return
+	}
+	return
+}
+
+func generateAndUploadJPEG(params PDFParams, reportUrl, pdfPath string, ossClient utils.OssClient) (resourceUrl string, err error) {
+	if reportUrl == "" {
+		return
+	}
+	err = ReportToJpeg(params.Width, reportUrl, pdfPath)
+	if err != nil {
+		utils.FileLog.Info("ReportToJpeg failed: , error: \n" + err.Error())
+		return
+	}
+	resourceUrl, err = uploadFile(ossClient, pdfPath, "jpg")
+	if err != nil {
+		utils.FileLog.Info("文件上传失败， Err: \n" + err.Error())
+		return
+	}
+	return
+}
+func Report2pdfAndJpeg(reportUrl string, reportId int, ReportLayout string) (pdfUrl, jpegUrl string, err error) {
+	var params PDFParams
+	if _, ok := PdfParamsMap[ReportLayout]; !ok {
+		err = fmt.Errorf("报告类型 %s 不存在,生成PDF失败", ReportLayout)
+	} else {
+		params = PdfParamsMap[ReportLayout]
+	}
+	reportCode := utils.MD5(strconv.Itoa(reportId))
+	pdfPath := fmt.Sprintf(pdfPathTemplate, reportCode, params.Width)
+	jpegPath := fmt.Sprintf(jpegPathTemplate, reportCode, params.Width)
+	ossClient, err := utils.OssClientHandler(utils.OssType)
+	if err != nil {
+		utils.FileLog.Info("获取OSS客户端失败")
+		err = fmt.Errorf("获取OSS客户端未初始化,生成PDF失败")
+	}
+	defer func() {
+		if err != nil {
+			utils.FileLog.Info("生成PDF失败,error: \n" + err.Error())
+		}
+	}()
+	// 并发执行
+	var wg sync.WaitGroup
+	wg.Add(2)
+	pdfChan := make(chan result, 1)
+	jpegChan := make(chan result, 1)
+	go func() {
+		defer wg.Done()
+		url, pdfErr := generateAndUploadPDF(params, reportUrl, pdfPath, ossClient)
+		pdfChan <- result{url, pdfErr}
+	}()
+	go func() {
+		defer wg.Done()
+		url, jpgErr := generateAndUploadJPEG(params, reportUrl, jpegPath, ossClient)
+		jpegChan <- result{url, jpgErr}
+	}()
+	wg.Wait()
+	close(pdfChan)
+	close(jpegChan)
+
+	pdfResult := <-pdfChan
+	jpegResult := <-jpegChan
+	if pdfResult.err != nil || jpegResult.err != nil {
+		utils.FileLog.Info("生成PDF失败,error: \n" + pdfResult.err.Error() + jpegResult.err.Error())
+		err = fmt.Errorf("生成PDF失败,error: \n" + pdfResult.err.Error() + jpegResult.err.Error())
+		return
+	}
+	pdfUrl, jpegUrl = pdfResult.url, jpegResult.url
+	return
+}
+
+type result struct {
+	url string
+	err error
+}
+
+func ReportToPdf(width int, reportUrl, filePath string, top, bottom, left, right int) (err error) {
+	pyCode := `
+import asyncio
+from pyppeteer import launch
+
+@asyncio.coroutine
+async def main():
+    # 异步代码
+    browser = await launch({
+        'executablePath': '%s',
+        'headless': True,
+        'args': ['--disable-infobars', '--no-sandbox']
+    })
+    page = await browser.newPage()
+    await page.setViewport({
+        'width': %d,
+        'height': 1697
+    })
+    await page.goto('%s', {
+        'waitUntil': 'networkidle0',
+        'timeout': 3000000  # 设置超时时间为 100 秒
+    })
+
+    # 在生成PDF之前等待2秒
+    await asyncio.sleep(15)
+
+    await page.pdf({
+		'width': %d,
+        'height': 1697,
+        'path': "%s",
+        'printBackground': True,
+        'margin': {
+            'top': '%dpx',
+            'bottom': '%dpx',
+            'left': '%dpx',
+            'right': '%dpx'
+        }
+    })
+    await browser.close()
+
+# 创建事件循环
+loop = asyncio.get_event_loop()
+
+# 使用事件循环运行main函数
+try:
+    loop.run_until_complete(main())
+finally:
+    # 关闭事件循环
+    loop.close()
+`
+	pyCode = fmt.Sprintf(pyCode, utils.ChromePath, width, reportUrl, width+left+right, filePath, top, bottom, left, right)
+	utils.FileLog.Info("pdf pyCode: \n" + pyCode)
+	cmd := exec.Command(utils.CommandPython, "-c", pyCode)
+	output, e := cmd.CombinedOutput()
+	if e != nil {
+		err = e
+		fmt.Println("ReportToPdf failed: , error:" + string(output))
+		utils.FileLog.Info("ReportToPdf failed: , error: \n" + err.Error())
+		utils.FileLog.Info("Output: %s\n", string(output))
+	}
+	defer func() {
+		cmd.Process.Kill()
+	}()
+	return
+}
+
+func ReportToJpeg(width int, reportUrl, filePath string) (err error) {
+	pyCode := `
+import asyncio
+from pyppeteer import launch, errors
+
+async def main():
+    try:
+        # 启动浏览器
+        browser = await launch({
+            'executablePath': '%s',
+            'headless': True,
+            'args': ['--disable-infobars', '--no-sandbox']
+        })
+        
+        # 新建页面
+        page = await browser.newPage()
+        
+        # 设置视口大小
+        await page.setViewport({
+            'width': %d,
+            'height': 1697
+        })
+        
+        # 导航到页面
+        await page.goto('%s', {
+            'waitUntil': 'networkidle0',
+            'timeout': 3000000  # 设置超时时间为 100 秒
+        })
+        # Customizing footer for page numbers starting from page 2
+
+        # 在这里添加两秒的等待
+        await asyncio.sleep(5)
+
+        await page.screenshot({
+            'path': "%s",
+            'fullPage': True,
+			'quality':80
+        })
+        
+    except errors.BrowserError as e:
+        print('Browser closed unexpectedly:', e)
+    except Exception as e:
+        print('An error occurred:', e)
+    finally:
+        # 确保浏览器关闭
+        if browser is not None:
+            await browser.close()
+
+# 获取当前事件循环
+loop = asyncio.get_event_loop()
+
+# 运行事件循环直到main协程完成
+try:
+    loop.run_until_complete(main())
+except Exception as e:
+    print('Error during event loop execution:', e)
+finally:
+    # 关闭事件循环
+    loop.close()
+`
+
+	pyCode = fmt.Sprintf(pyCode, utils.ChromePath, width, reportUrl, filePath)
+	utils.FileLog.Info("jpeg pyCode: \n" + pyCode)
+	cmd := exec.Command(utils.CommandPython, "-c", pyCode)
+	output, e := cmd.CombinedOutput()
+	if e != nil {
+		err = e
+		utils.FileLog.Info("ReportToJpeg failed: , error: \n" + err.Error())
+		utils.FileLog.Info("Output: %s\n", string(output))
+	}
+	defer func() {
+		_ = cmd.Process.Kill()
+	}()
+	return
+}

static/ccf_chart_addition_rule.json

@@ -1,18 +1,18 @@
 [
-    {
-        "Name": "CCFMEG港口库存指数",
-        "ClassifyId": 21,
-        "Frequency": "周度",
-        "prodNames": "kc-221000",
-        "LastNYear": 3,
-        "IndexType": "周均"
-    },
-    {
-        "Name": "CCFPTA FOB中国",
-        "ClassifyId": 22,
-        "Frequency": "日度",
-        "prodNames": "zs-235",
-        "LastNYear": 3,
-        "IndexType": "日均"
-    }
+  {
+    "Name": "CCFMEG港口库存指数",
+    "ClassifyId": 21,
+    "Frequency": "周度",
+    "prodNames": "kc-221000",
+    "LastNYear": 3,
+    "IndexType": "周均"
+  },
+  {
+    "Name": "CCFPTA FOB中国",
+    "ClassifyId": 22,
+    "Frequency": "日度",
+    "prodNames": "zs-235",
+    "LastNYear": 3,
+    "IndexType": "日均"
+  }
 ]

static/ccf_chart_rule.json

@@ -7,4 +7,4 @@
   {"Name":"原料负荷","ClassifyId": 23,"CustNo": 6,"Frequency": "周度", "IndexType": "周均"},
   {"Name":"聚酯负荷","ClassifyId": 23,"CustNo": 7,"Frequency": "周度", "IndexType": "周均"},
   {"Name":"终端负荷","ClassifyId": 23,"CustNo": 8,"Frequency": "周度", "IndexType": "周均"}
-]
+]

test.py

@@ -0,0 +1,47 @@
+
+import asyncio
+from pyppeteer import launch
+
+async def main():
+    # 异步代码
+    browser = await launch({
+        'executablePath': 'C:\Program Files\Google\Chrome\Application',
+        'headless': True,
+        'args': ['--disable-infobars', '--no-sandbox']
+    })
+    page = await browser.newPage()
+    await page.setViewport({
+        'width': 1200,
+        'height': 1697
+    })
+    await page.goto('http://8.136.199.33:7778/adminapi/share/rtq0vg06sE 5-16单人自由审批', {
+        'waitUntil': 'networkidle0',
+        'timeout': 3000000  # 设置超时时间为 100 秒
+    })
+
+    # 在生成PDF之前等待2秒
+    await asyncio.sleep(15)
+
+    await page.pdf({
+        'width': 1240,
+        'height': 1697,
+        'path': "./static/c4ca4238a0b923820dcc509a6f75849b_1200.pdf",
+        'printBackground': True,
+        'margin': {
+            'top': '20px',
+            'bottom': '20px',
+            'left': '20px',
+            'right': '20px'
+        }
+    })
+    await browser.close()
+
+# 创建事件循环
+loop = asyncio.get_event_loop()
+
+# 使用事件循环运行main函数
+try:
+    loop.run_until_complete(main())
+finally:
+    # 关闭事件循环
+    loop.close()

utils/aliyun_oss.go

@@ -0,0 +1,50 @@
+package utils
+
+import (
+	"fmt"
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
+	"time"
+)
+
+// UploadFile 上传文件
+func (m *AliyunService) UploadFile(fileName, filePath, savePath string) (resourceUrl string, err error) {
+	bucket, errBucketExists := m.client.Bucket(Bucketname)
+	if err != nil {
+		err = fmt.Errorf("BucketExists: %v; err: %v", Bucketname, errBucketExists)
+		FileLog.Error("BucketExists: %v; err: %v", Bucketname, errBucketExists)
+		return
+	}
+	path := fmt.Sprintf("%s%s%s/%s", MinIoUploadDir, time.Now().Format("200601/20060102/"), savePath, fileName)
+	if err != nil {
+		FileLog.Error("MinIo上传文件失败:", err)
+		return
+	}
+	err = bucket.PutObjectFromFile(path, filePath)
+	if err != nil {
+		FileLog.Error("Aliyun上传文件失败:", err)
+		return
+	}
+	resourceUrl = Imghost + path
+	return resourceUrl, err
+}
+
+func (m *AliyunService) Instance() OssClient {
+	if AliyunClient == nil {
+		aliyunOnce.Do(func() {
+			if AccessKeyId == "" {
+				FileLog.Warn("MinIo信息未配置,实例化客户端失败")
+				return
+			}
+			client, err := oss.New(Endpoint, AccessKeyId, AccessKeySecret)
+			if err != nil {
+				FileLog.Error("Aliyun连接失败:", err)
+				return
+			}
+
+			AliyunClient = &AliyunService{
+				client: client,
+			}
+		})
+	}
+	return AliyunClient
+}

utils/config.go

@@ -134,6 +134,48 @@ var (
 	ClarkSonsOpen     string //是否配置克拉克森数据源，1已配置
 )
 
+<<<<<<< HEAD
+// minio配置
+var (
+	MinIoAccessKeyId     string
+	MinIoAccessKeySecret string
+	MinIoEndpoint        string
+	MinIoUseSSL          string
+	MinIoBucketName      string
+	MinIoUploadDir       string
+	MinIoViewHost        string
+	ChromePath           string
+	CommandPython        string
+	OssType              string
+)
+
+// S3配置
+var (
+	S3Endpoint        string
+	S3BackEndpoint    string
+	S3BucketName      string
+	S3UploadDir       string
+	S3AccessKeyId     string
+	S3AccessKeySecret string
+	S3Host            string
+	S3Region          string
+	S3ForceStyle      string
+	S3EndpointPort    string
+	S3Protocol        string
+	S3DisableSSL      string
+	S3OpenAcl         string
+)
+
+// 阿里云配置
+var (
+	Bucketname       string
+	Endpoint         string
+	Imghost          string
+	UploadDir        string
+	Upload_Audio_Dir string
+	AccessKeyId      string
+	AccessKeySecret  string
+=======
 // Kpler
 var (
 	KplerExcelFilePath string //excel文件地址
@@ -145,6 +187,7 @@ var (
 
 var (
 	CacheClient *cache.Cache
+>>>>>>> master
 )
 
 func init() {
@@ -296,6 +339,48 @@ func init() {
 		ClarkSonsOpen = config["clarksons_open"]
 	}
 
+	//PDF生成配置
+	{
+		MinIoAccessKeyId = config["minio_access_key_id"]
+		MinIoAccessKeySecret = config["minio_access_key_secret"]
+		MinIoEndpoint = config["minio_endpoint"]
+		MinIoUseSSL = config["minio_use_ssl"]
+		MinIoBucketName = config["minio_bucket_name"]
+		MinIoUploadDir = config["minio_upload_dir"]
+		MinIoViewHost = config["minio_view_host"]
+		ChromePath = config["chrome_path"]
+		CommandPython = config["command_python"]
+		if CommandPython == "" {
+			CommandPython = "python3"
+		}
+		OssType = config["oss_type"]
+		if OssType == "" {
+			OssType = MINIO
+		}
+		// S3-OSS相关
+		S3Endpoint = config["s3_endpoint"]
+		S3BackEndpoint = config["s3_back_endpoint"]
+		S3BucketName = config["s3_bucket_name"]
+		S3Host = config["s3_host"]
+		S3AccessKeyId = config["s3_access_key_id"]
+		S3AccessKeySecret = config["s3_access_key_secret"]
+		S3UploadDir = config["s3_upload_dir"]
+		S3Region = config["s3_region"]
+		S3ForceStyle = config["s3_force_style"]
+		S3EndpointPort = config["s3_endpoint_port"]
+		S3Protocol = config["s3_protocol"]
+		S3DisableSSL = config["s3_disable_ssl"]
+		S3OpenAcl = config["s3_open_acl"]
+
+		//aliyun oss
+		Endpoint = config["endpoint"]
+		Bucketname = config["bucket_name"]
+		Imghost = config["img_host"]
+		UploadDir = config["upload_dir"]
+		Upload_Audio_Dir = config["upload_audio_dir"]
+		AccessKeyId = config["access_key_id"]
+		AccessKeySecret = config["access_key_secret"]
+	}
 	KplerExcelOpen = config["kpler_excel_open"]
 	KplerExcelFilePath = config["kpler_excel_file_path"]
 	KplerRefreshUrl = config["kpler_refresh_url"]

utils/oss_client.go

@@ -0,0 +1,101 @@
+package utils
+
+import (
+	"context"
+	"fmt"
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
+	"sync"
+	"time"
+)
+
+type OssClient interface {
+	UploadFile(fileName, localFile, savePath string) (resourceUrl string, err error)
+	Instance() OssClient
+}
+
+const (
+	MINIO  = "minio"
+	ALIYUN = "aliyun"
+)
+
+var (
+	ossClientMap = map[string]OssClient{
+		MINIO:  &MinioOssService{},
+		ALIYUN: &AliyunService{},
+	}
+)
+
+type MinioOssService struct {
+	client *minio.Client
+}
+type AliyunService struct {
+	client *oss.Client
+}
+
+var (
+	minioOnce   sync.Once
+	aliyunOnce  sync.Once
+	MinioClient *MinioOssService
+
+	AliyunClient *AliyunService
+)
+
+func OssClientHandler(name string) (client OssClient, err error) {
+	if _, ok := ossClientMap[name]; !ok {
+		err = fmt.Errorf("不支持的oss类型:[ %s]", name)
+		return
+	}
+	client = ossClientMap[name].Instance()
+	return
+}
+
+// UploadFile 上传文件
+func (m *MinioOssService) UploadFile(fileName, filePath, savePath string) (resourceUrl string, err error) {
+	bucketName := MinIoBucketName
+	exists, errBucketExists := m.client.BucketExists(context.Background(), bucketName)
+	if errBucketExists != nil || !exists {
+		err = fmt.Errorf("BucketExists: %v; err: %v", exists, errBucketExists)
+		FileLog.Error("BucketExists: %v; err: %v", exists, errBucketExists)
+		return
+	}
+	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)
+		return
+	}
+	resourceUrl = MinIoViewHost + path
+	return
+}
+
+func (m *MinioOssService) Instance() OssClient {
+	if MinioClient == nil {
+		minioOnce.Do(func() {
+			if MinIoAccessKeyId == `` || MinIoAccessKeySecret == `` {
+				FileLog.Warn("MinIo信息未配置,实例化客户端失败")
+				return
+			}
+			endpoint := MinIoEndpoint
+			accessKeyID := MinIoAccessKeyId
+			secretAccessKey := MinIoAccessKeySecret
+			useSSL := false
+			if MinIoUseSSL == "true" {
+				useSSL = true
+			}
+			client, err := minio.New(endpoint, &minio.Options{
+				Creds:  credentials.NewStaticV4(accessKeyID, secretAccessKey, ""),
+				Secure: useSSL,
+			})
+			if err != nil {
+				FileLog.Error("MinIo连接失败:", err)
+				return
+			}
+			MinioClient = &MinioOssService{
+				client: client,
+			}
+		})
+	}
+	return MinioClient
+}