浏览代码

no message

xingzai 3 年之前
父节点
当前提交
75b21a81d2
共有 2 个文件被更改,包括 24 次插入6 次删除
  1. 22 4
      services/commodity_trade_dalian.go
  2. 2 2
      services/task.go

+ 22 - 4
services/commodity_trade_dalian.go

@@ -772,16 +772,17 @@ func DoHtml(body, name, contractId string, dateTime time.Time) (err error) {
 			item.Rank = rank
 			item.Rank = rank
 			item.DealShortName = shortName
 			item.DealShortName = shortName
 			item.DealName = shortName + "_成交量_" + contractId
 			item.DealName = shortName + "_成交量_" + contractId
-			item.DealCode = fmt.Sprintf("D%s", time.Now().Format(utils.FormatDateTimeUnSpace)+strconv.Itoa(utils.GetRandInt(1, 100)))
+			item.DealCode = dlIndexCodeGenerator(item.DealName)
 			item.DealValue = dealValue
 			item.DealValue = dealValue
 			item.BuyShortName = buyName
 			item.BuyShortName = buyName
+			item.DealChange = dealChange
 			item.BuyName = buyName + "_持买单量_" + contractId
 			item.BuyName = buyName + "_持买单量_" + contractId
-			item.BuyCode = fmt.Sprintf("D%s", time.Now().Format(utils.FormatDateTimeUnSpace)+strconv.Itoa(utils.GetRandInt(1, 100)))
+			item.BuyCode = dlIndexCodeGenerator(item.BuyName)
 			item.BuyValue = buyValue
 			item.BuyValue = buyValue
 			item.BuyChange = buyChange
 			item.BuyChange = buyChange
 			item.SoldShortName = soldName
 			item.SoldShortName = soldName
 			item.SoldName = soldName + "_持买单量_" + contractId
 			item.SoldName = soldName + "_持买单量_" + contractId
-			item.SoldCode = fmt.Sprintf("D%s", time.Now().Format(utils.FormatDateTimeUnSpace)+strconv.Itoa(utils.GetRandInt(1, 100)))
+			item.SoldCode = dlIndexCodeGenerator(item.SoldName)
 			item.SoldValue = soldValue
 			item.SoldValue = soldValue
 			item.SoldChange = soldChange
 			item.SoldChange = soldChange
 			item.Frequency = "日度"
 			item.Frequency = "日度"
@@ -790,6 +791,7 @@ func DoHtml(body, name, contractId string, dateTime time.Time) (err error) {
 			item.CreateTime = time.Now()
 			item.CreateTime = time.Now()
 			item.ModifyTime = time.Now()
 			item.ModifyTime = time.Now()
 			item.DataTime = dateTime
 			item.DataTime = dateTime
+
 			_, err := models.AddBaseFromTradeDalianIndex(item)
 			_, err := models.AddBaseFromTradeDalianIndex(item)
 			if err != nil {
 			if err != nil {
 				fmt.Println(err)
 				fmt.Println(err)
@@ -812,7 +814,7 @@ type SearchContractId struct {
 
 
 func SyncRankingFromDalianDo() {
 func SyncRankingFromDalianDo() {
 
 
-	for i := 6; i >= 0; i-- {
+	for i := 179; i >= 0; i-- {
 		//fmt.Println(i)
 		//fmt.Println(i)
 		SyncRankingFromDalian2(i)
 		SyncRankingFromDalian2(i)
 	}
 	}
@@ -906,3 +908,19 @@ func SyncRankingFromDalian2(dayNum int) {
 		}
 		}
 	}
 	}
 }
 }
+
+//var indexCode string
+//var indexCodeMap = make(map[string]string)
+
+func dlIndexCodeGenerator(indexName string) string {
+	indexCode, _ := indexCodeMap[indexName]
+	if indexCode == "" {
+		indexCode = fmt.Sprintf("DL%s", time.Now().Format(utils.FormatDateTimeUnSpace)+strconv.Itoa(utils.GetRandInt(1, 100)))
+		indexCodeMap[indexName] = indexCode
+		err := models.AddBaseFromTradeMapping(indexName, indexCode, "DL")
+		if err != nil {
+			fmt.Println("add Code err:", err)
+		}
+	}
+	return indexCode
+}

+ 2 - 2
services/task.go

@@ -7,13 +7,13 @@ import (
 func Task() {
 func Task() {
 	fmt.Println("start crawler")
 	fmt.Println("start crawler")
 	//同步郑州商品交易所排名
 	//同步郑州商品交易所排名
-	SyncRankingFromZhengzhou()
+	//SyncRankingFromZhengzhou()
 
 
 	//SyncRankingFromShangHai()
 	//SyncRankingFromShangHai()
 	//SyncRankingFromIne()
 	//SyncRankingFromIne()
 	//SyncRankingFromCffex()
 	//SyncRankingFromCffex()
 
 
-	//SyncRankingFromDalian2()
+	SyncRankingFromDalianDo()
 	//SyncStorageFromEic()
 	//SyncStorageFromEic()
 	//SyncStorageFromEic()
 	//SyncStorageFromEic()
 	fmt.Println("end crawler")
 	fmt.Println("end crawler")