From a873ac0f7ca7639441bbacf927a728ce7ec3bb81 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 13:14:48 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index bb7dfdd..c8319c6 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -74,7 +74,7 @@
TaskName string `json:"taskName"`
SdkName string `json:"sdkName"`
Content string `json:"content"`
- AlarmRules []AlarmRule `json: "alramRules"`
+ AlarmRules []AlarmRule `json:"alarmRules"`
AnalyServerId string `json:"analyServerId"`
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
@@ -98,7 +98,7 @@
func InsertToEs(msg ruleserver.ResultMsg) {
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
- if len(msg.RuleResult["faces"].([]ruleserver.Arg)) > 0 {
+ if msg.RuleResult["faces"] != nil && len(msg.RuleResult["faces"].([]ruleserver.Arg)) > 0 {
log.Println("寰�ES鎻掍汉鑴告暟鎹�")
for _, face := range msg.RuleResult["faces"].([]ruleserver.Arg) {
// 涓婁紶澶у浘
@@ -173,10 +173,12 @@
if err != nil {
log.Println("es can not execute right.")
}
+ }else {
+ log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�",face.Liker)
}
}
}
- if len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+ if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
log.Println("寰�ES鎻抷olo鏁版嵁")
var sdkNames string = ""
alarmRules := []AlarmRule{}
@@ -195,14 +197,19 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ resp, err =util.DrawPolygonOnImage(i)
+ if err != nil {
+ log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊",err)
+ }else{
+ log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ }
} else {
isAlarm = "0"
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
- log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
+ // log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
if !flag {
@@ -245,7 +252,9 @@
}
err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
if err != nil {
- log.Println("es can not execute right.")
+ log.Println("寰�ES鎻掑叆鏁版嵁澶辫触",err)
+ } else {
+ log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁鎴愬姛")
}
}
}
--
Gitblit v1.8.0