From 52ea408f8ab6d4098a6c3b77042929fe34f10a09 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 18:07:38 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 00d23bb..2d39911 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -7,7 +7,6 @@
"fmt"
"io/ioutil"
"net"
- "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strings"
@@ -167,7 +166,7 @@
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
faces := []*FaceAndRules{}
faces = PutFace(faces,msg)
- logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
+ //logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
if faces != nil {
for _,face := range faces {
// 涓婁紶澶у浘
@@ -178,7 +177,7 @@
}
alarmRules := []AlarmRule{}
logger.Warn("浜鸿劯id涓猴細",face.Id,"浜鸿劯鐨勮鍒欓暱搴︿负锛�",len(face.rules))
- os.Exit(1)
+ //os.Exit(1)
for _,faceResult := range face.rules {
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState})
@@ -273,7 +272,6 @@
// 褰掔疆浜鸿劯
func PutFace(faces []*FaceAndRules,msg ruleserver.ResultMsg)[]*FaceAndRules{
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
- logger.Info("鏁寸悊浜鸿劯鏁版嵁")
for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
faces = hebingFace(faces, faceResult)
}
@@ -285,18 +283,22 @@
func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult) []*FaceAndRules{
for _, arg := range faceResult.Args {
// 鎷垮埌姣忎竴寮犱汉鑴�
+ logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�",len(arg.Liker))
flag := false
for _, face := range faces {
+ 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)
+ face.Liker = append(face.Liker,arg.Liker...)
}
}
if !flag {
faces = append(faces, &FaceAndRules{arg, []ruleserver.Result{faceResult.Result}})
}
}
- logger.Info("鏁寸悊涓殑鏁版嵁",faces)
return faces
}
--
Gitblit v1.8.0