From 076255ec1afa83c00c332541528fc906ba93aa5b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 10:14:29 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 9c7863e..77e739f 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -72,6 +72,10 @@
taskGroup = task
}
}
+ logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------")
+ for _,ruleGroup := range taskGroup.GroupRules{
+ logger.Info(ruleGroup.GroupText)
+ }
return taskGroup
}
@@ -175,7 +179,7 @@
for _, baseinfo := range baseinfos {
// 鏍规嵁tableId鏌ヨ搴曞簱淇℃伅缁檒iker璧嬪��
//logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
- var tableIds []string
+ tableIds := []string{}
tableIds = append(tableIds, baseinfo.TableId) // 铏界劧鏄紶鍏ユ暟缁勮繑鍥炴暟缁勭殑鎺ュ彛锛屼絾鎴戞寜鍗曚釜鐨勪娇鐢ㄤ簡
table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
if err != nil || len(table) == 0 {
@@ -231,6 +235,15 @@
if groupRule.Rules[j].PolygonId == areaMap.areaId {
//logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId鍜宎reaMap.args鐨勯暱搴︼細",compareFlag,tableIds,len(areaMap.args))
for _, arg := range areaMap.args {
+ arg.Liker = arg.Liker[0:0]
+ logger.Info("娓呯┖涔嬪悗鐪嬬湅涔嬪墠鎵撶殑浜鸿劯鏍囩鍙樹簡娌★細")
+ if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]FaceResult)) > 0 {
+ for _, faceResult := range args.RuleResult["face"].([]FaceResult) {
+ for _,arg := range faceResult.Args {
+ logger.Info("浜哄憳鍒嗗�兼槸锛�",arg.Score,"liker鐨勬暟閲忎负",arg.Liker)
+ }
+ }
+ }
if compareFlag == 1 {
arg.fillLiker(nil, threshold)
}
@@ -267,12 +280,13 @@
if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
a.targetNum++
- arg1 := Arg{obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*BaseInfo{}}
+ arg1 := Arg{obj.Id,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*BaseInfo{}}
//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
a.args = append(a.args, &arg1)
a.filterData = append(a.filterData, &arg1)
}
}
+ logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.targetNum,"---",len(a.filterData))
a.time = time.Unix(time.Now().Unix(), 0).String()[11:16]
a.keepRight = arg.KeepRight
a.isStatic = arg.IsStatic
--
Gitblit v1.8.0