From c2a4aae4da14e432f6545bfa2a985a8042859f6d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 31 七月 2019 15:37:10 +0800
Subject: [PATCH] 联动任务缓存数据(结构重整)---指针换成值
---
main.go | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/main.go b/main.go
index 9b69499..8276e02 100644
--- a/main.go
+++ b/main.go
@@ -4,20 +4,21 @@
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
+ "ruleprocess/insertdata"
+ "ruleprocess/util"
+
//"bufio"
//"bytes"
"flag"
"fmt"
- "ruleprocess/logger"
"github.com/golang/protobuf/proto"
+ "ruleprocess/logger"
//"gocv.io/x/gocv"
//"image"
//"image/color"
//"os"
"ruleprocess/cache"
"ruleprocess/ruleserver"
- "ruleprocess/util"
- "ruleprocess/insertdata"
"sync"
)
var dbIp = flag.String("dbIp","127.0.0.1","dbserver ip")
@@ -68,13 +69,13 @@
continue
} else {
arg := ruleserver.SdkDatas{}
+ //paramFormat(msg, &arg)
m := paramFormat(msg, &arg)
- //logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
ruleserver.Judge(&arg,&m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
//logger.Info("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
-
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
insertdata.InsertToEs(resultMag)
}
@@ -84,6 +85,7 @@
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
+ //logger.Info("++++++++++++++++++++++++++++++鏀跺埌鐨剏olo鐨勫尯鍩熷潗鏍囷細",rcobj)
rect := ruleserver.Rect{}
rect.X = float64(rcobj.Left)
rect.Y = float64(rcobj.Top)
@@ -106,8 +108,9 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
+
// 鍏堣繘琛屼竴涓嬭拷韪�
- ruleserver.IsSame(&m)
+ ruleserver.FaceIsSame(&m)
args.CameraId = m.Cid
args.TaskId = m.Tasklab.Taskid
// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
@@ -135,6 +138,7 @@
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
arg.KeepRight = false
arg.IsStatic = false
+ logger.Info("-----杩借釜涔嬪悗sdkinfo.Sdkdata鐨勯暱搴︿负锛�----",len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
yoloParam := protomsg.ParamYoloObj{}
--
Gitblit v1.8.0