From cd60b7e3a0bbc09f4501f66260b5d961d58aaf49 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 十二月 2019 13:38:07 +0800
Subject: [PATCH] ---
---
algorithm/personTrack/personTrack.go | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/algorithm/personTrack/personTrack.go b/algorithm/personTrack/personTrack.go
index d38409d..7be404d 100644
--- a/algorithm/personTrack/personTrack.go
+++ b/algorithm/personTrack/personTrack.go
@@ -106,14 +106,17 @@
}
result := getCompareMsg(b)
if esId == result["esId"].(string) || result["esId"].(string) == ""{ // 璇存槑娌℃瘮鍒扮浉浼肩殑浜�,鏄柊浜�
- logger.Info("娌℃瘮鍒颁汉")
+ logger.Info("娌℃瘮鍒颁汉,鍙互鍏ュ簱",am.CameraId)
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)
+ } else {
+ 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)
+ }
}
}
@@ -175,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())
}
--
Gitblit v1.8.0