From 33804d4591d5021b4dec1da5f5152422282409c6 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 13 十一月 2019 11:23:55 +0800
Subject: [PATCH] --暂存
---
insertdata/insertDataToEs.go | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index a38b48d..88f0aae 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,6 +1,7 @@
package insertdata
import (
+ "basic.com/valib/logger.git"
"encoding/base64"
"encoding/json"
"errors"
@@ -15,7 +16,6 @@
"github.com/satori/go.uuid"
"ruleprocess/ruleserver"
"ruleprocess/util"
- "ruleprocess/structure"
)
var weedfsUrl, videoPersonUrl, personAction string
@@ -146,7 +146,7 @@
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
func InsertFace(msg structure.ResultMsg, linkId string) {
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 {
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.TargetResult)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
faces := []*FaceAndRules{}
faces = PutFace(faces, msg)
@@ -162,7 +162,6 @@
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
alarmRules := []AlarmRule{}
- //logger.Warn("浜鸿劯id涓猴細", face.Id, "浜鸿劯鐨勮鍒欓暱搴︿负锛�", len(face.rules))
//os.Exit(1)
for _, faceResult := range face.rules {
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
@@ -179,7 +178,7 @@
// 涓婁紶澶у浘
if imgMaxUrl == "" {
bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.FaceResult), weedfsUrl)
+ bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.TargetResult), weedfsUrl)
logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
picTime = i.Timestamp
@@ -204,6 +203,7 @@
target.TargetScore = face.Score
target.TargetLocation = Points{TopLeft:Point{face.Location.X,face.Location.Y},BottomRight:Point{face.Location.X+face.Location.Width,face.Location.Y+face.Location.Height}}
//logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
+
pervideo := PerVideoPicture{
msg.Push.PushId,
msg.Cid,
@@ -259,8 +259,8 @@
// 褰掔疆浜鸿劯
func PutFace(faces []*FaceAndRules, msg structure.ResultMsg) []*FaceAndRules {
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 {
- for _, faceResult := range msg.RuleResult["face"].([]structure.FaceResult) {
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.TargetResult)) > 0 {
+ for _, faceResult := range msg.RuleResult["face"].([]structure.TargetResult) {
faces = hebingFace(faces, faceResult)
}
return faces
@@ -268,7 +268,7 @@
return nil
}
}
-func hebingFace(faces []*FaceAndRules, faceResult structure.FaceResult) []*FaceAndRules {
+func hebingFace(faces []*FaceAndRules, faceResult structure.TargetResult) []*FaceAndRules {
for _, arg := range faceResult.Args {
// 鎷垮埌姣忎竴寮犱汉鑴�
//logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�", len(arg.Liker))
@@ -357,7 +357,6 @@
// 瑁呴厤鐩爣淇℃伅鏁版嵁
for _,target := range yoloResult.Location {
// 鍘婚噸娣诲姞
- //logger.Info("瑁呴厤鍓嶇殑鍘熷鏁版嵁鏄細",target)
var flag = true
for _,selectTarget := range targetInfos {
if strconv.FormatUint(target.TargetId, 10) == selectTarget.TargetId {
--
Gitblit v1.8.0