From eb6f08d1eea2430383ad486eca9d3a509db344bf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 十二月 2019 10:04:21 +0800
Subject: [PATCH] 装配目标
---
algorithm/personTrack/personTrack.go | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/algorithm/personTrack/personTrack.go b/algorithm/personTrack/personTrack.go
index f42406f..1f6f578 100644
--- a/algorithm/personTrack/personTrack.go
+++ b/algorithm/personTrack/personTrack.go
@@ -8,11 +8,11 @@
"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"
@@ -76,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{}
@@ -98,17 +98,16 @@
trackArg["esId"] = esId
trackArg["threshold"] = compareThreshold
trackArg["cameraId"] = am.CameraId
- trackArg["bodyFeature"] = arg.BodyFeature
+ trackArg["bodyFeature"] = arg.Feature
trackArg["faceFeature"] = arg.AttachArg.Feature
- logger.Info("璇锋眰寮犲椋炴瘮瀵规暟鎹弬鏁帮細",trackArg)
b,err := json.Marshal(trackArg)
if err != nil {
logger.Error("json搴忓垪鍖栭敊璇�", err)
}
dataId := getCompareMsg(b)
- if esId == dataId { // 璇存槑娌℃瘮鍒扮浉浼肩殑浜�
+ if esId == dataId || dataId == ""{ // 璇存槑娌℃瘮鍒扮浉浼肩殑浜�
logger.Info("娌℃瘮鍒颁汉")
- arg.Uuid = dataId
+ arg.Uuid = esId
} else {
logger.Info("姣斿鍑烘潵鐨刣ataId:",dataId)
base := structure.BaseInfo{TargetId:dataId}
@@ -123,7 +122,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:]...)
@@ -135,7 +134,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(){
@@ -169,7 +168,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())
}
--
Gitblit v1.8.0