From 3636b4af3021e6f8b866d8cc38b990a48ccefeca Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 20:22:27 +0800
Subject: [PATCH] 测试比对进程
---
main.go | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/main.go b/main.go
index 48edb76..e0294ae 100644
--- a/main.go
+++ b/main.go
@@ -5,8 +5,8 @@
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
"ruleprocess/insertdata"
- "ruleprocess/labelFilter"
"ruleprocess/util"
+ "time"
//"bufio"
//"bytes"
@@ -71,15 +71,19 @@
} else {
arg := ruleserver.SdkDatas{}
//paramFormat(msg, &arg)
+ logger.Error()
+ start := time.Now()
m := paramFormat(msg, &arg)
// 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
ruleserver.Judge(&arg,&m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMsg := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
+ logger.Debug("姣斿瀹屾墍鐢ㄦ椂闂达細",time.Since(start))
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
insertdata.InsertToEs(resultMsg)
+ logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細",time.Since(start))
//浜嬩欢鎺ㄩ��
- labelFilter.Judge(resultMsg)
+ //go labelFilter.Judge(resultMsg)
}
}
}
@@ -111,7 +115,6 @@
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
- logger.Info("鎺ュ埌鏁版嵁锛屾憚鍍忔満涓猴細",m.Cid)
// 鍏堣繘琛屼竴涓嬭拷韪�
//ruleserver.FaceIsSame(&m)
args.CameraId = m.Cid
@@ -123,6 +126,7 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
+ logger.Info("鎺ュ埌鏁版嵁锛屾憚鍍忔満涓猴細",m.Cid,"鍥剧墖鐨刬d涓猴細",i.Id)
//logger.Info("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
@@ -130,12 +134,12 @@
arg.TaskId = m.Tasklab.Taskid
arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = true
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
+ //bdata, err := util.UnCompress(m.Data)
+ //if err != nil {
+ // panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ //}
+ //i := protomsg.Image{}
+ //err = proto.Unmarshal(bdata, &i)
arg.ImageWidth = int(i.Width)
arg.ImageHeight = int(i.Height)
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
@@ -171,12 +175,12 @@
arg.TaskId = m.Tasklab.Taskid
arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = false
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
+ //bdata, err := util.UnCompress(m.Data)
+ //if err != nil {
+ // panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ //}
+ //i := protomsg.Image{}
+ //err = proto.Unmarshal(bdata, &i)
arg.ImageWidth = int(i.Width)
arg.ImageHeight = int(i.Height)
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
--
Gitblit v1.8.0