From 720d703e336ed1a04a3595e001abdf026bca88f3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 09:39:42 +0800
Subject: [PATCH] label重大更新
---
insertdata/insertDataToEs.go | 79 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 7a10bf3..687599d 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -7,6 +7,7 @@
"fmt"
"io/ioutil"
"net"
+ "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strings"
@@ -111,27 +112,34 @@
}
// 寰�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 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)
+ InsertFace(msg)
+ //flag := ruleserver.BodyIsSame(msg.SdkMessage)
+ //if !flag {
+ InsertYolo(msg)
//}
}
@@ -149,7 +157,7 @@
}
alarmRules := []AlarmRule{}
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText,faceResult.DefenceState})
+ alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState})
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
bigPhotoUrl := make(map[string]interface{})
@@ -314,7 +322,8 @@
if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
flag := false
- for _,res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ for _, res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others["timeLabel"].(string))
if res.Others["timeLabel"].(string) == "01" || res.Others["timeLabel"].(string) == "10" {
flag = true
}
@@ -327,16 +336,17 @@
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
if yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10" {
// 鎷煎嚭sdkname
+ logger.Info("搴旇杩涙潵鎵嶅鐨�")
sdkNames = sdkNames + yoloResult.SdkName
alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText,yoloResult.DefenceState})
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState})
// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
if yoloResult.Others["cacheData"] != nil {
//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- msgs :=yoloResult.Others["cacheData"].([]ruleserver.ResultMsg)
- for _,msg1 := range msgs {
+ msgs := yoloResult.Others["cacheData"].([]ruleserver.ResultMsg)
+ for _, msg1 := range msgs {
bdata, err := util.UnCompress(msg1.Data)
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
@@ -356,18 +366,29 @@
}
linkFlag := false
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- if yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10" && yoloResult.Others["linkCache"] != nil{
- for _,msg2 := range yoloResult.Others["linkCache"].([]*ruleserver.ResultMsg) {
+ if (yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10") && yoloResult.Others["linkCache"] != nil && len(yoloResult.Others["linkCache"].([]ruleserver.ResultMsg)) > 1{
+ for _, msg2 := range yoloResult.Others["linkCache"].([]ruleserver.ResultMsg) {
logger.Warn("鎻掑叆鑱斿姩鏁版嵁")
- InsertYolo(*msg2)
+ for _,nihao := range msg2.RuleResult["yolo"].([]ruleserver.Result) {
+ for k,_ := range nihao.Others {
+ logger.Info("閿細",k)
+ }
+ }
+ //logger.Warn("鍝堝搱鍝堝搱鍝�",[0].Others["linkCache"].([]ruleserver.ResultMsg))
+ InsertYolo(msg2)
+ logger.Warn("鍏勫紵闅鹃亾浣犻櫡鍏ヤ簡姝诲惊鐜悧")
linkFlag = true
+ os.Exit(1)
}
}
}
if linkFlag {
// 鑱斿姩鏁版嵁涓寘鍚湰甯ф暟鎹紝鎻掑叆鑱斿姩鏁版嵁鍚庡氨涓嶉渶瑕佹彃鍏ユ湰甯ф暟鎹簡
+ logger.Warn("鎴愬姛鎻掑叆涓や釜鑱斿姩鍥剧墖")
+ os.Exit(1)
return
}
+ logger.Info("--------璧板埌杩欏効灏变笉涓�鏍�")
isAlarm := 0
resp := make(map[string]interface{})
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -446,7 +467,7 @@
//os.Exit(1)
}
} else {
- logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�" )
+ logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�")
}
}
}
--
Gitblit v1.8.0