From bc2b97eafce90ba3356d34fe06302ac01b74cb30 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 05 七月 2019 11:58:36 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index d50c5c3..4fe05b4 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -3,10 +3,9 @@
import (
"encoding/json"
"errors"
- "fmt"
- "log"
"net"
"ruleprocess/cache"
+ "ruleprocess/logger"
"strings"
"time"
@@ -99,7 +98,7 @@
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
- log.Println("寰�ES鎻掍汉鑴告暟鎹�")
+ logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -111,12 +110,12 @@
err = proto.Unmarshal(bdata, &i)
bigPhotoUrl := make(map[string]interface{})
bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- fmt.Println(bigPhotoUrl)
+ logger.Info(bigPhotoUrl)
if len(face.Liker) == 0 {
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
localConfig, err := cache.GetServerInfo()
if err != nil {
- log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
serverIp, err := GetLocalIP()
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -127,15 +126,15 @@
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
- log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ logger.Info("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- log.Println("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
+ logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
if err != nil {
- log.Println("涓婁紶灏忓浘鍑洪敊")
+ logger.Info("涓婁紶灏忓浘鍑洪敊")
}
sex := ""
if face.ThftRes.Gender == 1 {
@@ -179,19 +178,19 @@
requstbody, err := json.Marshal(pervideo)
if err != nil {
- log.Println("json parse error ", err)
+ logger.Info("json parse error ", err)
return
}
err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- log.Println(err)
+ logger.Info(err.Error())
} else {
- log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�", face.Liker)
+ logger.Info("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�", face.Liker)
}
}
}
if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
- log.Println("寰�ES鎻抷olo鏁版嵁")
+ logger.Info("寰�ES鎻抷olo鏁版嵁")
var sdkNames string = ""
alarmRules := []AlarmRule{}
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
@@ -211,27 +210,27 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err = util.DrawPolygonOnImage(msg.Cid, i)
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i,msg.RuleResult["yolo"].([]ruleserver.Result))
if err != nil {
- log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Info("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
- log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
}
} else {
isAlarm = 0
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
- // log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
+ // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
localConfig, err := cache.GetServerInfo()
if err != nil {
- log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
- log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ logger.Info("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
serverIp, err := GetLocalIP()
peraction := Personaction{
@@ -259,15 +258,15 @@
requstbody, err := json.Marshal(peraction)
if err != nil {
- log.Println("json parse error ", err)
+ logger.Info("json parse error ", err)
return
}
err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
if err != nil {
- log.Println("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ logger.Info("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
- log.Println("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
}
}
}
--
Gitblit v1.8.0