新增字段处理

userBehaviorTask/entity/task.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/zeromicro/go-zero/core/logx"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"regexp"
 	"sort"
 	"strconv"
@@ -154,13 +155,15 @@ func searchHandle(start, end int64) {
 	endTime := primitive.NewObjectIDFromTimestamp(time.Unix(end, 0))*/
 	startTime := strconv.FormatInt(start, 16) + "0000000000000000"
 	endTime := strconv.FormatInt(end, 16) + "0000000000000000"
+	startTimeId, _ := primitive.ObjectIDFromHex(startTime)
+	endTimeId, _ := primitive.ObjectIDFromHex(endTime)
 	logx.Info("搜索条件start。。。", start, end, startTime, endTime)
 	sess := MgoLog.GetMgoConn()
 	defer MgoLog.DestoryMongoConn(sess)
 	it := sess.DB("qfw").C("jy_search_log").Find(map[string]interface{}{
 		"_id": map[string]interface{}{
-			"$gte": startTime,
-			"$lt":  endTime,
+			"$gte": startTimeId,
+			"$lt":  endTimeId,
 		},
 	}).Sort("createtime").Select(map[string]interface{}{}).Iter()
 	var numb int64
@@ -238,14 +241,16 @@ func ContentHandle(start, end int64) {
 	var numb int64
 	startTime := strconv.FormatInt(start, 16) + "0000000000000000"
 	endTime := strconv.FormatInt(end, 16) + "0000000000000000"
+	startTimeId, _ := primitive.ObjectIDFromHex(startTime)
+	endTimeId, _ := primitive.ObjectIDFromHex(endTime)
 	logx.Info("三级页浏览数据start。。。", start, end, startTime, endTime)
 	sess := MgoLog.GetMgoConn()
 	defer MgoLog.DestoryMongoConn(sess)
 	//jylog
 	it := sess.DB("qfw").C("jy_logs").Find(map[string]interface{}{
 		"_id": map[string]interface{}{
-			"$gte": startTime,
-			"$lt":  endTime,
+			"$gte": startTimeId,
+			"$lt":  endTimeId,
 		},
 	}).Sort("_id").Select(map[string]interface{}{
 		"date":   1,
@@ -263,10 +268,11 @@ func ContentHandle(start, end int64) {
 	numb = 0
 	sess1 := MgoLog.GetMgoConn()
 	defer MgoLog.DestoryMongoConn(sess1)
+
 	it1 := sess1.DB("qfw").C("jyapp_logs").Find(map[string]interface{}{
 		"_id": map[string]interface{}{
-			"$gte": startTime,
-			"$lt":  endTime,
+			"$gte": startTimeId,
+			"$lt":  endTimeId,
 		},
 	}).Sort("_id").Select(map[string]interface{}{
 		"date":   1,
@@ -326,14 +332,18 @@ func InformationHandle(m map[string]interface{}, data map[string][]map[string]in
 	area := ""
 	city := ""
 	district := ""
+	projectname := ""
 	if _, ok := biddingInfo[infoId]; !ok {
-		bidding, _ := MgoBidding.FindById("bidding", infoId, `{"gov_classify":1,"area":1}`)
+		bidding, _ := MgoBidding.FindById("bidding", infoId, `{"gov_classify":1,"area":1,"projectname":1,"city":1,"district":1}`)
 		biddingInfo[infoId] = map[string]interface{}{}
 		if bidding == nil {
 			return
 		}
 		gov_classify := gconv.Map((*bidding)["gov_classify"])
 		area = gconv.String((*bidding)["area"])
+		projectname = gconv.String((*bidding)["projectname"])
+		district = gconv.String((*bidding)["district"])
+		city = gconv.String((*bidding)["city"])
 		if gov_classify != nil {
 			root := strings.Split(gconv.String(gov_classify["root"]), "/")
 			if len(root) == 0 {
@@ -343,10 +353,11 @@ func InformationHandle(m map[string]interface{}, data map[string][]map[string]in
 					if root[i] != "" {
 						rootStr = root[i]
 						biddingInfo[infoId] = map[string]interface{}{
-							"area":     area,
-							"city":     city,
-							"district": district,
-							"rootStr":  rootStr,
+							"area":        area,
+							"city":        city,
+							"projectname": projectname,
+							"district":    district,
+							"rootStr":     rootStr,
 						}
 						break
 					}
@@ -356,8 +367,9 @@ func InformationHandle(m map[string]interface{}, data map[string][]map[string]in
 	} else {
 		rootStr = gconv.String(biddingInfo[infoId]["rootStr"])
 		area = gconv.String(biddingInfo[infoId]["area"])
-		city = gconv.String(biddingInfo[infoId]["area"])
+		city = gconv.String(biddingInfo[infoId]["city"])
 		district = gconv.String(biddingInfo[infoId]["district"])
+		projectname = gconv.String(biddingInfo[infoId]["projectname"])
 	}
 	if rootStr == "" {
 		return
@@ -369,6 +381,7 @@ func InformationHandle(m map[string]interface{}, data map[string][]map[string]in
 		"datetime":    time.Unix(gconv.Int64(m["date"]), 0).Format("2006-01-02 15:04:05"), //搜索时间
 		"area":        area,
 		"city":        city,
+		"projectname": projectname,
 		"district":    district,
 	}
 	if _, ok := data[userId]; ok {

userBehaviorTask/main.go

@@ -6,12 +6,12 @@ import (
 )
 
 func main() {
-	/*m := flag.Int("m", 0, " 1-指定时间段统计")
+	m := flag.Int("m", 0, " 1-指定时间段统计")
 	s := flag.Int64("s", 0, "开始时间")
-	e := flag.Int64("e", 0, "结束时间")*/
-	m := flag.Int("m", 1, " 1-指定时间段统计")
-	s := flag.Int64("s", 1710779901, "开始时间")
-	e := flag.Int64("e", 1710833901, "结束时间")
+	e := flag.Int64("e", 0, "结束时间")
+	/*m := flag.Int("m", 1, " 1-指定时间段统计")
+	s := flag.Int64("s", 1730736000, "开始时间")
+	e := flag.Int64("e", 1731254400, "结束时间")*/
 	flag.Parse()
 	if *m == 1 {
 		(&entity.Task{}).ShuaKu(*s, *e)