ziwen %!s(int64=3) %!d(string=hai) anos
pai
achega
6bd917058d

+ 1 - 10
go.sum

@@ -80,14 +80,6 @@ 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=
@@ -435,9 +427,8 @@ 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=

+ 3 - 1
services/commodity_coal_coastal.go

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

+ 3 - 2
services/commodity_coal_inland.go

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

+ 18 - 1
services/commodity_coal_mine.go

@@ -19,13 +19,29 @@ func FileCoalJsm() (err error) {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-
+	//path := "static/file/442家晋陕蒙煤矿周度产量数据-20220328.xlsx"
 	path := "/home/code/python/coal_mail/emailFile/442家晋陕蒙煤矿周度产量数据-%s.xlsx"
 	path = fmt.Sprintf(path,time.Now().Format(utils.FormatDateUnSpace))
+
+	//exist,err := PathExists(path)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
 	xlFile, err := xlsx.OpenFile(path)
 	if err != nil {
 		return
 	}
+	//var xlFile *xlsx.File
+	//if exist {
+	//	xlFile, err = xlsx.OpenFile(path)
+	//	if err != nil {
+	//		return
+	//	}
+	//}else {
+	//	return
+	//}
+
 
 	var province string
 	var description string
@@ -315,6 +331,7 @@ func FileCoalJsm() (err error) {
 					newId, err := models.AddBaseFromCoalmineMapping(v)
 					if err != nil {
 						fmt.Println("再次添加公司指标名称错误", err)
+						fmt.Println(v.IndexName, v.IndexCode)
 						continue
 					} else {
 						fmt.Println("新增公司成功", newId)