From 855acd05ad59da181e595c6f68b1e5ac8d4bbaa4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 14 十一月 2019 10:52:51 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 8154abc..77773db 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -184,7 +184,7 @@
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
func InsertFace(msg structure.ResultMsg) {
- 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)
@@ -216,7 +216,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
@@ -295,8 +295,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
@@ -304,7 +304,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))
@@ -416,7 +416,9 @@
if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1 {
for _, msg2 := range yoloResult.Others.LinkCache {
// 鎶妋sg2鐨勬暟鎹閰嶆垚涓�涓狿erVideoPicture缁撴瀯浣�
- linkTagInfos = append(linkTagInfos, msg2PersonVideo(msg2))
+ if msg2.Cid != msg.Cid {
+ linkTagInfos = append(linkTagInfos, msg2PersonVideo(msg2))
+ }
}
}
}
@@ -477,9 +479,6 @@
linkTagInfos,
}
requstbody, err := json.Marshal(peraction)
- var m map[string]interface{}
- json.Unmarshal(requstbody, &m)
- logger.Info("涓婁紶鍙傛暟json:",m)
if len(linkTagInfos)>0 {
logger.Info("鑱斿姩浠诲姟1111")
--
Gitblit v1.8.0