From 720d703e336ed1a04a3595e001abdf026bca88f3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 09:39:42 +0800
Subject: [PATCH] label重大更新
---
main.go | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/main.go b/main.go
index a3ca701..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,7 +85,7 @@
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
- logger.Info("++++++++++++++++++++++++++++++鐪嬬湅鏄惁閲嶅锛�",rcobj)
+ //logger.Info("++++++++++++++++++++++++++++++鏀跺埌鐨剏olo鐨勫尯鍩熷潗鏍囷細",rcobj)
rect := ruleserver.Rect{}
rect.X = float64(rcobj.Left)
rect.Y = float64(rcobj.Top)
@@ -107,8 +108,9 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
+
// 鍏堣繘琛屼竴涓嬭拷韪�
- ruleserver.IsSame(&m)
+ ruleserver.FaceIsSame(&m)
args.CameraId = m.Cid
args.TaskId = m.Tasklab.Taskid
// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
--
Gitblit v1.8.0