From 0c8dffc024fc2f8f6b185a2b85387309e4e62aca Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 20:20:04 +0800
Subject: [PATCH] ---

---
 insertdata/insertDataToEs.go |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index ea3816a..f6e4fcd 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -90,7 +90,7 @@
 
 type AlarmRule struct {
 	GroupId    string `json:"groupId"`
-	AlarmLevel   `json:"alarmLevel"`
+	AlarmLevel string `json:"alarmLevel"`
 	RuleText   string `json:"ruleText"`
 }
 
@@ -98,9 +98,9 @@
 func InsertToEs(msg ruleserver.ResultMsg) {
 
 	// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
-	if msg.RuleResult["faces"] != nil && len(msg.RuleResult["faces"].([]ruleserver.Arg)) > 0 {
+	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
 		log.Println("寰�ES鎻掍汉鑴告暟鎹�")
-		for _, face := range msg.RuleResult["faces"].([]ruleserver.Arg) {
+		for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
 			// 涓婁紶澶у浘
 			// 瑙e帇缂╁苟涓婁紶鍥剧墖
 			bdata, err := util.UnCompress(msg.Data)
@@ -126,9 +126,9 @@
 				}
 				i := protomsg.Image{}
 				err = proto.Unmarshal(bdata, &i)
-				i1 := protomsg.Image{}
-				i1 = util.Subimg(i.Data, 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.PostFormBufferData(weedfsUrl, i1, uuid.NewV4().String())
+				log.Println("======================================鐪嬬湅杩欎釜妗嗭細",face.Location)
+				bytes := util.Subimg(i.Data, 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("涓婁紶灏忓浘鍑洪敊")
 				}

--
Gitblit v1.8.0