From b2a7c4aec7f2441fc545ada6cbd7d2a771331043 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 十二月 2019 12:45:18 +0800
Subject: [PATCH] ---
---
algorithm/personTrack/personTrack.go | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/algorithm/personTrack/personTrack.go b/algorithm/personTrack/personTrack.go
index 0003b3b..1ad3bfe 100644
--- a/algorithm/personTrack/personTrack.go
+++ b/algorithm/personTrack/personTrack.go
@@ -19,7 +19,7 @@
)
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() {
@@ -104,25 +104,35 @@
if err != nil {
logger.Error("json搴忓垪鍖栭敊璇�", err)
}
- dataId := getCompareMsg(b)
- if esId == dataId { // 璇存槑娌℃瘮鍒扮浉浼肩殑浜�
- logger.Info("娌℃瘮鍒颁汉")
+ result := getCompareMsg(b)
+ if esId == result["esId"].(string) || result["esId"].(string) == ""{ // 璇存槑娌℃瘮鍒扮浉浼肩殑浜�,鏄柊浜�
+ logger.Info("娌℃瘮鍒颁汉,鍙互鍏ュ簱",am.CameraId)
arg.Uuid = esId
} else {
- logger.Info("姣斿鍑烘潵鐨刣ataId:",dataId)
- base := structure.BaseInfo{TargetId:dataId}
- arg.Liker = append(arg.Liker, &base)
+ if result["isHave"].(bool){ // 姣斿埌浜嗙浉浼肩殑浜轰笖鍦ㄦ鎽勫儚鏈轰笅宸茬粡鍑虹幇杩囷紝鏈�鍚庝笉鑳芥彃鍏ユ暟鎹簱
+ logger.Info("涓嶈鍏ュ簱鐨勬暟鎹�",am.CameraId)
+ arg.Uuid = ""
+ } else { // 姣斿埌浜嗙浉浼肩殑浜轰絾鍦ㄦ鎽勫儚鏈轰笅鏈嚭鐜拌繃锛岃鎻掑叆鏁版嵁搴�
+ logger.Info("鍑嗗鍏ュ簱鐨勬暟鎹�",am.CameraId)
+ base := structure.BaseInfo{TargetId:result["esId"].(string)}
+ arg.Liker = append(arg.Liker, &base)
+ }
}
}
func track (rule *protomsg.Rule,am *structure.AreaMap) structure.LittleRuleResult{
+ defer func() {
+ if err := recover();err != nil {
+ logger.Error("杩借釜鍒ゆ柇澶辫触",err)
+ }
+ }()
var threshold float32 = 60 // 榛樿闃堝�间负70
if th,err := strconv.ParseFloat(rule.SdkArgValue,32); err == nil {
threshold = float32(th)
}
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:]...)
@@ -168,9 +178,9 @@
for {
select {
case data := <- sender:
- trackMap := make(map[string]interface{})
- _ = json.Unmarshal(data, &trackMap)
- logger.Info("璇锋眰寮犲椋炴瘮瀵规暟鎹弬鏁�:",trackMap)
+ //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 +188,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