From 8c8cda516514867b0840207066a34d3a1bec3858 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 16:08:19 +0800
Subject: [PATCH] 联动任务---
---
ruleserver/readyDataForRule.go | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index a641688..c5a65df 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -51,7 +51,7 @@
}
logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�", localConfig, serverIp, serverPort)
bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
- Push1()
+ go Push1()
}
var sender chan *protomsg.CompareArgs = make(chan *protomsg.CompareArgs)
@@ -82,10 +82,14 @@
}
}
logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId)
- for _,ruleGroup := range taskGroup.GroupRules{
- logger.Info(ruleGroup.GroupText)
+ if taskGroup == nil {
+ return nil
+ } else {
+ for _,ruleGroup := range taskGroup.GroupRules{
+ logger.Info(ruleGroup.GroupText)
+ }
+ return taskGroup
}
- return taskGroup
}
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
@@ -293,7 +297,7 @@
func (a *AreaMap) CountAreaObjs(arg *SdkData) {
a.targetNum = 0
- threshold := 0.0 // 鐩镐技搴�
+ threshold := 0.5 // 鐩镐技搴�
intersectionper := 0.2 // 鍗犳瘮
size := 0.0 // 灏哄
@@ -386,13 +390,12 @@
if errSize != nil {
logger.Error("Failed set MaxRecvSize: %v", err)
}
+ //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())
}
- //sock.AddTransport(ipc.NewTransport())
- sock.AddTransport(tcp.NewTransport())
-
logger.Info("搴忓垪鍖栨暟鎹�")
for {
--
Gitblit v1.8.0