From 371eec6fc2618458e037affaf646ff83e6887e63 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 30 十一月 2019 15:44:59 +0800
Subject: [PATCH] 再削减日志

---
 algorithm/faceCompare/faceCompare.go   |    3 
 ruleserver/ruleToformula.go            |   26 ++++----
 algorithm/face/face.go                 |    3 
 algorithm/static/static.go             |   10 +-
 main.go                                |   18 ++---
 algorithm/car/plate.go                 |   15 ++--
 ruleserver/personTrack.go              |   30 +++++-----
 ruleserver/readyDataForRule.go         |    6 +-
 ruleserver/timeTicker.go               |    7 +-
 algorithm/personUnsual/personUnsual.go |    3 
 10 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/algorithm/car/plate.go b/algorithm/car/plate.go
index 11ed45e..dff8c3a 100644
--- a/algorithm/car/plate.go
+++ b/algorithm/car/plate.go
@@ -1,11 +1,10 @@
 package main
 
 import (
-"basic.com/pubsub/protomsg.git"
-logger "github.com/alecthomas/log4go"
-"github.com/knetic/govaluate"
-"ruleprocess/structure"
-"strconv"
+	"basic.com/pubsub/protomsg.git"
+	"github.com/knetic/govaluate"
+	"ruleprocess/structure"
+	"strconv"
 )
 
 // 杞︾墝绠楁硶
