From d69768180b26730ee88d978608031ed6386f3580 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 05 十一月 2019 19:30:18 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index e1283c3..eb4fe23 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -3,7 +3,8 @@
import (
"basic.com/pubsub/protomsg.git"
"github.com/golang/protobuf/proto"
- "ruleprocess/logger"
+ "basic.com/valib/logger.git"
+ "ruleprocess/structure"
)
var TrackPond = make(map[string]*PersonTrack)
@@ -49,7 +50,7 @@
}
// 杩借釜浜轰綋锛屾鏌ユ暟閲忔槸鍚︿竴鑷�
-func BodyIsSame(msg *protomsg.SdkMessage) bool{
+func BodyIsSame(args *structure.SdkDatas,msg *protomsg.SdkMessage) bool{
logger.Debug("+++++++++++++++++++++浜轰綋杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "Yolo" {
@@ -72,12 +73,14 @@
logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
}
if yoloParam.Infos != nil && TrackPond[msg.Cid] != nil && yoloNum == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
- //yoloParam.Infos = (yoloParam.Infos)[0:0]
- //sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
- //if err != nil {
- // logger.Error("yolo搴忓垪鍖栭敊璇�", err)
- //}
- logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
+ yoloParam.Infos = (yoloParam.Infos)[0:0]
+ sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
+ if err != nil {
+ logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ }
+ delete(args.RuleResult,"yolo")
+ logger.Info("娓呴櫎yolo鏍囩锛�",args.RuleResult["yolo"])
+ logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁锛屼汉浣撹拷韪粨鏉�")
return true
} else {
if TrackPond[msg.Cid] != nil {
@@ -87,6 +90,7 @@
logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
+ logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
return false
}
} else {
@@ -104,8 +108,8 @@
return false
}
func TrackOrNot(label map[string]interface{}) bool{
- if label["yolo"] != nil && len(label["yolo"].([]Result)) > 0 {
- for _,res := range label["yolo"].([]Result) {
+ if label["yolo"] != nil && len(label["yolo"].([]structure.Result)) > 0 {
+ for _,res := range label["yolo"].([]structure.Result) {
if res.TimeLabel == "10" {
return true
}
--
Gitblit v1.8.0