From eb4dcf58beb8d42580f1e371591dcddb3e433da9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 13:51:28 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 7 +++++--
ruleserver/ruleToformula.go | 3 ++-
main.go | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 9884a1a..9a54e1c 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -100,7 +100,7 @@
func InsertToEs(msg ruleserver.ResultMsg) {
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
- logger.Info("------------------------------------浠庨厤缃枃浠惰鍙栫殑鍊硷細",weedfsUrl)
+ //logger.Info("------------------------------------浠庨厤缃枃浠惰鍙栫殑鍊硷細",weedfsUrl)
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
@@ -187,7 +187,10 @@
return
}
- err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+ err1 := EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+ if err1 != nil {
+ logger.Error("涓婁紶ES鍑洪敊锛�---",err1)
+ }
//logger.Info(err.Error())
} else {
// 浜鸿劯鎻愬彇
diff --git a/main.go b/main.go
index 3661898..80b6ce4 100644
--- a/main.go
+++ b/main.go
@@ -77,7 +77,7 @@
} else {
arg := ruleserver.SdkDatas{}
m := paramFormat(msg, &arg)
- logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ //logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
ruleserver.Judge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 26e0430..32adbb3 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -185,6 +185,7 @@
// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
+ logger.Info("--------鐪嬬湅瑙ｆ瀽鍑烘潵鐨勬暟鎹�---",*arg)
for _, polygon := range cameraPolygons {
//logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
@@ -486,7 +487,7 @@
// }
for _, obj := range arg.Photo {
- logger.Info("------------------鐪嬬湅sdkData:", arg.SdkName, "鐨凱hoto鏁版嵁----------------", obj, "----椤轰究鐪嬬湅鍗犳瘮-----锛�", PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale))
+ //logger.Info("------------------鐪嬬湅sdkData:", arg.SdkName, "鐨凱hoto鏁版嵁----------------", obj, "----椤轰究鐪嬬湅鍗犳瘮-----锛�", PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale))
if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
a.targetNum++
--
Gitblit v1.8.0