@@ -13,10 +12,10 @@
 func Entrance(rule *protomsg.Rule, am *structure.AreaMap,lable *structure.Others,args *structure.SdkDatas,message *protomsg.SdkMessage) structure.LittleRuleResult {
 	if rule.PolygonId == am.AreaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
 		if rule.SdkArgAlias != "nCarCount" {
-			logger.Info("杩囨护杞︾墝淇℃伅")
+			//logger.Info("杩囨护杞︾墝淇℃伅")
 			return filterRule(rule, am)
 		} else {
-			logger.Info("璁＄畻杞︾墝杞﹁締鏁伴噺") // 鐩墠鍙兘妫�娴嬪嚭杞︾墝鏁伴噺
+			//logger.Info("璁＄畻杞︾墝杞﹁締鏁伴噺") // 鐩墠鍙兘妫�娴嬪嚭杞︾墝鏁伴噺
 			return transferParameters(rule, am)
 		}
 	} else {
@@ -34,7 +33,7 @@
 		rule.SdkArgAlias == "fVDConf" || rule.SdkArgAlias == "nVehicleColor2" ||  rule.SdkArgAlias == "nColor" || rule.SdkArgAlias == "nPlateFlag"
 
 	if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" || carFlag{ // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
-		logger.Debug("---------璧颁簡杞︾墝璇嗗埆杩囨护绠楁硶",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
+		//logger.Debug("---------璧颁簡杞︾墝璇嗗埆杩囨护绠楁硶",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
 		var args []*structure.Arg
 		if rule.RuleWithPre == "&&" {
 			args = am.FilterData
diff --git a/algorithm/face/face.go b/algorithm/face/face.go
index d064d14..7a121a1 100644
--- a/algorithm/face/face.go
+++ b/algorithm/face/face.go
@@ -2,14 +2,13 @@
 
 import (
 	"basic.com/pubsub/protomsg.git"
-	logger "github.com/alecthomas/log4go"
 	"github.com/knetic/govaluate"
 	"ruleprocess/structure"
 	"strconv"
 )
 // 浜鸿劯绠楁硶
 func Entrance(rule *protomsg.Rule, am *structure.AreaMap,lable *structure.Others,args *structure.SdkDatas,message *protomsg.SdkMessage) structure.LittleRuleResult {
-	logger.Debug("---------璧颁簡浜鸿劯妫�娴嬬畻娉�",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
+	//logger.Debug("---------璧颁簡浜鸿劯妫�娴嬬畻娉�",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
 	return filterRule(rule,am)
 }
 
diff --git a/algorithm/faceCompare/faceCompare.go b/algorithm/faceCompare/faceCompare.go
index 2ca92f8..f5a9d2f 100644
--- a/algorithm/faceCompare/faceCompare.go
+++ b/algorithm/faceCompare/faceCompare.go
@@ -2,14 +2,13 @@
 
 import (
 	"basic.com/pubsub/protomsg.git"
-	logger "github.com/alecthomas/log4go"
 	"github.com/knetic/govaluate"
 	"ruleprocess/structure"
 	"strconv"
 )
 // 浜鸿劯绠楁硶
 func Entrance(rule *protomsg.Rule, am *structure.AreaMap,lable *structure.Others,args *structure.SdkDatas,message *protomsg.SdkMessage) structure.LittleRuleResult {
-	logger.Debug("---------璧颁簡浜鸿劯姣斿绠楁硶",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
+	//logger.Debug("---------璧颁簡浜鸿劯姣斿绠楁硶",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
 	return filterRule1(rule,am)
 }
 
diff --git a/algorithm/personUnsual/personUnsual.go b/algorithm/personUnsual/personUnsual.go
index 30d9e8c..9288fc0 100644
--- a/algorithm/personUnsual/personUnsual.go
+++ b/algorithm/personUnsual/personUnsual.go
@@ -2,7 +2,6 @@
 
 import (
 	"basic.com/pubsub/protomsg.git"
-	logger "github.com/alecthomas/log4go"
 	"github.com/knetic/govaluate"
 	"ruleprocess/structure"
 	"strconv"
@@ -11,7 +10,7 @@
 // 浜哄憳寮傚父绠楁硶
 func Entrance(rule *protomsg.Rule, am *structure.AreaMap, lable *structure.Others, args *structure.SdkDatas, message *protomsg.SdkMessage) structure.LittleRuleResult {
 	if rule.PolygonId == am.AreaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
-		logger.Debug("---------璧颁簡浜哄憳寮傚父绠楁硶", rule.Id, rule.SdkArgAlias, rule.Operator, rule.SdkArgValue, am.AreaId)
+		//logger.Debug("---------璧颁簡浜哄憳寮傚父绠楁硶", rule.Id, rule.SdkArgAlias, rule.Operator, rule.SdkArgValue, am.AreaId)
 		if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" || rule.SdkArgAlias == "" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
 			return filterRule(rule, am)
 		} else if rule.SdkArgAlias == "objCount" {
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index b808afd..08d09da 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -218,10 +218,10 @@
 	rw.Lock()
 
 		if result { // 缁撴灉涓虹湡
-			for k, tar := range structure.StaticMap[areaId].Targets {
+			for _, tar := range structure.StaticMap[areaId].Targets {
 				if tar.Id == person.Id {
 					if tar.N == 0 && tar.AlarmFlag {
-						logger.Debug("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
+						//logger.Debug("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
 						flagTime = "11"
 						o.TimeLable = flagTime
 						o.CacheData = tar.CacheSdkData
@@ -237,7 +237,7 @@
 						flagTime = "00"
 						// 鏈夊畾鏃跺櫒浣嗕笉涓�0鎶婂凡鎵撶殑鏍囩鍒犻櫎
 						// args.RuleResult = nil
-						logger.Debug("------------------------缁撴灉涓虹湡浣嗚鏁板櫒涓嶅埌0锛屼笉鎶ヨ,姝ゆ椂鐨勮鏁板櫒", k, "鐨勫�间负锛�", tar.N)
+						//logger.Debug("------------------------缁撴灉涓虹湡浣嗚鏁板櫒涓嶅埌0锛屼笉鎶ヨ,姝ゆ椂鐨勮鏁板櫒", k, "鐨勫�间负锛�", tar.N)
 					}
 				}
 			}
@@ -246,7 +246,7 @@
 				if tar.Id == person.Id {
 					if tar.AlarmFlag {
 						if tar.BufferFlag == 0 {
-							logger.Debug("------------------------------鏉�姝昏鏁板櫒锛屾姤璀︽甯х姸鎬佹敼鍙樼殑鏁版嵁锛屾鏃剁殑璁℃暟鍣ㄧ殑鍊间负", tar.N)
+							//logger.Debug("------------------------------鏉�姝昏鏁板櫒锛屾姤璀︽甯х姸鎬佹敼鍙樼殑鏁版嵁锛屾鏃剁殑璁℃暟鍣ㄧ殑鍊间负", tar.N)
 							flagTime = "12"
 							structure.StaticMap[areaId].Targets = append(structure.StaticMap[areaId].Targets[:index],structure.StaticMap[areaId].Targets[index+1:]...)
 						} else {
@@ -256,7 +256,7 @@
 							}
 						}
 					} else {
-						logger.Debug("-----------缁撴灉涓哄亣涓斾笉鍒�0锛屾潃姝诲畾鏃跺櫒")
+						//logger.Debug("-----------缁撴灉涓哄亣涓斾笉鍒�0锛屾潃姝诲畾鏃跺櫒")
 						structure.StaticMap[areaId].Targets = append(structure.StaticMap[areaId].Targets[:index],structure.StaticMap[areaId].Targets[index+1:]...)
 					}
 				}
diff --git a/main.go b/main.go
index 1c80c31..f8a44a5 100644
--- a/main.go
+++ b/main.go
@@ -10,8 +10,6 @@
 	"ruleprocess/insertdata"
 	"ruleprocess/labelFilter"
 	"ruleprocess/structure"
-	"time"
-
 	//"basic.com/valib/logger.git"
 	"flag"
 	"fmt"
@@ -86,29 +84,29 @@
 			msg, err = c.Recv()
 			//msgChan <- msg
 			if err != nil {
-				logger.Info("recv error : ", err)
+				//logger.Info("recv error : ", err)
 				fmt.Println("recv error : ", err)
 				continue
 			} else {
 
 				//go func(msg []byte) {
-					logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
+					//logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
 					//logger.Warn(time.Now().Format("2006-01-02 15:04:05"))
 					arg := structure.SdkDatas{}
 					//paramFormat(msg, &arg)
-					start := time.Now()
+					//start := time.Now()
 					m := CallParamFormat(msg, &arg)
 					// 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
 					ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
 					// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
 					resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
 					ruleserver.GetAttachInfo(resultMsg.SdkMessage)
-					ruleEnd := time.Since(start)
-					logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", ruleEnd)
+					//ruleEnd := time.Since(start)
+					//logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", ruleEnd)
 					// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
 					insertdata.InsertToEs(resultMsg)
-					esEnd := time.Since(start)
-					logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", esEnd)
+					//esEnd := time.Since(start)
+					//logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", esEnd)
 					//浜嬩欢鎺ㄩ��
 					labelFilter.PushSomthing(resultMsg)
 				//}(msg)
@@ -118,7 +116,7 @@
 }
 
 func CallParamFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage{
-	logger.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
+	//logger.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
 	p,err :=  plugin.Open("./algorithm/middleware.so")
 	if err != nil {
 		panic(err)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 3e3c77d..3eedb50 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -30,7 +30,7 @@
 
 // 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
 func FaceIsSame(msg *protomsg.SdkMessage) {
-	logger.Debug("+++++++++++++++++++++浜鸿劯杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+	//logger.Debug("+++++++++++++++++++++浜鸿劯杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
 	for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
 		if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
 			if len(sdkinfo.Sdkdata) > 1 {
@@ -58,12 +58,12 @@
 			}
 		}
 	}
-	logger.Debug("--------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
+	//logger.Debug("--------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
 }
 
 //  杩借釜浜轰綋锛屾鏌ユ暟閲忔槸鍚︿竴鑷�
 func BodyIsSame(args *structure.SdkDatas,msg *protomsg.SdkMessage) bool{
-	logger.Debug("+++++++++++++++++++++浜轰綋杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+	//logger.Debug("+++++++++++++++++++++浜轰綋杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
 	for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
 		if sdkinfo.Sdktype == "Yolo" {
 			if len(sdkinfo.Sdkdata) > 1 {
@@ -79,11 +79,11 @@
 						yoloNum++
 					}
 				}
-				if TrackPond[msg.Cid] != nil {
-					logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Yolo)
-				} else {
-					logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
-				}
+				//if TrackPond[msg.Cid] != nil {
+				//	logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Yolo)
+				//} else {
+				//	logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
+				//}
 				if yoloParam.Infos != nil && TrackPond[msg.Cid] != nil && yoloNum == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
 					yoloParam.Infos = (yoloParam.Infos)[0:0]
 					sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
@@ -115,7 +115,7 @@
 			}
 		}
 	}
-	logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
+	//logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
 	return false
 }
 
@@ -210,7 +210,7 @@
 
 // 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
 func CarIsSame(msg *protomsg.SdkMessage) {
-	logger.Debug("+++++++++++++++++++++杞﹁締杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+	//logger.Debug("+++++++++++++++++++++杞﹁締杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
 	for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
 		if sdkinfo.Sdktype == "Plate" { // 浜鸿劯妫�娴�
 			if len(sdkinfo.Sdkdata) > 1 {
@@ -218,11 +218,11 @@
 				FaceIsInPond(msg.Cid, sdkinfo)
 			} else {
 				if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚
-					logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�,姝ゆ椂鐨刵um鍊间负锛�", num)
+					//logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�,姝ゆ椂鐨刵um鍊间负锛�", num)
 					num--
 				} else {
 					if TrackPond[msg.Cid] != nil {
-						logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
+						//logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
 						lock.Lock()
 						TrackPond[msg.Cid].Cars = nil
 						lock.Unlock()
@@ -230,15 +230,15 @@
 						lock.Lock()
 						TrackPond[msg.Cid] = &PersonTrack{Cars: nil}
 						lock.Unlock()
-						logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
+						//logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
 					}
-					logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁杞﹁締锛岃閲嶇疆涓虹┖")
+					//logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁杞﹁締锛岃閲嶇疆涓虹┖")
 					continue
 				}
 			}
 		}
 	}
-	logger.Debug("--------------------------------杞﹁締杩借釜缁撴潫--------------------------------------")
+	//logger.Debug("--------------------------------杞﹁締杩借釜缁撴潫--------------------------------------")
 }
 
 
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 88a5510..46420b7 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -184,7 +184,7 @@
 			if groupRule.Rules[j].SdkArgAlias == "cmpThreshold" {
 				v2, err := strconv.ParseFloat(groupRule.Rules[j].SdkArgValue, 32)
 				if err != nil {
-					logger.Error("string杞琭loat32澶辫触锛�")
+					//logger.Error("string杞琭loat32澶辫触锛�")
 				}
 				threshold = float32(v2)
 			}
@@ -193,7 +193,7 @@
 	// 涓轰簡娴嬭瘯浣滀笅寮婏紝鐩存帴璁╁叾姣斿鍏ㄩ儴搴曞簱
 	//compareFlag = 1
 	if compareFlag == 0 {
-		logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
+		//logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
 		return
 	}
 	//logger.Debug("=====閰嶇疆鐨勯槇鍊间负锛�", threshold)
@@ -252,7 +252,7 @@
 			a.FilterData = append(a.FilterData, &arg1)
 		}
 	}
-	logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.TargetNum,"---",len(a.FilterData))
+	//logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.TargetNum,"---",len(a.FilterData))
 	a.Time = time.Unix(time.Now().Unix(), 0).String()[11:16]
 	//logger.Println("--------------------鐪嬬湅鍖哄煙鏁版嵁锛�",*a)
 }
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 24ff335..f200c2b 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -160,7 +160,7 @@
 			//for _,face := range faces  {
 			//	//logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�擾_______________鐪嬬湅浜鸿劯鐨勫潗鏍�:",face.Location)
 			//}
-			logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
+			//logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
 			// 鎶婁粬浠殑浣嶇疆鏁版嵁涔熶紶涓嬪幓
 			yolos := []*structure.Arg{}
 			for _, sdkData := range args.Sdkdata {
@@ -172,7 +172,7 @@
 					}
 				}
 			}
-			logger.Debug("------locations鐨勫唴瀹癸細", yolos)
+			//logger.Debug("------locations鐨勫唴瀹癸細", yolos)
 			// 澶勭悊鐩爣瀹氭椂鏁版嵁
 			targets := []*structure.Arg{}
 			for _, sdkData := range args.Sdkdata {
@@ -187,7 +187,7 @@
 			// 杞﹁締鐩爣缁熻
 			cars := []*structure.Arg{}
 			for _, sdkData := range args.Sdkdata {
-				logger.Info("鐪嬬湅sdkNames",sdkNames)
+				//logger.Info("鐪嬬湅sdkNames",sdkNames)
 				if sdkData.IpcId == "91d923ef-6200-4549-ab1b-8e773e85d729" { // 鎶婅溅鐗屾暟鎹殑鍚勪釜鐩爣鐨勫潗鏍囪緭鍑烘柟渚垮悗闈㈢敾妗�
 					for _, areaMap := range sdkData.AreaMapList {
 						if areaMap.IsEffective {
@@ -202,7 +202,7 @@
 			} else {
 				islink = false
 			}
-			logger.Info("瑙﹀彂鐨勫尯鍩焛d锛�",polygonId)
+			//logger.Info("瑙﹀彂鐨勫尯鍩焛d锛�",polygonId)
 			var labelTypes []int // 0涓簓olo鏍囩锛�1涓篺ace鏍囩 2涓轰袱鑰呮爣绛�
 			if sdkNames != "" && len(targets) == 0 {
 				args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, yolos, polygonId, islink,label})
@@ -211,17 +211,17 @@
 			}
 			if faceFlag {
 				args.RuleResult["face"] = append(args.RuleResult["face"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, faces, polygonId, islink,label})
-				logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]structure.Result)))
+				//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]structure.Result)))
 				labelTypes = append(labelTypes,1)
 			}
 			if len(targets) > 0 {
 				args.RuleResult["target"] = append(args.RuleResult["target"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, targets, polygonId, islink,label})
-				logger.Info("-------------------鐩爣鎸佺画缁撴灉鏍囩", len(args.RuleResult["target"].([]structure.Result)))
+				//logger.Info("-------------------鐩爣鎸佺画缁撴灉鏍囩", len(args.RuleResult["target"].([]structure.Result)))
 				//labelTypes = append(labelTypes,2)
 			}
 			if len(cars) > 0 {
 				args.RuleResult["plate"] = append(args.RuleResult["plate"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, cars, polygonId, islink,label})
-				logger.Info("-------------------杞︾墝缁撴灉鏍囩", len(args.RuleResult["plate"].([]structure.Result)))
+				//logger.Info("-------------------杞︾墝缁撴灉鏍囩", len(args.RuleResult["plate"].([]structure.Result)))
 				//labelTypes = append(labelTypes,2)
 			}
 			// 缁欐寔缁椂闂寸殑绗竴寮犺祴浜堢紦瀛樻暟鎹紙閬嶅巻澶嶅埗锛�
