From 52713b8d85e26a984ecaeef926c815e8cf8075b7 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 19:24:17 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 40 +++++++---------------------------------
1 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index ba89ac2..c857895 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,7 +1,7 @@
package insertdata
import (
- "basic.com/valib/logger.git"
+ "ruleprocess/logger"
"encoding/base64"
"encoding/json"
"errors"
@@ -127,30 +127,6 @@
rules []structure.Result
}
-// 寰�ES鎻掓暟鎹�
-//func InsertToEs(msg ruleserver.ResultMsg) {
-// var timeLabel string
-// // 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
-// if msg.RuleResult["timeLabel"] != nil {
-// timeLabel = msg.RuleResult["timeLabel"].(string)
-// }
-// logger.Debug("鎻掑叆鏁版嵁鍓嶇湅鐪嬫姤璀︽爣蹇椾綅锛�", timeLabel)
-// if timeLabel == "01" { // 鏃犲畾鏃跺櫒鐘舵�佽鎻掑叆鐨勬姤璀︽暟鎹�
-// InsertFace(msg)
-// flag := ruleserver.BodyIsSame(msg.SdkMessage)
-// if !flag {
-// InsertYolo(msg)
-// }
-// }
-// if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
-// InsertFace(msg)
-// InsertYolo(msg)
-// }
-// //if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
-// // //ChangeStatusFace(msg)
-// // ChangeStatusYolo(msg)
-// //}
-//}
func InsertToEs(msg structure.ResultMsg) {
defer func() {
if err := recover(); err != nil {
@@ -186,7 +162,7 @@
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
alarmRules := []AlarmRule{}
- logger.Warn("浜鸿劯id涓猴細", face.Id, "浜鸿劯鐨勮鍒欓暱搴︿负锛�", len(face.rules))
+ //logger.Warn("浜鸿劯id涓猴細", face.Id, "浜鸿劯鐨勮鍒欓暱搴︿负锛�", len(face.rules))
//os.Exit(1)
for _, faceResult := range face.rules {
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
@@ -228,7 +204,6 @@
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))
- logger.Info("%%%%%%%%%%%%%%%%%%%%%鐩爣淇℃伅锛�",*target)
pervideo := PerVideoPicture{
msg.Push.PushId,
msg.Cid,
@@ -296,12 +271,12 @@
func hebingFace(faces []*FaceAndRules, faceResult structure.FaceResult) []*FaceAndRules {
for _, arg := range faceResult.Args {
// 鎷垮埌姣忎竴寮犱汉鑴�
- logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�", len(arg.Liker))
+ //logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�", len(arg.Liker))
flag := false
for _, face := range faces {
- for _, lik := range face.Liker {
- logger.Warn("--------鍚堝苟浜鸿劯鏃剁浉浼艰�咃細", lik.PersonId, lik.TableName)
- }
+ //for _, lik := range face.Liker {
+ // //logger.Warn("--------鍚堝苟浜鸿劯鏃剁浉浼艰�咃細", lik.PersonId, lik.TableName)
+ //}
if arg.Id == face.Id {
flag = true
face.rules = append(face.rules, faceResult.Result)
@@ -382,7 +357,7 @@
// 瑁呴厤鐩爣淇℃伅鏁版嵁
for _,target := range yoloResult.Location {
// 鍘婚噸娣诲姞
- logger.Info("瑁呴厤鍓嶇殑鍘熷鏁版嵁鏄細",target)
+ //logger.Info("瑁呴厤鍓嶇殑鍘熷鏁版嵁鏄細",target)
var flag = true
for _,selectTarget := range targetInfos {
if strconv.FormatUint(target.TargetId, 10) == selectTarget.TargetId {
@@ -442,7 +417,6 @@
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
-
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
//esDataId := uuid.NewV4().String()
--
Gitblit v1.8.0