From db0a7225fa6d5133776e593b4f726580d884fd1f Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Wed, 31 May 2023 19:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/buried/core.go   | 57 ----------------------------------------
 modules/buried/module.go | 52 +++++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/modules/buried/core.go b/modules/buried/core.go
index acda21554..39c555bb0 100644
--- a/modules/buried/core.go
+++ b/modules/buried/core.go
@@ -1,12 +1,5 @@
 package buried
 
-import (
-	"fmt"
-	"go_dreamfactory/lego/sys/log"
-	"go_dreamfactory/pb"
-	cfg "go_dreamfactory/sys/configure/structs"
-)
-
 const (
 	//创号后入录数据
 	rtype1 = 1
@@ -31,53 +24,3 @@ const (
 	lte = "lte" // <=
 	ne  = "ne"  // !=
 )
-
-//判断埋点数据的有效性
-func checkburied(buried *pb.BuriedParam, bconf *cfg.GameBuriedTypeData, conf *cfg.GameBuriedCondiData) (efficient bool) {
-	if !(len(buried.Filter) == len(conf.Filter) && len(bconf.Filter) == len(conf.Filter)) {
-		log.Error("校验埋点错误!", log.Field{Key: "buried", Value: buried}, log.Field{Key: "conf", Value: conf})
-		return
-	}
-	for i, v := range conf.Filter {
-		efficient = false
-		value := buried.Filter[i]
-		symbol := bconf.Filter[i]
-		target := conf.Filter[i]
-		switch symbol {
-		case eq: //==
-			if value == target {
-				efficient = true
-			}
-		case gt: //>
-			if value > target {
-				efficient = true
-			}
-		case gte: //>=
-			if value >= target {
-				efficient = true
-			}
-		case lt: //<
-			if value < target {
-				efficient = true
-			}
-		case lte: //<=
-			if value <= target {
-				efficient = true
-			}
-		case ne: //!=
-			if value != target {
-				efficient = true
-			}
-		default:
-			log.Error("校验埋点配置错误!", log.Field{Key: "不存在的比较符号", Value: v}, log.Field{Key: "buried", Value: buried}, log.Field{Key: "conf", Value: conf})
-			return
-		}
-
-		if !efficient { //校验不过
-			log.Debug("校验不通!", log.Field{Key: "埋点id", Value: buried.TaskType}, log.Field{Key: "条件id", Value: conf.Id}, log.Field{Key: "判断公式", Value: fmt.Sprintf("%d %s %d", value, symbol, target)})
-			return
-		}
-	}
-	efficient = true
-	return
-}
diff --git a/modules/buried/module.go b/modules/buried/module.go
index 58bdd1ba3..29b5d0e7b 100644
--- a/modules/buried/module.go
+++ b/modules/buried/module.go
@@ -260,7 +260,7 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
 			continue
 		}
 		for _, cond := range conds {
-			if checkburied(buried, bconf, cond) { //判断此埋点数据是否有效
+			if this.checkburied(buried, bconf, cond) { //判断此埋点数据是否有效
 				if _, ok := pass[buried]; !ok {
 					pass[buried] = make([]*cfg.GameBuriedCondiData, 0)
 				}
@@ -384,3 +384,53 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
 	}
 	return
 }
+
+//判断埋点数据的有效性
+func (this *Buried) checkburied(buried *pb.BuriedParam, bconf *cfg.GameBuriedTypeData, conf *cfg.GameBuriedCondiData) (efficient bool) {
+	if !(len(buried.Filter) == len(conf.Filter) && len(bconf.Filter) == len(conf.Filter)) {
+		this.Error("校验埋点错误!", log.Field{Key: "buried", Value: buried}, log.Field{Key: "conf", Value: conf})
+		return
+	}
+	for i, v := range conf.Filter {
+		efficient = false
+		value := buried.Filter[i]
+		symbol := bconf.Filter[i]
+		target := conf.Filter[i]
+		switch symbol {
+		case eq: //==
+			if value == target {
+				efficient = true
+			}
+		case gt: //>
+			if value > target {
+				efficient = true
+			}
+		case gte: //>=
+			if value >= target {
+				efficient = true
+			}
+		case lt: //<
+			if value < target {
+				efficient = true
+			}
+		case lte: //<=
+			if value <= target {
+				efficient = true
+			}
+		case ne: //!=
+			if value != target {
+				efficient = true
+			}
+		default:
+			this.Error("校验埋点配置错误!", log.Field{Key: "不存在的比较符号", Value: v}, log.Field{Key: "buried", Value: buried}, log.Field{Key: "conf", Value: conf})
+			return
+		}
+
+		if !efficient { //校验不过
+			this.Debug("校验不通!", log.Field{Key: "埋点id", Value: buried.TaskType}, log.Field{Key: "条件id", Value: conf.Id}, log.Field{Key: "判断公式", Value: fmt.Sprintf("%d %s %d", value, symbol, target)})
+			return
+		}
+	}
+	efficient = true
+	return
+}