From 866988e990d88381b5d5ecb88cb859a4b35d2aaa Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 13:36:37 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 8564156..0a1293c 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -323,7 +323,8 @@
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
flag := false
for _, res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- if res.Others["timeLabel"].(string) == "01" || res.Others["timeLabel"].(string) == "10" {
+ logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
+ if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
flag = true
}
}
@@ -333,17 +334,18 @@
alarmRules := []AlarmRule{}
url := []string{}
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- if yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10" {
+ if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "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})
// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
- if yoloResult.Others["cacheData"] != nil {
+ if yoloResult.Others.CacheData != nil {
//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- msgs := yoloResult.Others["cacheData"].([]ruleserver.ResultMsg)
+ msgs := yoloResult.Others.CacheData
for _, msg1 := range msgs {
bdata, err := util.UnCompress(msg1.Data)
if err != nil {
@@ -364,19 +366,24 @@
}
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 && len(yoloResult.Others["linkCache"].([]*ruleserver.ResultMsg)) > 0{
- for _, msg2 := range yoloResult.Others["linkCache"].([]*ruleserver.ResultMsg) {
+ if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1{
+ for _, msg2 := range yoloResult.Others.LinkCache {
logger.Warn("鎻掑叆鑱斿姩鏁版嵁")
- InsertYolo(*msg2)
+ //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{})
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
--
Gitblit v1.8.0