소스 검색

煤炭网线上地址

ziwen 3 년 전
부모
커밋
e703016b4c
6개의 변경된 파일88개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 1
      go.mod
  2. 10 2
      go.sum
  3. 9 1
      services/commodity_coal_coastal.go
  4. 58 2
      services/commodity_coal_firm.go
  5. 2 1
      services/commodity_coal_inland.go
  6. 8 2
      services/commodity_coal_mine.go

+ 1 - 1
go.mod

@@ -11,6 +11,6 @@ require (
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/mozillazg/go-pinyin v0.19.0
 	github.com/rdlucklib/rdluck_tools v1.0.2
-	github.com/tealeg/xlsx v1.0.5 // indirect
+	github.com/tealeg/xlsx v1.0.5
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )

+ 10 - 2
go.sum

@@ -80,6 +80,14 @@ github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt
 github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
 github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
+github.com/emersion/go-imap v1.2.0 h1:lyUQ3+EVM21/qbWE/4Ya5UG9r5+usDxlg4yfp3TgHFA=
+github.com/emersion/go-imap v1.2.0/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY=
+github.com/emersion/go-message v0.15.0 h1:urgKGqt2JAc9NFJcgncQcohHdiYb803YTH9OQwHBHIY=
+github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1XQp98QTaHernxMYzRaOasRir9hUlFQ=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -419,7 +427,6 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -428,8 +435,9 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

+ 9 - 1
services/commodity_coal_coastal.go

@@ -18,7 +18,15 @@ func FileCoalCoastal() (err error) {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-	path := "static/file/coastal.xlsx"
+	var month string
+	dateMonth := int(time.Now().Month())
+	if dateMonth < 10 {
+		month = strconv.Itoa(dateMonth)
+		month = "0"+month
+	}
+	day := time.Now().Day()
+	path := "/home/code/python/coal_mail/emailFile/沿海八省动力煤终端用户供耗存数据更新%s.%s.xlsx"
+	path = fmt.Sprintf(path, month, day)
 	xlFile, err := xlsx.OpenFile(path)
 	if err != nil {
 		fmt.Println(err)

+ 58 - 2
services/commodity_coal_firm.go

@@ -6,6 +6,7 @@ import (
 	"github.com/tealeg/xlsx"
 	"hongze/hongze_data_crawler/models"
 	"hongze/hongze_data_crawler/utils"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -18,8 +19,51 @@ func FileCoalFirm() (err error) {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-	path := "static/file/firm.xlsx"
-	xlFile, err := xlsx.OpenFile(path)
+	var xlFile *xlsx.File
+	syear := time.Now().Year()
+	var smonth string
+	dateMonth := int(time.Now().Month())
+	smonth = strconv.Itoa(dateMonth)
+	//path := "static/file/firm.xlsx"
+	path := "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月).xlsx"
+	path = fmt.Sprintf(path,syear,smonth)
+	exist,err := PathExists(path)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	if exist == false {
+		path = "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月中旬).xlsx"
+		path = fmt.Sprintf(path,syear,smonth)
+		exist,err = PathExists(path)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+	}else if exist == false {
+		path = "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月上旬).xlsx"
+		path = fmt.Sprintf(path,syear,smonth)
+		exist,err = PathExists(path)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+	}else if exist == false {
+		//本月三个文件都没有,去取上一个月的
+		dateMonth = dateMonth - 1
+		smonth = strconv.Itoa(dateMonth)
+		path = "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月).xlsx"
+		path = fmt.Sprintf(path,syear,smonth)
+		exist,err = PathExists(path)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+	}
+
+
+	path = fmt.Sprintf(path,syear,smonth)
+	xlFile, err = xlsx.OpenFile(path)
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -244,3 +288,15 @@ func trimProvinceName(name string) string {
 	name = strings.Replace(name, "+", "", -1)
 	return name
 }
+
+
+func PathExists(path string)(bool, error) {
+	_, err := os.Stat(path)
+	if err == nil { //文件或者目录存在
+		return true, nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return false, err
+}

+ 2 - 1
services/commodity_coal_inland.go

@@ -17,7 +17,8 @@ func FileCoalInland() (err error) {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-	path := "static/file/inland.xlsx"
+	path := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存%s.xlsx"
+	path = fmt.Sprintf(path,time.Now().Format(utils.FormatDateUnSpace))
 	xlFile, err := xlsx.OpenFile(path)
 	if err != nil {
 		fmt.Println(err)

+ 8 - 2
services/commodity_coal_mine.go

@@ -19,7 +19,9 @@ func FileCoalJsm() (err error) {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-	path := "static/file/jsm.xlsx"
+
+	path := "/home/code/python/coal_mail/emailFile/442家晋陕蒙煤矿周度产量数据-%s.xlsx"
+	path = fmt.Sprintf(path,time.Now().Format(utils.FormatDateUnSpace))
 	xlFile, err := xlsx.OpenFile(path)
 	if err != nil {
 		return
@@ -176,7 +178,11 @@ func FileCoalJsm() (err error) {
 						item.Description = description
 						item.Province = province
 						item.Source = "三省周度"
-						item.Unit = "万吨"
+						if exchange == "产量"{
+							item.Unit = "万吨"
+						}else {
+							item.Unit = "百分比"
+						}
 						item.Frequency = "周度"
 						item.ModifyTime = time.Now()
 						item.CreateTime = time.Now()