Browse Source

修复 bidding_id 转 时间戳 错误

wcc 1 year ago
parent
commit
d3eafd21fd
2 changed files with 8 additions and 12 deletions
  1. 6 10
      website_columns/main.go
  2. 2 2
      website_columns/web_test.go

+ 6 - 10
website_columns/main.go

@@ -2,13 +2,11 @@ package main
 
 import (
 	"context"
-	"fmt"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gclient"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/robfig/cron/v3"
 	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.uber.org/zap"
 	util "jygit.jydev.jianyu360.cn/data_processing/common_utils"
@@ -154,7 +152,7 @@ func getHot() {
 	hots, _ := MgoB.Find("bidding_hots", nil, nil, map[string]interface{}{"bidding_id": 1}, false, -1, -1)
 	if len(*hots) > 0 {
 		for _, v := range *hots {
-			existsMap[mongodb.BsonIdToSId(v["bidding_id"])] = true
+			existsMap[util.ObjToString(v["bidding_id"])] = true
 		}
 	}
 
@@ -167,7 +165,7 @@ func getHot() {
 		vs := strings.Split(va, " ")
 		if len(vs) == 2 {
 			insert := map[string]interface{}{
-				"bidding_id": mongodb.StringTOBsonId(vs[0]),
+				"bidding_id": vs[0],
 				"num":        g.NewVar(vs[1]).Int(),
 				"date":       file,
 			}
@@ -190,11 +188,7 @@ func getHot() {
 	for _, data := range *hotData {
 		biddingID := util.ObjToString(data["bidding_id"])
 		// 将字符串转换为 ObjectId
-		objectID, err := primitive.ObjectIDFromHex(biddingID)
-		if err != nil {
-			fmt.Println("Error parsing ObjectId:", err)
-			continue
-		}
+		objectID := mongodb.StringTOBsonId(biddingID)
 		// 从 ObjectId 中提取时间戳
 		timestamp := objectID.Timestamp()
 		// 判断时间是否在最近一年内
@@ -211,6 +205,7 @@ func getHot() {
 		}
 	}
 
+	newCount := 0
 	for k, v := range hotMap {
 		//之前存在过的数据,不再入 bidding_hots
 		if existsMap[k] {
@@ -222,7 +217,7 @@ func getHot() {
 			if biddingData == nil {
 				continue
 			}
-
+			newCount++
 			insert := map[string]interface{}{
 				"bidding_id": k,
 				"num":        v,
@@ -246,6 +241,7 @@ func getHot() {
 		}
 	}
 
+	log.Info("getHot", zap.Int("over", newCount))
 }
 
 // dealProject 处理拟建项目数据标签

+ 2 - 2
website_columns/web_test.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	"jygit.jydev.jianyu360.cn/data_processing/common_utils/mongodb"
 	"testing"
 	"time"
 )
 
 func TestIdTime(T *testing.T) {
 	id := "65713fc86977356f555aded5"
-	objectID, _ := primitive.ObjectIDFromHex(id)
+	objectID := mongodb.StringTOBsonId(id)
 	timestamp := objectID.Timestamp()
 
 	fmt.Println(timestamp.Format("2006-01-02"))