From 54c923158d991c0db54307cef60a96ed0b7ac410 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 30 十一月 2019 14:14:51 +0800
Subject: [PATCH] 削减日志
---
algorithm/middleware/middleware.go | 20 ++--
algorithm/intrusion/intrusion.go | 8 +-
ruleserver/ruleToformula.go | 2
algorithm/static/static.go | 16 ++--
ruleserver/attachInfo.go | 2
ruleserver/personTrack.go | 46 +++++-----
ruleserver/readyDataForRule.go | 6
algorithm/personUnsual/personUnsual.go | 6
labelFilter/req.go | 12 +-
algorithm/faceCompare/faceCompare.go | 16 ++--
insertdata/insertDataToEs.go | 6
algorithm/face/face.go | 16 ++--
algorithm/car/plate.go | 22 ++--
labelFilter/readyDataForLabel.go | 4
labelFilter/ruleForLabel.go | 14 +-
15 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/algorithm/car/plate.go b/algorithm/car/plate.go
index c97c08d..11ed45e 100644
--- a/algorithm/car/plate.go
+++ b/algorithm/car/plate.go
@@ -49,34 +49,34 @@
switch rule.SdkArgAlias {
case "fVDConf":
formula = strconv.FormatFloat(arg.Score, 'f', -1, 32) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁締缃俊搴﹀皬鍏紡锛�", formula)
+ //logger.Info("杞﹁締缃俊搴﹀皬鍏紡锛�", formula)
case "nVehicleColor1":
formula = strconv.Itoa(int(arg.Car.NVehicleColor1)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁韩涓婚鑹插皬鍏紡锛�", formula)
+ //logger.Info("杞﹁韩涓婚鑹插皬鍏紡锛�", formula)
case "nVehicleColor2":
formula = strconv.Itoa(int(arg.Car.NVehicleColor2)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁韩杈呴鑹插皬鍏紡锛�", formula)
+ //logger.Info("杞﹁韩杈呴鑹插皬鍏紡锛�", formula)
case "fConfidence":
formula = arg.Car.VehicleType1 + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁締绫诲瀷灏忓叕寮忥細", formula)
+ //logger.Info("杞﹁締绫诲瀷灏忓叕寮忥細", formula)
case "nVehicleBright":
formula = strconv.Itoa(int(arg.Car.NVehicleBright)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁締浜害灏忓叕寮忥細", formula)
+ //logger.Info("杞﹁締浜害灏忓叕寮忥細", formula)
case "nPlateFlag":
formula = strconv.Itoa(int(arg.Car.NPlateFlag)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("璇嗗埆鍒拌溅鐗屽皬鍏紡锛�", formula)
+ //logger.Info("璇嗗埆鍒拌溅鐗屽皬鍏紡锛�", formula)
case "license":
formula = arg.Car.License + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝鍙风爜灏忓叕寮忥細", formula)
+ //logger.Info("杞︾墝鍙风爜灏忓叕寮忥細", formula)
case "nConfidence":
formula = strconv.Itoa(int(arg.Car.NConfidence)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝鍙俊搴﹀皬鍏紡锛�", formula)
+ //logger.Info("杞︾墝鍙俊搴﹀皬鍏紡锛�", formula)
case "nColor":
formula = strconv.Itoa(int(arg.Car.NColor)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝棰滆壊灏忓叕寮忥細", formula)
+ //logger.Info("杞︾墝棰滆壊灏忓叕寮忥細", formula)
case "nType":
formula = strconv.Itoa(int(arg.Car.NType)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝绫诲瀷灏忓叕寮忥細", formula)
+ //logger.Info("杞︾墝绫诲瀷灏忓叕寮忥細", formula)
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -112,7 +112,7 @@
//args := am.targetNum targetNum 宸叉垚鎵�鏈夌洰鏍囩殑鎬绘暟閲忥紝杩欓噷鍙畻yolo鐨�
var num int = len(am.FilterData)
formula := strconv.Itoa(num) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁締鏁伴噺鍏紡",formula)
+ //logger.Info("杞﹁締鏁伴噺鍏紡",formula)
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
diff --git a/algorithm/face/face.go b/algorithm/face/face.go
index 30ed387..d064d14 100644
--- a/algorithm/face/face.go
+++ b/algorithm/face/face.go
@@ -29,7 +29,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:]...)
@@ -40,7 +40,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}
}
}
@@ -49,7 +49,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
@@ -67,13 +67,13 @@
switch rule.SdkArgAlias {
case "score":
formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
+ //logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
case "proportion":
formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鍗犳瘮鍏紡锛�", formula)
+ //logger.Info("鍗犳瘮鍏紡锛�", formula)
case "size":
formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("灏哄灏忓叕寮忥細", formula)
+ //logger.Info("灏哄灏忓叕寮忥細", formula)
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -82,9 +82,9 @@
}
}
am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
- logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.TargetNum)
+ //logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.TargetNum)
if am.TargetNum > 0 {
- logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
+ //logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
} else {
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
diff --git a/algorithm/faceCompare/faceCompare.go b/algorithm/faceCompare/faceCompare.go
index 613af37..2ca92f8 100644
--- a/algorithm/faceCompare/faceCompare.go
+++ b/algorithm/faceCompare/faceCompare.go
@@ -30,7 +30,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:]...)
@@ -41,7 +41,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}
}
}
@@ -50,7 +50,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
@@ -68,13 +68,13 @@
switch rule.SdkArgAlias {
case "score":
formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
+ //logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
case "proportion":
formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鍗犳瘮鍏紡锛�", formula)
+ //logger.Info("鍗犳瘮鍏紡锛�", formula)
case "size":
formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("灏哄灏忓叕寮忥細", formula)
+ //logger.Info("灏哄灏忓叕寮忥細", formula)
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -83,9 +83,9 @@
}
}
am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
- logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.TargetNum)
+ //logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.TargetNum)
if am.TargetNum > 0 {
- logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
+ //logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
} else {
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
diff --git a/algorithm/intrusion/intrusion.go b/algorithm/intrusion/intrusion.go
index 1ac2143..05a71ca 100644
--- a/algorithm/intrusion/intrusion.go
+++ b/algorithm/intrusion/intrusion.go
@@ -21,7 +21,7 @@
func filterRule(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- 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
@@ -36,13 +36,13 @@
switch rule.SdkArgAlias {
case "score":
formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
+ //logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
case "proportion":
formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鍗犳瘮鍏紡锛�", formula)
+ //logger.Info("鍗犳瘮鍏紡锛�", formula)
case "size":
formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("灏哄灏忓叕寮忥細", formula)
+ //logger.Info("灏哄灏忓叕寮忥細", formula)
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index 802c9e3..282e069 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -37,11 +37,11 @@
sdkName := sdk.SdkName
//logger.Info("瑙勫垯鐨刬pcId涓巗dkData鐨処pcId:", ipcId, "===", sdkData.IpcId)
if ipcId == sdkData.IpcId {
- logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
+ //logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
for _, areaMap := range sdkData.AreaMapList {
ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
if ruleResult.Result != "" {
- logger.Info("鏉′欢瑙勫垯缁撴灉锛�", ruleResult.Result)
+ //logger.Info("鏉′欢瑙勫垯缁撴灉锛�", ruleResult.Result)
// 濡傛灉缁撴灉涓虹湡锛屾妸杩欐潯瑙勫垯涓殑鍖哄煙缃负鏈夋晥
if strings.Contains(ruleResult.Result, "true") {
areaMap.IsEffective = true
@@ -77,7 +77,7 @@
for _, areaMap := range sdkData.AreaMapList {
ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
if ruleResult.Result != "" {
- logger.Info("浜鸿劯姣斿瑙勫垯缁撴灉锛�", ruleResult.Result)
+ //logger.Info("浜鸿劯姣斿瑙勫垯缁撴灉锛�", ruleResult.Result)
// 濡傛灉缁撴灉涓虹湡锛屾妸杩欐潯瑙勫垯涓殑鍖哄煙缃负鏈夋晥
if strings.Contains(ruleResult.Result, "true") {
areaMap.IsEffective = true
@@ -109,11 +109,11 @@
sdkName := sdk.SdkName
//logger.Info("瑙勫垯鐨刬pcId涓巗dkData鐨処pcId:", ipcId, "===", sdkData.IpcId)
if ipcId == sdkData.IpcId {
- logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
+ //logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
for _, areaMap := range sdkData.AreaMapList {
ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
if ruleResult.Result != "" {
- logger.Info("涓綋闈欐缁撴灉锛�", ruleResult.Result)
+ //logger.Info("涓綋闈欐缁撴灉锛�", ruleResult.Result)
// 濡傛灉缁撴灉涓虹湡锛屾妸杩欐潯瑙勫垯涓殑鍖哄煙缃负鏈夋晥
if strings.Contains(ruleResult.Result, "true") {
areaMap.IsEffective = true
@@ -145,11 +145,11 @@
sdkName := sdk.SdkName
//logger.Info("瑙勫垯鐨刬pcId涓巗dkData鐨処pcId:", ipcId, "===", sdkData.IpcId)
if ipcId == sdkData.IpcId {
- logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
+ //logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
for _, areaMap := range sdkData.AreaMapList {
ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
if ruleResult.Result != "" {
- logger.Info("杞︾墝缁撴灉锛�", ruleResult.Result)
+ //logger.Info("杞︾墝缁撴灉锛�", ruleResult.Result)
// 濡傛灉缁撴灉涓虹湡锛屾妸杩欐潯瑙勫垯涓殑鍖哄煙缃负鏈夋晥
if strings.Contains(ruleResult.Result, "true") {
areaMap.IsEffective = true
@@ -186,7 +186,7 @@
if strings.Contains(ruleResult.Result, "true") {
areaMap.IsEffective = true
}
- logger.Info("鏁伴噺瑙勫垯缁撴灉锛�", ruleResult.Result)
+ //logger.Info("鏁伴噺瑙勫垯缁撴灉锛�", ruleResult.Result)
if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
sdkNames = sdkName + " "
}
@@ -216,7 +216,7 @@
if strings.Contains(ruleResult.Result, "true") {
areaMap.IsEffective = true
}
- logger.Info("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
+ //logger.Info("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
sdkNames = sdkName + " "
}
@@ -348,7 +348,7 @@
if err1 != nil {
panic("娌℃湁鎵惧埌鍏ュ彛鍑芥暟")
}
- logger.Info("鍙戠粰so鐨勬暟鎹細",sdkId,rule.SdkArgValue,rule.Operator,rule.SdkArgAlias)
+ //logger.Info("鍙戠粰so鐨勬暟鎹細",sdkId,rule.SdkArgValue,rule.Operator,rule.SdkArgAlias)
ruleResult := f.(func(rule *protomsg.Rule, am *structure.AreaMap,lable *structure.Others, args *structure.SdkDatas,message *protomsg.SdkMessage)structure.LittleRuleResult)(rule,am,lable,args,message)
return ruleResult
}
diff --git a/algorithm/personUnsual/personUnsual.go b/algorithm/personUnsual/personUnsual.go
index a6775d9..30d9e8c 100644
--- a/algorithm/personUnsual/personUnsual.go
+++ b/algorithm/personUnsual/personUnsual.go
@@ -42,13 +42,13 @@
switch rule.SdkArgAlias {
case "score":
formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
+ //logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
case "proportion":
formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鍗犳瘮鍏紡锛�", formula)
+ //logger.Info("鍗犳瘮鍏紡锛�", formula)
case "size":
formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("灏哄灏忓叕寮忥細", formula)
+ //logger.Info("灏哄灏忓叕寮忥細", formula)
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index 764372f..b808afd 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -45,13 +45,13 @@
var formula string
if rule.SdkArgAlias == "score" {
formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
- logger.Info("褰撳墠鐩镐技搴﹀皬鍏紡锛�", formula)
+ //logger.Info("褰撳墠鐩镐技搴﹀皬鍏紡锛�", formula)
} else if rule.SdkArgAlias == "proportion" {
formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
- logger.Info("褰撳墠鍗犳瘮灏忓叕寮忥細", formula)
+ //logger.Info("褰撳墠鍗犳瘮灏忓叕寮忥細", formula)
} else {
formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
- logger.Info("褰撳墠灏哄灏忓叕寮忥細", formula)
+ //logger.Info("褰撳墠灏哄灏忓叕寮忥細", formula)
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -103,7 +103,7 @@
logger.Error("涓綋闈欐瑙勫垯鏈夎", err)
}
}()
- logger.Info("璧颁簡涓綋闈欐鏍稿績绠楁硶")
+ //logger.Info("璧颁簡涓綋闈欐鏍稿績绠楁硶")
initN := 5
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a977" && rule.SdkArgAlias == "duration" {
if init,err := strconv.Atoi(rule.SdkArgValue); err != nil {
@@ -123,7 +123,7 @@
m["target"] = append(m["target"].([]structure.Result), structure.Result{args.TaskId, "", "", true, 0, "", am.FilterData, am.AreaJson, false,*lable})
if structure.StaticMap[am.AreaId] == nil || len(structure.StaticMap[am.AreaId].Targets) == 0 {
- logger.Info("涔嬪墠鏃犵紦瀛樺苟涓旀娆″尯鍩熷唴鏈変汉")
+ //logger.Info("涔嬪墠鏃犵紦瀛樺苟涓旀娆″尯鍩熷唴鏈変汉")
objs := []*structure.Obj{}
for _, tar := range am.FilterData {
@@ -133,7 +133,7 @@
structure.StaticMap[am.AreaId] = &structure.CameraArea{objs}
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
} else {
- logger.Info("涔嬪墠鏈夌紦瀛�")
+ //logger.Info("涔嬪墠鏈夌紦瀛�")
flag := "false"
// 浠ヤ箣鍓嶉潤姝㈢殑瀵硅薄涓轰富鍒ゆ柇鏄惁闈欐
tars := []*structure.Arg{}
@@ -146,7 +146,7 @@
if singleResult {
flag = "true"
tars = append(tars,arg)
- logger.Info("闈欐鐨勭洰鏍囷細",arg.Id,arg.Location,arg.Score)
+ //logger.Info("闈欐鐨勭洰鏍囷細",arg.Id,arg.Location,arg.Score)
}
}
@@ -185,7 +185,7 @@
// 鍒ゆ柇涓�涓洰鏍囨槸鍚﹂潤姝簡鎸囧畾鏃堕棿
func SingleStatic(person *structure.Obj, am *structure.AreaMap,lable *structure.Others, argValue float64) (bool,*structure.Arg){
- logger.Info("鍗曚釜鐩爣鐨勫垽鏂細")
+ //logger.Info("鍗曚釜鐩爣鐨勫垽鏂細")
flag := false
var o *structure.Arg = nil
for _, obj := range am.FilterData {
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 83633e0..0825a05 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -165,7 +165,7 @@
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
alarmRules := []AlarmRule{}
- logger.Info("寰幆姣忎竴涓洰鏍�")
+ //logger.Info("寰幆姣忎竴涓洰鏍�")
for _, faceResult := range face.rules {
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState, ""})
@@ -204,7 +204,7 @@
case "plate":
sdkname = "杞︾墝璇嗗埆"
}
- logger.Info("浜鸿劯鐩爣target:",targetInfos)
+ //logger.Info("浜鸿劯鐩爣target:",targetInfos)
pervideo := PerVideoPicture{
face.Uuid,
msg.Cid,
@@ -324,7 +324,7 @@
linkInfo = "鑱斿姩浠诲姟"
}
alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, linkInfo})
- logger.Info("鎵撳嵃浠诲姟鍚嶇О锛�", )
+ //logger.Info("鎵撳嵃浠诲姟鍚嶇О锛�", )
// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
if yoloResult.Others.CacheData != nil {
//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 09cacef..e102273 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -29,7 +29,7 @@
}
}
if flag1{ // 鏈夊彲鎺ㄩ�佺殑鏁版嵁
- logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
+ //logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
label.CameraId = result.Cid
camera, err := cache.GetCameraById(result.Cid)
if err != nil {
@@ -52,6 +52,6 @@
}
}
}
- logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
+ //logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
}
}
\ No newline at end of file
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 37dfd90..f97352f 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -62,7 +62,7 @@
var api dbapi.EventPushApi
b, allRules := api.FindAllDetails()
- logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
+ //logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
if !b {
logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
}
@@ -72,7 +72,7 @@
// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
if urlPool[url.Url] == nil {
urlPool[url.Url] = make(chan []byte,100)
- logger.Info("鍒濆鍖栦俊鎭細",urlPool)
+ //logger.Info("鍒濆鍖栦俊鎭細",urlPool)
go GoPush(url.Url)
}
}
@@ -128,7 +128,7 @@
// ch = v.ch
// }
//}
- logger.Info("chan淇℃伅锛�",urlPool[url])
+ //logger.Info("chan淇℃伅锛�",urlPool[url])
for {
select {
// case <-ctx.Done():
@@ -137,12 +137,12 @@
//logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
//bytes,err1 := proto.Marshal(data)
go func(data []byte) {
- logger.Info("鏁版嵁闀垮害涓猴細",len(data))
+ //logger.Info("鏁版嵁闀垮害涓猴細",len(data))
//if err1 != nil {
// logger.Info("搴忓垪鍖栧け璐ワ細",err1)
//}
start := time.Now()
- logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
+ //logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
//bytes := []byte("ndfasojdfaidsos")
if err = sock.Send(data); err != nil {
Die("groutine"+url+"鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
@@ -152,7 +152,7 @@
if err != nil {
Die("groutine"+url+"鎺ユ敹鍝嶅簲澶辫触: ", err.Error(),pushTime,time.Since(start))
} else {
- logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg),pushTime,time.Since(start))
+ //logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg),pushTime,time.Since(start))
}
}(data)
default:
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index c5483a4..4dbeb73 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -266,10 +266,10 @@
func defenceJudge(label *Label, rule *protomsg.EventPushRule) string {
if rule.RuleValue == "all" { // 甯冮槻绛夌骇涓哄叏閮ㄦ椂鍙湁鏈夊竷闃茬瓑绾у嵆涓洪�氳繃
if len(label.DefenceLevel) > 0 {
- logger.Info("绗﹀悎甯冮槻绛夌骇瑙勫垯锛屽竷闃茬瓑绾т负鍏ㄩ儴")
+ //logger.Info("绗﹀悎甯冮槻绛夌骇瑙勫垯锛屽竷闃茬瓑绾т负鍏ㄩ儴")
return "true"
} else {
- logger.Info("涓嶇鍚堝竷闃茬瓑绾ц鍒�")
+ //logger.Info("涓嶇鍚堝竷闃茬瓑绾ц鍒�")
return "false"
}
} else {
@@ -287,11 +287,11 @@
//return "false"
}
if result.(bool) {
- logger.Info("绗﹀悎甯冮槻绛夌骇瑙勫垯!")
+ //logger.Info("绗﹀悎甯冮槻绛夌骇瑙勫垯!")
return "true"
}
}
- logger.Info("涓嶇鍚堝竷闃茬瓑绾ц鍒�")
+ //logger.Info("涓嶇鍚堝竷闃茬瓑绾ц鍒�")
return "false"
}
}
@@ -311,17 +311,17 @@
return "false"
}
if result.(bool) {
- logger.Info("绗﹀悎浠诲姟瑙勫垯!")
+ //logger.Info("绗﹀悎浠诲姟瑙勫垯!")
return "true"
}
- logger.Info("涓嶇鍚堜换鍔¤鍒�")
+ //logger.Info("涓嶇鍚堜换鍔¤鍒�")
return "false"
}
// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
for _, url := range urls {
- logger.Debug("鎺ㄩ�佸湴鍧�锛�",url.Url)
+ //logger.Debug("鎺ㄩ�佸湴鍧�锛�",url.Url)
bytes,err1 := proto.Marshal(data)
if err1 != nil {
logger.Info("搴忓垪鍖栧け璐ワ細",err1)
diff --git a/ruleserver/attachInfo.go b/ruleserver/attachInfo.go
index 250b7db..8e17990 100644
--- a/ruleserver/attachInfo.go
+++ b/ruleserver/attachInfo.go
@@ -13,7 +13,7 @@
if err != nil {
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
- logger.Info("localConfig淇℃伅锛�",localConfig)
+ //logger.Info("localConfig淇℃伅锛�",localConfig)
push.ServerId = localConfig.ServerId
push.ServerName = localConfig.ServerName
serverIp, err := GetLocalIP()
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 96f716e..3e3c77d 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -38,11 +38,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].Faces = nil
lock.Unlock()
@@ -50,7 +50,7 @@
lock.Lock()
TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
lock.Unlock()
- logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
+ //logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
}
logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖")
continue
@@ -91,15 +91,15 @@
logger.Error("yolo搴忓垪鍖栭敊璇�", err)
}
delete(args.RuleResult,"yolo")
- logger.Info("娓呴櫎yolo鏍囩锛�",args.RuleResult["yolo"])
- logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁锛屼汉浣撹拷韪粨鏉�")
+ //logger.Info("娓呴櫎yolo鏍囩锛�",args.RuleResult["yolo"])
+ //logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁锛屼汉浣撹拷韪粨鏉�")
return true
} else {
if TrackPond[msg.Cid] != nil {
- logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ //logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid].Yolo = yoloNum
} else {
- logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ //logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
return false
@@ -133,19 +133,19 @@
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) {
if TrackPond[cameraId] != nil {
- logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Faces))
- for _, face := range TrackPond[cameraId].Faces {
- logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�", face.Id, face.Score)
- }
+ //logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Faces))
+ //for _, face := range TrackPond[cameraId].Faces {
+ // logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�", face.Id, face.Score)
+ //}
faceParam := protomsg.ParamFacePos{}
err := proto.Unmarshal(sdkinfor.Sdkdata, &faceParam)
if err != nil {
logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
}
- logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
- for _, face := range faceParam.Faces {
- logger.Info("鏂版潵鐨勭殑face鏁版嵁锛�", face.Pos.FaceID, face.Pos.FAngle.Confidence)
- }
+ //logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
+ //for _, face := range faceParam.Faces {
+ // logger.Info("鏂版潵鐨勭殑face鏁版嵁锛�", face.Pos.FaceID, face.Pos.FAngle.Confidence)
+ //}
var facesTemp []protomsg.ResultFaceDetect
for _, face := range faceParam.Faces {
facesTemp = append(facesTemp, *face) // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
@@ -156,13 +156,13 @@
if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿浣庯紝鏄鎶涘純鐨勬暟鎹�
faceFlag = true
//return "true"
- logger.Info("鍒嗗�间负锛�", faceParam.Faces[i].Pos.FAngle.Confidence, "--缂撳瓨鐨勫垎鍊间负锛�", val.Score, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿浣庯紝鏄琚姏寮冪殑鏁版嵁")
+ //logger.Info("鍒嗗�间负锛�", faceParam.Faces[i].Pos.FAngle.Confidence, "--缂撳瓨鐨勫垎鍊间负锛�", val.Score, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿浣庯紝鏄琚姏寮冪殑鏁版嵁")
faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
break
}
if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence > val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿楂橈紝鏇存柊缂撳瓨
faceFlag = true
- logger.Info("鍒嗗�肩敱", val.Score, "鏇存柊涓猴細", faceParam.Faces[i].Pos.FAngle.Confidence, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿楂橈紝鏄琚紶閫掍笅鍘荤殑鏁版嵁")
+ //logger.Info("鍒嗗�肩敱", val.Score, "鏇存柊涓猴細", faceParam.Faces[i].Pos.FAngle.Confidence, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿楂橈紝鏄琚紶閫掍笅鍘荤殑鏁版嵁")
lock.Lock()
val.Score = faceParam.Faces[i].Pos.FAngle.Confidence
lock.Unlock()
@@ -174,11 +174,11 @@
i++
}
}
- logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
- logger.Info("涓存椂瀛樺偍鐨勬柊鏉ユ暟鎹細")
- for _, temp := range facesTemp {
- logger.Info("涓存椂瀛樺偍鐨勬柊鏉ョ殑鐨刦ace鏁版嵁锛�", temp.Pos.FaceID, temp.Pos.FAngle.Confidence)
- }
+ //logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
+ //logger.Info("涓存椂瀛樺偍鐨勬柊鏉ユ暟鎹細")
+ //for _, temp := range facesTemp {
+ // logger.Info("涓存椂瀛樺偍鐨勬柊鏉ョ殑鐨刦ace鏁版嵁锛�", temp.Pos.FaceID, temp.Pos.FAngle.Confidence)
+ //}
sdkinfor.Sdkdata, err = proto.Marshal(&faceParam)
if err != nil {
logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
@@ -195,7 +195,7 @@
i++
} else {
// 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
- logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
+ //logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
lock.Lock()
TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
lock.Unlock()
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 9cda8b2..88a5510 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -157,7 +157,7 @@
if err != nil || len(table) == 0 {
logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�", err, "--杩斿洖鍊奸暱搴︿负锛�", len(table))
}
- logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�", Decimal(m[baseinfo.Id].CompareScore))
+ //logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�", Decimal(m[baseinfo.Id].CompareScore))
base := structure.BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id].CompareScore), TargetId: baseinfo.Id, TargetName: baseinfo.PersonName, TargetPicUrl: baseinfo.PersonPicUrl, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved,DbLabel: baseinfo.PhoneNum+"/"+baseinfo.Sex+"/"+baseinfo.IdCard,}
//os.Exit(1)
arg.Liker = append(arg.Liker, &base)
@@ -196,12 +196,12 @@
logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
return
}
- logger.Debug("=====閰嶇疆鐨勯槇鍊间负锛�", threshold)
+ //logger.Debug("=====閰嶇疆鐨勯槇鍊间负锛�", threshold)
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
- logger.Info("============================================杩涜浜鸿劯瀵规瘮")
+ //logger.Info("============================================杩涜浜鸿劯瀵规瘮")
for _, areaMap := range sdkData.AreaMapList {
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
if groupRule.Rules[j].PolygonId == areaMap.AreaId {
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 535e161..24ff335 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -467,7 +467,7 @@
timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: structure.ResultMsg{message, m}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
//TimeEleList = make(map[string]timeElement)
TimeEleList[groupId+"+"+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
- logger.Info("鍒涘缓浜嗚鏁板櫒")
+ //logger.Info("鍒涘缓浜嗚鏁板櫒")
//cacheId = groupId+"+"+rule.Id
}
rw.Unlock()
--
Gitblit v1.8.0