From 443cd5949d9ea884dfdc692c11f1dfbb9c7eb787 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 13 十二月 2019 18:16:06 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 3e3c77d..6e8bb9a 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -3,7 +3,7 @@
import (
"basic.com/pubsub/protomsg.git"
"github.com/golang/protobuf/proto"
- logger "github.com/alecthomas/log4go"
+ "basic.com/valib/logger.git"
"ruleprocess/structure"
"sync"
)
@@ -30,7 +30,7 @@
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
func FaceIsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++浜鸿劯杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+ //logger.Debug("+++++++++++++++++++++浜鸿劯杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
if len(sdkinfo.Sdkdata) > 1 {
@@ -58,12 +58,12 @@
}
}
}
- logger.Debug("--------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
+ //logger.Debug("--------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
}
// 杩借釜浜轰綋锛屾鏌ユ暟閲忔槸鍚︿竴鑷�
func BodyIsSame(args *structure.SdkDatas,msg *protomsg.SdkMessage) bool{
- logger.Debug("+++++++++++++++++++++浜轰綋杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+ //logger.Debug("+++++++++++++++++++++浜轰綋杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "Yolo" {
if len(sdkinfo.Sdkdata) > 1 {
@@ -79,11 +79,11 @@
yoloNum++
}
}
- if TrackPond[msg.Cid] != nil {
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Yolo)
- } else {
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
- }
+ //if TrackPond[msg.Cid] != nil {
+ // logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Yolo)
+ //} else {
+ // 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)
@@ -115,7 +115,7 @@
}
}
}
- logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
+ //logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
return false
}
@@ -210,7 +210,7 @@
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
func CarIsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++杞﹁締杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+ //logger.Debug("+++++++++++++++++++++杞﹁締杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "Plate" { // 浜鸿劯妫�娴�
if len(sdkinfo.Sdkdata) > 1 {
@@ -218,11 +218,11 @@
FaceIsInPond(msg.Cid, sdkinfo)
} else {
if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚
- logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�,姝ゆ椂鐨刵um鍊间负锛�", num)
+ //logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�,姝ゆ椂鐨刵um鍊间负锛�", num)
num--
} else {
if TrackPond[msg.Cid] != nil {
- logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
+ //logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
lock.Lock()
TrackPond[msg.Cid].Cars = nil
lock.Unlock()
@@ -230,15 +230,15 @@
lock.Lock()
TrackPond[msg.Cid] = &PersonTrack{Cars: nil}
lock.Unlock()
- logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
+ //logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
}
- logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁杞﹁締锛岃閲嶇疆涓虹┖")
+ //logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁杞﹁締锛岃閲嶇疆涓虹┖")
continue
}
}
}
}
- logger.Debug("--------------------------------杞﹁締杩借釜缁撴潫--------------------------------------")
+ //logger.Debug("--------------------------------杞﹁締杩借釜缁撴潫--------------------------------------")
}
--
Gitblit v1.8.0