From 573edfc65d11f80280a4f5e0db3f693b668f03d7 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 31 七月 2019 18:53:00 +0800
Subject: [PATCH] label重大更新

---
 insertdata/insertDataToEs.go |    2 +-
 ruleserver/ruleToformula.go  |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 704e7b4..687599d 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -377,8 +377,8 @@
 						//logger.Warn("鍝堝搱鍝堝搱鍝�",[0].Others["linkCache"].([]ruleserver.ResultMsg))
 						InsertYolo(msg2)
 						logger.Warn("鍏勫紵闅鹃亾浣犻櫡鍏ヤ簡姝诲惊鐜悧")
-						os.Exit(1)
 						linkFlag = true
+						os.Exit(1)
 					}
 				}
 			}
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 65491c1..b002e51 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -460,7 +460,19 @@
 						label["linkCache"] = append(label["linkCache"].([]ResultMsg),ruleRes.CacheData)
 					}
 					logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]ResultMsg)))
-					//os.Exit(1)
+					for _,result := range args.RuleResult["yolo"].([]Result) {
+						if result.RuleGroupId == groupRule.GroupId {
+							result.Others["linkCache"] = label
+						}
+					}
+					for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++  {
+						if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婂師鏉ラ偅涓垹鎺夊啀瀛樹竴浠芥柊鐨�
+							res := args.RuleResult["yolo"].([]Result)[i]
+							res.Others["linkCache"] = label
+							args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result)[:i],args.RuleResult["yolo"].([]Result)[i+1:]...)
+							args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result),res)
+						}
+					}
 				}
 			}
 		} else {

--
Gitblit v1.8.0