From c165dbb634d3c8f3446d499c25894e8d61945c2d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 24 十月 2019 11:52:41 +0800
Subject: [PATCH] 减少日志量外加放开标签过滤器

---
 logger/logger.go                 |   16 ++++----
 insertdata/insertDataToEs.go     |    8 ++--
 ruleserver/ruleToformula.go      |   30 +++++++-------
 main.go                          |   11 +++--
 labelFilter/readyDataForLabel.go |    8 ++--
 labelFilter/ruleForLabel.go      |   20 +++++-----
 ruleserver/readyDataForRule.go   |    8 ++--
 7 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index f5804c4..aaa1ea9 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -199,7 +199,7 @@
 					panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
 				}
 				alarmRules := []AlarmRule{}
-				logger.Warn("浜鸿劯id涓猴細", face.Id, "浜鸿劯鐨勮鍒欓暱搴︿负锛�", len(face.rules))
+				//logger.Warn("浜鸿劯id涓猴細", face.Id, "浜鸿劯鐨勮鍒欓暱搴︿负锛�", len(face.rules))
 				//os.Exit(1)
 				for _, faceResult := range face.rules {
 					alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
@@ -318,11 +318,11 @@
 func hebingFace(faces []*FaceAndRules, faceResult structure.FaceResult) []*FaceAndRules {
 	for _, arg := range faceResult.Args {
 		// 鎷垮埌姣忎竴寮犱汉鑴�
-		logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�", len(arg.Liker))
+		//logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�", len(arg.Liker))
 		flag := false
 		for _, face := range faces {
 			for _, lik := range face.Liker {
-				logger.Warn("--------鍚堝苟浜鸿劯鏃剁浉浼艰�咃細", lik.PersonId, lik.TableName)
+				//logger.Warn("--------鍚堝苟浜鸿劯鏃剁浉浼艰�咃細", lik.PersonId, lik.TableName)
 			}
 			if arg.Id == face.Id {
 				flag = true
@@ -404,7 +404,7 @@
 					// 瑁呴厤鐩爣淇℃伅鏁版嵁
 					for _,target := range yoloResult.Location  {
 						// 鍘婚噸娣诲姞
-						logger.Info("瑁呴厤鍓嶇殑鍘熷鏁版嵁鏄細",target)
+						//logger.Info("瑁呴厤鍓嶇殑鍘熷鏁版嵁鏄細",target)
 						var flag = true
 						for _,selectTarget := range targetInfos  {
 							if strconv.FormatUint(target.TargetId, 10) == selectTarget.TargetId {
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 0c99550..51c76df 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -18,10 +18,10 @@
 }
 // 鎶婃暟鎹閰嶅埌label
 func (label *Label)DataFormatToLabel(result structure.ResultMsg) {
-	logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0)
-	logger.Debug("yolo缁撴灉锛�",result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0)
+	//logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0)
+	//logger.Debug("yolo缁撴灉锛�",result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0)
 	if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) {
-		logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
+		//logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
 		label.CameraId = result.Cid
 		camera, err := cache.GetCameraById(result.Cid)
 		if err != nil {
@@ -42,7 +42,7 @@
 				label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
 			}
 		}
-		logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
+		//logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
 	}
 }
 
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 23b27da..ef2ca9f 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -14,7 +14,7 @@
 	// 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
 	label := new(Label)
 	label.DataFormatToLabel(msg)
-	logger.Info("label鐨勪俊鎭細", label.CameraName, label.DefenceLevel, label.Time)
+	//logger.Info("label鐨勪俊鎭細", label.CameraName, label.DefenceLevel, label.Time)
 	if label.CameraName == "" {
 		logger.Error("鏃犳晥鏁版嵁锛岀洿鎺ヨ繑鍥�")
 		return
@@ -22,7 +22,7 @@
 	//鎷垮埌鎵�鏈夎鍒欑粍
 	var api dbapi.EventPushApi
 	b, allRules := api.FindAllDetails()
-	logger.Info("鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
+	//logger.Info("鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
 	if !b {
 		logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
 	}
@@ -92,7 +92,7 @@
 // 鏄惁绗﹀悎鏃堕棿瑙勫垯
 func timeJudge(label *Label, groupRule protomsg.EventPush) bool {
 	timeNow := time.Now().Format("2006-01-02 15:04:05")
-	logger.Info("鏍囩杩囨护鍣ㄨ捣濮嬫椂闂翠负锛�",groupRule.TimeStart,groupRule.TimeEnd)
+	//logger.Info("鏍囩杩囨护鍣ㄨ捣濮嬫椂闂翠负锛�",groupRule.TimeStart,groupRule.TimeEnd)
 	flag1 := isBefore(groupRule.TimeStart, timeNow)
 	flag2 := isBefore(timeNow, groupRule.TimeEnd)
 	if flag1 && flag2 {
@@ -129,7 +129,7 @@
 	if rule.TopicArg == "addr" {
 		formula = "'" + label.CameraAddr + "'" + rule.Operator + "'" + rule.RuleValue + "'"
 	}
-	logger.Info("-------鎵撳嵃鎽勫儚鏈鸿鍒欏叕寮忥細",formula)
+	//logger.Info("-------鎵撳嵃鎽勫儚鏈鸿鍒欏叕寮忥細",formula)
 	expression, err := govaluate.NewEvaluableExpression(formula);
 	if err != nil {
 		logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
@@ -144,7 +144,7 @@
 		logger.Info("绗﹀悎鎽勫儚鏈鸿鍒�!")
 		return "true"
 	}
-	logger.Info("涓嶇鍚堟憚鍍忔満瑙勫垯!")
+	//logger.Info("涓嶇鍚堟憚鍍忔満瑙勫垯!")
 	return "false"
 }
 
@@ -166,7 +166,7 @@
 				for _, liker := range arg.Liker {
 					formula := "'" + liker.TableId + "'" + rule.Operator + "'" + rule.RuleValue + "'"
 					expression, err := govaluate.NewEvaluableExpression(formula);
-					logger.Info("-------鎵撳嵃搴曞簱瑙勫垯鍏紡锛�",formula)
+					//logger.Info("-------鎵撳嵃搴曞簱瑙勫垯鍏紡锛�",formula)
 					if err != nil {
 						logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
 						return "false"
@@ -206,7 +206,7 @@
 				// 鍏朵粬杩欎釜鍊煎厛杩欎箞澶勭悊
 				return "true"
 			}
-			logger.Info("-------鎵撳嵃浜哄憳瑙勫垯鍏紡锛�",formula)
+			//logger.Info("-------鎵撳嵃浜哄憳瑙勫垯鍏紡锛�",formula)
 			expression, err := govaluate.NewEvaluableExpression(formula);
 			if err != nil {
 				logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
@@ -230,7 +230,7 @@
 				}
 			} else {
 				formula := strconv.Itoa(int(personGroup.AlarmLevel)) + rule.Operator + formate(rule.RuleValue)
-				logger.Info("-------鎵撳嵃浜哄憳绛夌骇瑙勫垯鍏紡锛�",formula)
+				//logger.Info("-------鎵撳嵃浜哄憳绛夌骇瑙勫垯鍏紡锛�",formula)
 				expression, err := govaluate.NewEvaluableExpression(formula);
 				if err != nil {
 					logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
@@ -267,7 +267,7 @@
 	} else {
 		for _, def := range label.DefenceLevel {
 			formula := strconv.Itoa(int(def)) + rule.Operator + rule.RuleValue
-			logger.Info("-------鎵撳嵃甯冮槻绛夌骇瑙勫垯鍏紡锛�",formula)
+			//logger.Info("-------鎵撳嵃甯冮槻绛夌骇瑙勫垯鍏紡锛�",formula)
 			expression, err := govaluate.NewEvaluableExpression(formula);
 			if err != nil {
 				logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
@@ -292,7 +292,7 @@
 func taskJudge(label *Label, rule *protomsg.EventPushRule) string {
 	formula := "'"+label.TaskId +"'"+ rule.Operator +"'"+ rule.RuleValue+"'"
 	expression, err := govaluate.NewEvaluableExpression(formula);
-	logger.Info("-------鎵撳嵃浠诲姟瑙勫垯鍏紡锛�",formula)
+	//logger.Info("-------鎵撳嵃浠诲姟瑙勫垯鍏紡锛�",formula)
 	if err != nil {
 		logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
 		return "false"
diff --git a/logger/logger.go b/logger/logger.go
index dce391b..0f03970 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -91,8 +91,8 @@
 func Debug(args ...interface{}) {
 	if logFile.level >= DebugLevel {
 		log.SetPrefix(blue(debugPrefix))
-		//_ = log.Output(2, fmt.Sprintln(args...))
-		loggerString += fmt.Sprintln(args...)
+		_ = log.Output(2, fmt.Sprintln(args...))
+		//loggerString += fmt.Sprintln(args...)
 	}
 }
 
@@ -107,24 +107,24 @@
 func Warn(args ...interface{}) {
 	if logFile.level >= WarnLevel {
 		log.SetPrefix(magenta(warnPrefix))
-		//_ = log.Output(2, fmt.Sprintln(args...))
-		loggerString += fmt.Sprintln(args...)
+		_ = log.Output(2, fmt.Sprintln(args...))
+		//loggerString += fmt.Sprintln(args...)
 	}
 }
 
 func Error(args ...interface{}) {
 	if logFile.level >= ErrorLevel {
 		log.SetPrefix(red(errorPrefix))
-		//_ = log.Output(2, fmt.Sprintln(args...))
-		loggerString += fmt.Sprintln(args...)
+		_ = log.Output(2, fmt.Sprintln(args...))
+		//loggerString += fmt.Sprintln(args...)
 	}
 }
 
 func Fatal(args ...interface{}) {
 	if logFile.level >= FatalLevel {
 		log.SetPrefix(red(fatalPrefix))
-		//_ = log.Output(2, fmt.Sprintln(args...))
-		loggerString += fmt.Sprintln(args...)
+		_ = log.Output(2, fmt.Sprintln(args...))
+		//loggerString += fmt.Sprintln(args...)
 	}
 }
 func OutPutByPanlei() {
diff --git a/main.go b/main.go
index 2aedd0a..bd3bb40 100644
--- a/main.go
+++ b/main.go
@@ -7,6 +7,7 @@
 	"net/http"
 	_ "net/http/pprof"
 	"ruleprocess/insertdata"
+	"ruleprocess/labelFilter"
 	"ruleprocess/logger"
 	"ruleprocess/structure"
 	"ruleprocess/util"
@@ -17,6 +18,7 @@
 	"flag"
 	"fmt"
 	"github.com/golang/protobuf/proto"
+	"github.com/spf13/viper"
 	//"gocv.io/x/gocv"
 	//"image"
 	//"image/color"
@@ -24,7 +26,6 @@
 	"ruleprocess/cache"
 	"ruleprocess/ruleserver"
 	"sync"
-	"github.com/spf13/viper"
 )
 
 var dbIp = flag.String("dbIp", "127.0.0.1", "dbserver ip")
@@ -91,7 +92,7 @@
 			} else {
 				//runtime.GOMAXPROCS(runtime.NumCPU())
 				//logger.Debug("浣跨敤鐨刢pu涓暟锛�",runtime.NumCPU())
-				//go func(msg []byte) {
+				go func(msg []byte) {
 					logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
 					arg := structure.SdkDatas{}
 					//paramFormat(msg, &arg)
@@ -106,9 +107,9 @@
 					insertdata.InsertToEs(resultMsg)
 					logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", time.Since(start))
 					//浜嬩欢鎺ㄩ��
-					//go labelFilter.Judge(resultMsg)
-					logger.OutPutByPanlei()
-				//}(msg)
+					go labelFilter.Judge(resultMsg)
+					//logger.OutPutByPanlei()
+				}(msg)
 			}
 		}
 	}
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index ec483a8..3ea7715 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -63,7 +63,7 @@
 			taskGroup = task
 		}
 	}
-	logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId)
+	//logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId)
 	if taskGroup == nil  {
 		return nil
 	} else {
@@ -78,7 +78,7 @@
 func GetPolygons(cameraId string) []protomsg.CameraPolygon {
 	var cameraPolygons []protomsg.CameraPolygon
 	cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
-	logger.Debug("------=======鏌ョ湅涓嬪叏閮ㄥ尯鍩燂細",cameraPolygons)
+	//logger.Debug("------=======鏌ョ湅涓嬪叏閮ㄥ尯鍩燂細",cameraPolygons)
 	return cameraPolygons
 }
 
@@ -89,10 +89,10 @@
 }
 func Decimal(value float32) float64 {
 	value1, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", float64(value)), 64)
-	logger.Info("鍒濇淇濈暀涓や綅鎴恠tr:",value1)
+	//logger.Info("鍒濇淇濈暀涓や綅鎴恠tr:",value1)
 	n10 := math.Pow10(4)
 	value2 := math.Trunc((value1+0.5/n10)*n10) / n10
-	logger.Info("鍒濇淇濈暀涓や綅鎴恠tr::::",value2)
+	//logger.Info("鍒濇淇濈暀涓や綅鎴恠tr::::",value2)
 	return value2
 }
 // 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 6332d81..5be5d66 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -244,7 +244,7 @@
 						}
 					}
 				}
-				logger.Info("face鏍囩鐨勯暱搴︼細",len(faces))
+				//logger.Info("face鏍囩鐨勯暱搴︼細",len(faces))
 				//for _,face := range faces  {
 				//	//logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�擾_______________鐪嬬湅浜鸿劯鐨勫潗鏍�:",face.Location)
 				//}
@@ -339,20 +339,20 @@
 			timeEle = *timeEle1
 		}
 	}
-	for _,ruleRe := range timeEle.RuleResults {
-		logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁----",ruleRe.CameraId,ruleRe.Sort)
-	}
+	//for _,ruleRe := range timeEle.RuleResults {
+	//	logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁----",ruleRe.CameraId,ruleRe.Sort)
+	//}
 	if flag { // 濡傛灉杩樻病鏈夎繖涓畾鏃跺櫒鍏冪礌灏辨柊澧炰竴涓�
 		//timeEle := TimeElement{N: 2, InitN: 2, GroupId: groupRule.GroupId} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
 		//TimeEleList = make(map[string]timeElement)
 		TimeEleList[groupRule.GroupId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互瑙勫垯缁刬d涓洪敭
-		logger.Info("---------------------------------------------鑱斿姩浠诲姟鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
+		//logger.Info("---------------------------------------------鑱斿姩浠诲姟鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
 		// 寰楀嚭杩欑粍瀹屾暣瑙勫垯閲屾秹鍙婂埌鍑犱釜鎽勫儚鏈猴紝鍐冲畾鐫�鏁扮粍閲屾湁鍑犱釜缁撴瀯浣�,鍘婚噸娣诲姞鏂瑰紡
 		for j := 0; j < len(groupRule.Rules); j++ {
 			var flag1 bool = true
-			logger.Info("瑙勫垯缁勪俊鎭細",groupRule.Rules[j].CameraId)
+			//logger.Info("瑙勫垯缁勪俊鎭細",groupRule.Rules[j].CameraId)
 			for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
-				logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁锛�",ruleRes.CameraId,ruleRes.Sort)
+				//logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁锛�",ruleRes.CameraId,ruleRes.Sort)
 				if groupRule.Rules[j].CameraId == ruleRes.CameraId {
 					flag1 = false
 				}
@@ -421,7 +421,7 @@
 						for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
 							label.LinkCache = append(label.LinkCache, ruleRes.CacheData)
 						}
-						logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�", len(label.LinkCache))
+						//logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�", len(label.LinkCache))
 						for i := 0; i < len(args.RuleResult["yolo"].([]structure.Result)); i++ {
 							if args.RuleResult["yolo"].([]structure.Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
 								args.RuleResult["yolo"].([]structure.Result)[i].Others.LinkCache = label.LinkCache
@@ -492,7 +492,7 @@
 					// 鎶婃病鏈夌浉浼艰�呯殑浜鸿劯浠巉ilterData涓垹闄�
 					for index := 0; index < len(am.FilterData); {
 						// 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
-						logger.Info("鐪嬬湅鐩镐技鑰呬汉鏁帮細",len(am.FilterData[index].Liker))
+						//logger.Info("鐪嬬湅鐩镐技鑰呬汉鏁帮細",len(am.FilterData[index].Liker))
 						if len(am.FilterData[index].Liker) == 0 {
 							// Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
 							am.FilterData = append(am.FilterData[:index], am.FilterData[index+1:]...)
@@ -503,7 +503,7 @@
 					if len(am.FilterData) > 0 {
 						flag = "true"
 					}
-					logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�",len(am.FilterData))
+					//logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�",len(am.FilterData))
 					return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
 				}
 			}
@@ -512,7 +512,7 @@
 				if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
 					// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
 					if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
-						logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�",am.TargetNum)
+						//logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�",am.TargetNum)
 						var args []*structure.Arg
 						if rule.RuleWithPre == "&&" {
 							args = am.FilterData
@@ -544,7 +544,7 @@
 							}
 						}
 						am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
-						logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.TargetNum)
+						//logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.TargetNum)
 						if am.TargetNum > 0 {
 							logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
 							return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
@@ -615,14 +615,14 @@
 func duration(rule *protomsg.Rule, groupId string, am *structure.AreaMap, args *structure.SdkDatas, message *protomsg.SdkMessage) {
 	if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�  閰嶇疆鐨勭畻娉曡瀵圭殑涓�
 		if rule.SdkArgAlias == "duration" { //
-			logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
+			//logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
 			// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欐潯瑙勫垯鐨勫畾鏃跺櫒,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
 			rw.Lock()
 			var flag bool = true
 			for k, _ := range TimeEleList {
 				if k == groupId+"+"+rule.Id {
 					flag = false // 鏈夊氨缃负false
-					logger.Info("鏈夎繖涓畾鏃跺櫒锛屼笉鍐嶅垱寤轰簡锛�")
+					//logger.Info("鏈夎繖涓畾鏃跺櫒锛屼笉鍐嶅垱寤轰簡锛�")
 				}
 			}
 
@@ -631,7 +631,7 @@
 				timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: structure.ResultMsg{message, args.RuleResult}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
 				//TimeEleList = make(map[string]timeElement)
 				TimeEleList[groupId+"+"+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
-				logger.Info("鍒涘缓浜嗚鏁板櫒")
+				//logger.Info("鍒涘缓浜嗚鏁板櫒")
 			}
 			rw.Unlock()
 		}

--
Gitblit v1.8.0