rdluck 4 лет назад
Родитель
Сommit
a59b61fcab
3 измененных файлов с 28 добавлено и 14 удалено
  1. 9 3
      models/data_source_longzhong.go
  2. 13 5
      services/data_source_longzhong.go
  3. 6 6
      services/task.go

+ 9 - 3
models/data_source_longzhong.go

@@ -15,6 +15,8 @@ type Longzhongdata struct {
 	ModifyTime      time.Time
 	UnitDesc        string
 	UpdTime         string
+	AddTime string
+	DisplayTime string
 }
 
 type Longzhonginfo struct {
@@ -67,10 +69,12 @@ func ModifyLongzhongdata(item *Longzhongdata) (err error) {
 			  close = ?,
 			  modify_time= NOW(),
 			  unit_desc= ?,
-			  upd_time = ?
+			  upd_time = ?,
+			  add_time=?,
+			  display_time=?
 			WHERE longzhonginfo_id = ? AND dt=?
 			 `
-	_, err = o.Raw(sql, item.Close, item.UnitDesc, item.UpdTime, item.LongzhonginfoId, item.Dt).Exec()
+	_, err = o.Raw(sql, item.Close, item.UnitDesc, item.UpdTime,item.AddTime,item.DisplayTime, item.LongzhonginfoId, item.Dt).Exec()
 	return
 }
 
@@ -150,6 +154,8 @@ type LzProductInfoDetail struct {
 	UnitDesc  string  `json:"unit_desc"`
 	DataTime  string  `json:"data_time"`
 	UpdTime   string  `json:"upd_time"`
+	AddTime string `json:"add_time"`
+	DisplayTime string `json:"display_time"`
 }
 
 type LzProductInfoDetailResp struct {
@@ -205,7 +211,7 @@ type LongzhonginfoList struct {
 func GetLongzhonginfoList() (items []*LongzhonginfoList, err error) {
 	o := orm.NewOrm()
 	o.Using("edb")
-	sql := ` SELECT * FROM longzhonginfo WHERE longzhonginfo_id=126 `
+	sql := ` SELECT * FROM longzhonginfo `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

+ 13 - 5
services/data_source_longzhong.go

@@ -227,7 +227,7 @@ func GetLzProductDetail() (err error) {
 		}
 	}()
 
-	startDate := time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
+	startDate := time.Now().AddDate(0, 0, -7).Format(utils.FormatDate)
 	endDate := time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
 	time.Sleep(5 * time.Second)
 	pageSize := 30
@@ -305,6 +305,8 @@ func GetLzProductDetail() (err error) {
 				lzdetail.Close = v.UnitValue
 				lzdetail.UnitDesc = v.UnitDesc
 				lzdetail.UpdTime = v.UpdTime
+				lzdetail.AddTime=v.AddTime
+				lzdetail.DisplayTime=v.DisplayTime
 				err = models.ModifyLongzhongdata(lzdetail)
 				if err != nil {
 					fmt.Println("ModifyLongzhongdata Err:" + err.Error())
@@ -320,6 +322,8 @@ func GetLzProductDetail() (err error) {
 				lzdetail.Close = v.UnitValue
 				lzdetail.UnitDesc = v.UnitDesc
 				lzdetail.UpdTime = v.UpdTime
+				lzdetail.AddTime=v.AddTime
+				lzdetail.DisplayTime=v.DisplayTime
 				err = models.AddLongzhongdata(lzdetail)
 				if err != nil {
 					fmt.Println("AddLongzhongdata Err:" + err.Error())
@@ -335,7 +339,7 @@ func GetLzProductDetail() (err error) {
 	return
 }
 
-//获取历史隆众数据
+//获取历史隆众石化数据
 func GetHistoryLzProductDetail() (err error) {
 	utils.FileLog.Info("start GetHistoryLzProductDetail")
 	var msg string
@@ -431,7 +435,7 @@ func GetHistoryLzProductDetail() (err error) {
 				}
 				if count > 0 {
 					fmt.Println("数据已存在:", iv.Unitid, iv.SecName, v.UnitValue, v.DataTime)
-					/*lzdetail := new(models.Longzhongdata)
+					lzdetail := new(models.Longzhongdata)
 					lzdetail.CreateTime = time.Now()
 					lzdetail.ModifyTime = time.Now()
 					lzdetail.TradeCode = target.TradeCode
@@ -440,11 +444,13 @@ func GetHistoryLzProductDetail() (err error) {
 					lzdetail.Close = v.UnitValue
 					lzdetail.UnitDesc = v.UnitDesc
 					lzdetail.UpdTime = v.UpdTime
+					lzdetail.AddTime=v.AddTime
+					lzdetail.DisplayTime=v.DisplayTime
 					err = models.ModifyLongzhongdata(lzdetail)
 					if err != nil {
 						fmt.Println("ModifyLongzhongdata Err:" + err.Error())
 						return err
-					}*/
+					}
 				} else {
 					lzdetail := new(models.Longzhongdata)
 					lzdetail.CreateTime = time.Now()
@@ -455,6 +461,8 @@ func GetHistoryLzProductDetail() (err error) {
 					lzdetail.Close = v.UnitValue
 					lzdetail.UnitDesc = v.UnitDesc
 					lzdetail.UpdTime = v.UpdTime
+					lzdetail.AddTime=v.AddTime
+					lzdetail.DisplayTime=v.DisplayTime
 					err = models.AddLongzhongdata(lzdetail)
 					if err != nil {
 						fmt.Println("AddLongzhongdata Err:" + err.Error())
@@ -728,7 +736,7 @@ func GetLzProductPriceData() (err error) {
 	}
 	username := "hzmd"
 	password := "HZMD2020"
-	startDate := time.Now().AddDate(0, 0, -1).Format(utils.FormatDate)
+	startDate := time.Now().AddDate(0, 0, -7).Format(utils.FormatDate)
 	endDate := time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
 	for k, v := range priceInfoList {
 		fmt.Println(k, v)

+ 6 - 6
services/task.go

@@ -5,7 +5,7 @@ import (
 	"github.com/astaxie/beego/toolbox"
 )
 
-func Taskabc() {
+func Task() {
 	fmt.Println("task start")
 	//发送邮件
 	sendEmail := toolbox.NewTask("sendEmail", "0 0 12 * * 0 ", SendEmail)
@@ -38,11 +38,11 @@ func Taskabc() {
 }
 
 
-func Task() {
-	fmt.Println("start")
-	GetHistoryLzProductDetail()
-	fmt.Println("end")
-}
+//func Task() {
+//	fmt.Println("start")
+//	GetHistoryLzProductDetail()
+//	fmt.Println("end")
+//}
 
 func SendEmail() (err error) {
 	//报告历史访问次数