@@ -255,7 +255,7 @@
 		// 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏉�姝诲畾鏃跺櫒鐨勬搷浣�
 		TimerAlarm(&label, groupRule.GroupId, result)
 		//fmt.Println(timeFlag)
-		logger.Info("涓嶇鍚堣鍒�")
+		//logger.Info("涓嶇鍚堣鍒�")
 		return false,[]int{}
 	}
 }
@@ -354,7 +354,7 @@
 					}
 				}
 				va.CacheData = structure.ResultMsg{message, tempMap}
-				logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
+				//logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
 			}
 		}
 		// 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
@@ -374,12 +374,12 @@
 			for _, va := range timeEle.RuleResults {
 				completeFormula = completeFormula + va.RuleWithPre + "" + va.Result
 			}
-			logger.Info("---------------------------鑱斿姩浠诲姟鐨勫叕寮�", completeFormula)
+			//logger.Info("---------------------------鑱斿姩浠诲姟鐨勫叕寮�", completeFormula)
 			if completeFormula != "" {
 				expression, _ := govaluate.NewEvaluableExpression(completeFormula)
 				result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
 				if result.(bool) {
-					logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
+					//logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
 					rw.RLock()
 					if TimeEleList[groupRule.GroupId] != nil {  // 鏋佸伓灏旀湁鎯呭喌浼氱瓑浜巒il锛屼笉鐭ラ亾涓哄暐锛屽仛涓垽鏂互闃插畷鏈�
 						// 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
@@ -403,7 +403,7 @@
 				}
 			}
 		} else {
-			logger.Warn("鏁扮粍涓嶅渾婊′笉鎵撴爣绛�")
+			//logger.Warn("鏁扮粍涓嶅渾婊′笉鎵撴爣绛�")
 			// 鍊掓槸鎶婃墦鐨勭粍瑙勫垯鏍囩缁欏幓鎺変簡鍟�
 			for _,val := range labelTypes {
 				if val == 0 {
@@ -432,7 +432,7 @@
 		for k, _ := range TimeEleList {
 			if k == groupRule.GroupId {
 				delete(TimeEleList, k)
-				logger.Debug("鍥犱负瀹氭椂鍣ㄧ殑涓�甯ф暟鎹粨鏋滀负false锛屽共鎺夊畾鏃跺櫒")
+				//logger.Debug("鍥犱负瀹氭椂鍣ㄧ殑涓�甯ф暟鎹粨鏋滀负false锛屽共鎺夊畾鏃跺櫒")
 			}
 		}
 		rw.Unlock()
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index 5828a5a..030e31c 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -1,7 +1,6 @@
 package ruleserver
 
 import (
-	"fmt"
 	logger "github.com/alecthomas/log4go"
 	"ruleprocess/structure"
 	"strings"
@@ -39,15 +38,15 @@
 	for {
 		select {
 		case <-ticker.C:
-			logger.Info("瀹氭椂鍣ㄦ墽琛屽崟鍏�", time.Now().Unix())
-			fmt.Println("瀹氭椂鍣ㄦ墽琛屽崟鍏�", time.Now().Unix())
+			//logger.Info("瀹氭椂鍣ㄦ墽琛屽崟鍏�", time.Now().Unix())
+			//fmt.Println("瀹氭椂鍣ㄦ墽琛屽崟鍏�", time.Now().Unix())
 			// 姣忕閽熻鏁板櫒姹犲瓙閲屾墍鏈夌殑璁℃暟鍣ㄥ厓绱犻兘鍑忎竴锛屽噺鍒�0鐨勬槸璇ユ姤璀︾殑
 			// 鍥剧墖瀹氭椂鍣ㄧ郴鍒�
 			rw.Lock()
 			for k, timeEle := range TimeEleList {
 				if timeEle.N > 0 {
 					timeEle.N = timeEle.N - 1
-					logger.Debug("-------------------------------------鎵撳嵃瀹氭椂鍣ㄨ鏁板厓绱犲綋鍓嶅��-----------------------------------------锛�", timeEle.N)
+					//logger.Debug("-------------------------------------鎵撳嵃瀹氭椂鍣ㄨ鏁板厓绱犲綋鍓嶅��-----------------------------------------锛�", timeEle.N)
 				}
 				if timeEle.GroupId != "" && timeEle.N == 0 {
 					// 璇存槑鏄仈鍔ㄤ换鍔＄殑鏃堕棿绐楀彛 鍒扮偣鍎夸簡璇ラ攢姣佷簡,鍐嶆潵浜嗗啀鍒涘缓

--
Gitblit v1.8.0