From 5b6c78545cbb565380aa9b1f68bc26e747314206 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 十二月 2019 10:48:36 +0800
Subject: [PATCH] 过滤目标’
---
algorithm/personTrack/personTrack.go | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/algorithm/personTrack/personTrack.go b/algorithm/personTrack/personTrack.go
index 1c7510e..6c3cb86 100644
--- a/algorithm/personTrack/personTrack.go
+++ b/algorithm/personTrack/personTrack.go
@@ -1,7 +1,6 @@
package main
import (
- "encoding/base64"
"encoding/json"
"errors"
uuid "github.com/satori/go.uuid"
@@ -9,18 +8,18 @@
"strconv"
"time"
+ "basic.com/valib/logger.git"
+ "github.com/knetic/govaluate"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/tcp"
- "github.com/knetic/govaluate"
- "basic.com/valib/logger.git"
"basic.com/pubsub/protomsg.git"
"ruleprocess/structure"
)
var sender chan []byte = make(chan []byte)
-var receiver chan string = make(chan string)
+var receiver chan map[string]interface{} = make(chan map[string]interface{})
var sock mangos.Socket
func Init() {
@@ -77,16 +76,16 @@
}
am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
if am.TargetNum > 0 {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort,am.FilterData}
} else {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort,am.FilterData}
}
} else if rule.SdkArgAlias == "" {
if am.TargetNum > 0 {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort,am.FilterData}
} else {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort,am.FilterData}
}
}
return structure.LittleRuleResult{}
@@ -99,20 +98,21 @@
trackArg["esId"] = esId
trackArg["threshold"] = compareThreshold
trackArg["cameraId"] = am.CameraId
- trackArg["bodyFeature"] = arg.BodyFeature
- trackArg["faceFeature"] = base64.StdEncoding.EncodeToString(arg.AttachArg.Feature)
- logger.Info("璇锋眰寮犲椋炴瘮瀵规暟鎹弬鏁帮細",trackArg)
+ trackArg["bodyFeature"] = arg.Feature
+ trackArg["faceFeature"] = arg.AttachArg.Feature
b,err := json.Marshal(trackArg)
if err != nil {
logger.Error("json搴忓垪鍖栭敊璇�", err)
}
- dataId := getCompareMsg(b)
- if esId == dataId { // 璇存槑娌℃瘮鍒扮浉浼肩殑浜�
+ result := getCompareMsg(b)
+ if esId == result["esId"].(string) || result["esId"].(string) == ""{ // 璇存槑娌℃瘮鍒扮浉浼肩殑浜�,鏄柊浜�
logger.Info("娌℃瘮鍒颁汉")
- arg.Uuid = dataId
- } else {
- logger.Info("姣斿鍑烘潵鐨刣ataId:",dataId)
- base := structure.BaseInfo{TargetId:dataId}
+ arg.Uuid = esId
+ } else if result["esId"].(string) != esId && result["compare"].(bool){ // 姣斿埌浜嗙浉浼肩殑浜轰笖鍦ㄦ鎽勫儚鏈轰笅宸茬粡鍑虹幇杩囷紝鏈�鍚庝笉鑳芥彃鍏ユ暟鎹簱
+ logger.Info("姣斿鍑烘潵鐨刣ataId:",result["esId"].(string))
+ arg.Uuid = ""
+ } else if result["esId"].(string) != esId && !result["compare"].(bool) { // 姣斿埌浜嗙浉浼肩殑浜轰絾鍦ㄦ鎽勫儚鏈轰笅鏈嚭鐜拌繃锛岃鎻掑叆鏁版嵁搴�
+ base := structure.BaseInfo{TargetId:result["esId"].(string)}
arg.Liker = append(arg.Liker, &base)
}
}
@@ -124,7 +124,7 @@
}
for _, arg := range am.FilterData {
fillLiker(threshold,arg,am)
- logger.Info("姣斿畬涔嬪悗鐨勬暟鎹拷韪暟鎹槸锛�",arg)
+ //logger.Info("姣斿畬涔嬪悗鐨勬暟鎹拷韪暟鎹槸锛�",arg)
//if len(arg.Liker) == 0 {
// // 濡傛灉娌℃湁鐩镐技鑰呭垯鍒犻櫎鏈洰鏍囨暟鎹�
// am.FilterData = append(am.FilterData[:i],am.FilterData[i+1:]...)
@@ -136,7 +136,7 @@
// return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
//}
// 鏃犺鏈夋病鏈夌浉浼艰�呴兘瑕佽繑鍥瀟rue
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort,nil}
}
func Push(){
@@ -170,7 +170,9 @@
for {
select {
case data := <- sender:
- logger.Debug("鎺ㄩ�佹暟鎹�:",len(data))
+ //trackMap := make(map[string]interface{})
+ //_ = json.Unmarshal(data, &trackMap)
+ //logger.Info("璇锋眰寮犲椋炴瘮瀵规暟鎹弬鏁�:",trackMap)
if err = sock.Send(data); err != nil {
logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
}
@@ -178,14 +180,16 @@
logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
}
logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
- receiver <- string(msg)
+ recive := make(map[string]interface{})
+ _ = json.Unmarshal(msg,&recive)
+ receiver <- recive
default:
time.Sleep(time.Millisecond * 10)
}
}
}
-func getCompareMsg(data []byte) string{
+func getCompareMsg(data []byte) map[string]interface{}{
sender <- data
return <- receiver
}
--
Gitblit v1.8.0