fix bug

services/data_source_longzhong.go

@@ -133,7 +133,7 @@ func GetLzProductList() (err error) {
 	}
 	fmt.Println("len")
 	fmt.Println(len(resp.Data))
-	utils.FileLog.Info("%s",string(body))
+	utils.FileLog.Info("%s", string(body))
 	for _, v := range resp.Data {
 		fmt.Println(v.Unitid, v.ProName, v.ProUnitName)
 		var classifyId int
@@ -228,7 +228,7 @@ func GetLzProductDetail() (err error) {
 		}
 	}()
 
-	startDate := time.Now().AddDate(0, 0, -7).Format(utils.FormatDate)
+	startDate := time.Now().AddDate(0, -1, 0).Format(utils.FormatDate)
 	endDate := time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
 	time.Sleep(5 * time.Second)
 	pageSize := 30
@@ -236,106 +236,106 @@ func GetLzProductDetail() (err error) {
 	postUrl := `http://info.oilchem.net/cust/interfacenew/getProductUnitDetailNew`
 	username := "hzmd"
 	password := "HZMD2020"
+	infoList, err := models.GetLongzhonginfoList()
+	if err != nil {
+		return
+	}
+	for _, v := range infoList {
+		totalPage := 10
+		for i := 1; i <= totalPage; i++ {
+			fmt.Println("page:", i, totalPage)
+			timestamp := fmt.Sprintf("%d", time.Now().Unix())
+			token := utils.MD5(username + timestamp + utils.MD5(password))
 
-	totalPage := 10
-	for i := 1; i <= totalPage; i++ {
-		fmt.Println("page:", i)
-		timestamp := fmt.Sprintf("%d", time.Now().Unix())
-		token := utils.MD5(username + timestamp + utils.MD5(password))
-
-		param := url.Values{}
-		param.Add("username", username)
-		param.Add("password", password)
-		param.Add("timestamp", timestamp)
-		param.Add("token", token)
-		//param.Add("id", "334")
-		param.Add("startDate", startDate)
-		param.Add("endDate", endDate)
-		param.Add("pagesize", strconv.Itoa(pageSize))
-		param.Add("page", strconv.Itoa(i))
-		utils.FileLog.Info("%s", param.Encode())
-		body, err := http.Post(postUrl, param.Encode())
-		if err != nil {
-			fmt.Println("err:", err.Error())
-			return err
-		}
-		fmt.Println(string(body))
-		utils.FileLog.Info("%s", string(body))
-		resp := new(models.LzProductInfoDetailResp)
-		err = json.Unmarshal(body, &resp)
-		if err != nil {
-			fmt.Println("Unmarshal Err:" + err.Error())
-			return err
-		}
-		if resp.Code != "1" {
-			fmt.Println("获取信息失败")
-			err = errors.New("Code:" + resp.Code + ";Msg:" + resp.Msg)
-			return err
-		}
-		if i == totalPage && resp.Pagesize >= pageSize {
-			totalPage = totalPage + 5
-		}
-		for k, v := range resp.Data {
-			fmt.Println(k, v.UnitId, v.ProCnName)
-			target, err := models.GetLongzhonginfoByUnitId(v.ProCnName, v.UnitId)
+			param := url.Values{}
+			param.Add("username", username)
+			param.Add("password", password)
+			param.Add("timestamp", timestamp)
+			param.Add("token", token)
+			param.Add("id", strconv.Itoa(v.Unitid))
+			param.Add("startDate", startDate)
+			param.Add("endDate", endDate)
+			param.Add("pagesize", strconv.Itoa(pageSize))
+			param.Add("page", strconv.Itoa(i))
+			utils.FileLog.Info("%s", param.Encode())
+			body, err := http.Post(postUrl, param.Encode())
 			if err != nil {
-				if err.Error() != utils.ErrNoRow() {
-					fmt.Println("获取target失败，err:" + err.Error())
-					continue
-				}
-				fmt.Println("err:" + err.Error())
+				fmt.Println("err:", err.Error())
 				return err
 			}
-			if target == nil {
-				fmt.Println("target is empty:"+v.ProCnName, v.UnitId)
-				continue
-			}
-
-			count, err := models.GetLongzhongdataCount(target.LongzhonginfoId, v.DataTime)
+			fmt.Println(string(body))
+			utils.FileLog.Info("%s", string(body))
+			resp := new(models.LzProductInfoDetailResp)
+			err = json.Unmarshal(body, &resp)
 			if err != nil {
-				fmt.Println("GetLongzhongdataCount Err:" + err.Error())
+				fmt.Println("Unmarshal Err:" + err.Error())
 				return err
 			}
-			if count > 0 {
-				lzdetail := new(models.Longzhongdata)
-				lzdetail.CreateTime = time.Now()
-				lzdetail.ModifyTime = time.Now()
-				lzdetail.TradeCode = target.TradeCode
-				lzdetail.LongzhonginfoId = target.LongzhonginfoId
-				lzdetail.Dt = v.DataTime
-				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 resp.Code != "1" {
+				fmt.Println("获取信息失败")
+				err = errors.New("Code:" + resp.Code + ";Msg:" + resp.Msg)
+				return err
+			}
+			for k, v := range resp.Data {
+				fmt.Println(k, v.UnitId, v.ProCnName)
+				target, err := models.GetLongzhonginfoByUnitId(v.ProCnName, v.UnitId)
 				if err != nil {
-					fmt.Println("ModifyLongzhongdata Err:" + err.Error())
+					if err.Error() != utils.ErrNoRow() {
+						fmt.Println("获取target失败，err:" + err.Error())
+						continue
+					}
+					fmt.Println("err:" + err.Error())
 					return err
 				}
-			} else {
-				lzdetail := new(models.Longzhongdata)
-				lzdetail.CreateTime = time.Now()
-				lzdetail.ModifyTime = time.Now()
-				lzdetail.TradeCode = target.TradeCode
-				lzdetail.LongzhonginfoId = target.LongzhonginfoId
-				lzdetail.Dt = v.DataTime
-				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 target == nil {
+					fmt.Println("target is empty:"+v.ProCnName, v.UnitId)
+					continue
+				}
+
+				count, err := models.GetLongzhongdataCount(target.LongzhonginfoId, v.DataTime)
 				if err != nil {
-					fmt.Println("AddLongzhongdata Err:" + err.Error())
+					fmt.Println("GetLongzhongdataCount Err:" + err.Error())
 					return err
 				}
+				if count > 0 {
+					lzdetail := new(models.Longzhongdata)
+					lzdetail.CreateTime = time.Now()
+					lzdetail.ModifyTime = time.Now()
+					lzdetail.TradeCode = target.TradeCode
+					lzdetail.LongzhonginfoId = target.LongzhonginfoId
+					lzdetail.Dt = v.DataTime
+					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()
+					lzdetail.ModifyTime = time.Now()
+					lzdetail.TradeCode = target.TradeCode
+					lzdetail.LongzhonginfoId = target.LongzhonginfoId
+					lzdetail.Dt = v.DataTime
+					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())
+						return err
+					}
+				}
 			}
+			totalPage = resp.Page
+			time.Sleep(2 * time.Second)
 		}
-		if resp.Pagesize < pageSize || len(resp.Data) == 0 {
-			return err
-		}
-		time.Sleep(2 * time.Second)
 	}
 	return
 }
@@ -360,7 +360,7 @@ func GetHistoryLzProductDetail() (err error) {
 	}
 
 	for ik, iv := range infoList {
-		fmt.Println(ik, iv.SecName,iv.LongzhonginfoId)
+		fmt.Println(ik, iv.SecName, iv.LongzhonginfoId)
 		startDate := "2020-01-01" //time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
 		endDate := "2020-12-31"   //time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
 		//time.Sleep(1 * time.Second)
@@ -445,8 +445,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
+					lzdetail.AddTime = v.AddTime
+					lzdetail.DisplayTime = v.DisplayTime
 					err = models.ModifyLongzhongdata(lzdetail)
 					if err != nil {
 						fmt.Println("ModifyLongzhongdata Err:" + err.Error())
@@ -462,8 +462,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
+					lzdetail.AddTime = v.AddTime
+					lzdetail.DisplayTime = v.DisplayTime
 					err = models.AddLongzhongdata(lzdetail)
 					if err != nil {
 						fmt.Println("AddLongzhongdata Err:" + err.Error())
@@ -749,7 +749,7 @@ func GetLzProductPriceData() (err error) {
 		}
 		fmt.Println("getUrl:", getUrl)
 		fmt.Println("body", string(body))
-		utils.FileLog.Info("%s",string(body))
+		utils.FileLog.Info("%s", string(body))
 		infoList := new(models.LzPriceDataResp)
 		err = json.Unmarshal(body, &infoList)
 		if err != nil {

services/task.go

@@ -40,7 +40,7 @@ func Task123() {
 
 func Task() {
 	fmt.Println("start")
-	GetHistoryLzProductDetail()
+	GetLzProductDetail()
 	fmt.Println("end")
 }