From e3c33684b4907cc338866623d2362eb85100387d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 28 十月 2019 16:35:08 +0800
Subject: [PATCH] 修改一下推送成功条件
---
insertdata/insertDataToEs.go | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 0b56736..25200e0 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,25 @@
if resp1["fileUrl"] != nil {
url = append(url, resp1["fileUrl"].(string))
}
+ }
+ }
+ // 瑁呴厤鐩爣淇℃伅鏁版嵁
+ for _,target := range yoloResult.Location {
+ // 鍘婚噸娣诲姞
+ logger.Info("瑁呴厤鍓嶇殑鍘熷鏁版嵁鏄細",target)
+ 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,7 +476,9 @@
if err != nil {
logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
+ logger.Info("鎽勫儚鏈轰俊鎭細",camera)
serverIp, err := GetLocalIP()
+ logger.Info("%%%%%%%%%%%%%%%%%yolo鐨則arget淇℃伅锛�",targetInfos)
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
esDataId := uuid.NewV4().String()
@@ -485,6 +508,7 @@
0,
0,
0,
+ targetInfos,
}
requstbody, err := json.Marshal(peraction)
--
Gitblit v1.8.0