From b9aa64b4dc3ddd6d0a6ec726f44aab137079122a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 10 十月 2019 17:00:44 +0800
Subject: [PATCH] 人体添加目标信息字段
---
insertdata/insertDataToEs.go | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 0b56736..57f4e07 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -109,6 +109,7 @@
IsAckAlarm int `json:"isAckAlarm"`
IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
+ TargetInfo []Target
}
type AlarmRule struct {
@@ -364,6 +365,7 @@
logger.Info("寰�ES鎻抷olo鏁版嵁")
var sdkNames string = ""
alarmRules := []AlarmRule{}
+ var targetInfos []Target
url := []string{}
for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
@@ -398,6 +400,24 @@
if resp1["fileUrl"] != nil {
url = append(url, resp1["fileUrl"].(string))
}
+ }
+ }
+ // 瑁呴厤鐩爣淇℃伅鏁版嵁
+ for _,target := range yoloResult.Location {
+ // 鍘婚噸娣诲姞
+ var flag = true
+ for _,selectTarget := range targetInfos {
+ if strconv.FormatUint(target.TargetId, 10) == selectTarget.TargetId {
+ flag = false
+ break
+ }
+ }
+ if flag {
+ var target1 = new(Target)
+ target1.TargetId = strconv.FormatUint(target.TargetId, 10)
+ target1.TargetScore = target.TargetScore
+ target1.TargetLocation = Points{TopLeft:Point{target.X,target.Y},BottomRight:Point{target.X+target.Width,target.Y+target.Height}}
+ targetInfos = append(targetInfos,*target1)
}
}
}
@@ -455,6 +475,7 @@
if err != nil {
logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
+
serverIp, err := GetLocalIP()
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
@@ -485,6 +506,7 @@
0,
0,
0,
+ targetInfos,
}
requstbody, err := json.Marshal(peraction)
--
Gitblit v1.8.0