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 | 95 +++++++++++++++++++++++++++++------------------
1 files changed, 59 insertions(+), 36 deletions(-)
diff --git a/algorithm/personTrack/personTrack.go b/algorithm/personTrack/personTrack.go
index b6be24c..1ad3bfe 100644
--- a/algorithm/personTrack/personTrack.go
+++ b/algorithm/personTrack/personTrack.go
@@ -1,4 +1,4 @@
-package personTrack
+package main
import (
"encoding/json"
@@ -8,19 +8,19 @@
"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"
- logger "github.com/alecthomas/log4go"
"basic.com/pubsub/protomsg.git"
"ruleprocess/structure"
)
var sender chan []byte = make(chan []byte)
-var receiver chan string = make(chan string)
-var initFlag bool = false
+var receiver chan map[string]interface{} = make(chan map[string]interface{})
+
var sock mangos.Socket
func Init() {
go Push()
@@ -28,14 +28,12 @@
// 浜轰綋璺熻釜绠楁硶
func Entrance(rule *protomsg.Rule, am *structure.AreaMap, lable *structure.Others, args *structure.SdkDatas, message *protomsg.SdkMessage) structure.LittleRuleResult {
- if !initFlag {
- Init()
- }
+
if rule.PolygonId == am.AreaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
//logger.Debug("---------璧颁簡浜哄憳寮傚父绠楁硶", rule.Id, rule.SdkArgAlias, rule.Operator, rule.SdkArgValue, am.AreaId)
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" || rule.SdkArgAlias == "" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
return filterRule(rule, am)
- } else if rule.SdkArgAlias == "threshold"{
+ } else if rule.SdkArgAlias == "cmpThreshold"{
return track(rule,am)
}
return structure.LittleRuleResult{}
@@ -78,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,31 +96,43 @@
trackArg := make(map[string]interface{})
esId := uuid.NewV4().String()
trackArg["esId"] = esId
+ trackArg["threshold"] = compareThreshold
trackArg["cameraId"] = am.CameraId
trackArg["bodyFeature"] = arg.Feature
trackArg["faceFeature"] = arg.AttachArg.Feature
b,err := json.Marshal(trackArg)
if err != nil {
- _ = logger.Error("json搴忓垪鍖栭敊璇�", err)
+ logger.Error("json搴忓垪鍖栭敊璇�", err)
}
- dataId := getCompareMsg(b)
- if esId == dataId { // 璇存槑娌℃瘮鍒扮浉浼肩殑浜�
- logger.Info("娌℃瘮鍒颁汉")
- arg.Uuid = dataId
+ 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{
- var threshold float32 = 70 // 榛樿闃堝�间负70
+ 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)
//if len(arg.Liker) == 0 {
// // 濡傛灉娌℃湁鐩镐技鑰呭垯鍒犻櫎鏈洰鏍囨暟鎹�
// am.FilterData = append(am.FilterData[:i],am.FilterData[i+1:]...)
@@ -134,47 +144,60 @@
// 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(){
var err error
var msg []byte
-
+ logger.Info("杩借釜璇锋眰閫氶亾寤虹珛")
if sock, err = req.NewSocket(); err != nil {
- _ = logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
+ logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
}
- errSize := sock.SetOption(mangos.OptionMaxRecvSize,5*1024*1024)
+ errSize := sock.SetOption(mangos.OptionMaxRecvSize,20*1024*1024)
if errSize != nil {
- _ = logger.Error("Failed set MaxRecvSize: %v", err)
+ logger.Error("Failed set MaxRecvSize: %v", err)
+ }
+ errTimeOut := sock.SetOption(mangos.OptionRecvDeadline,time.Millisecond * 1500)
+ if errTimeOut != nil {
+ logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
+ return
+ }
+ errTimeOut1 := sock.SetOption(mangos.OptionSendDeadline,time.Millisecond * 1500)
+ if errTimeOut1 != nil {
+ logger.Error("鍙戦�佽秴鏃�")
+ return
}
//sock.AddTransport(ipc.NewTransport())
sock.AddTransport(tcp.NewTransport())
serverIP, _ := GetLocalIP()
- if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
- _ = logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+ if err = sock.Dial("tcp://"+serverIP+":4012"); err != nil {
+ logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
}
- logger.Info("搴忓垪鍖栨暟鎹�")
- initFlag = true
+
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())
+ logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
}
if msg, err = sock.Recv(); err != nil {
- _ = logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
+ 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