From e3f9b39c5c0f96315d409e09d92ce704b9c6385b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 11:20:01 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 5b5294d..ea8321a 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -323,6 +323,7 @@
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
flag := false
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
}
@@ -335,6 +336,7 @@
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})
@@ -364,19 +366,31 @@
}
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"].(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) {
+ num := 1
+ for k,_ := range nihao.Others {
+ logger.Info("绗�",num,"娆￠敭锛�",k)
+ }
+ num++
+ }
+ //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