From 3987da3187e398620ec1f69efe819b89bd649517 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 31 七月 2019 17:15:40 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index fccac27..1c09054 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -121,6 +121,20 @@
args.RuleResult["face"] = []FaceResult{}
//logger.Warn("浼犺繘鍘讳箣鍓嶆槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
+ // 鍏堣繃鐙珛锛屽啀杩囪仈鍔�
+ for _, group := range taskGroup.GroupRules {
+ //logger.Println("------------------------------浠诲姟瑙勫垯锛�",taskRule)
+ taskId := taskGroup.TaskId
+ //logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
+ temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
+ label := make(map[string]interface{})
+ if len(temp) > 0 {
+ if group.SetType != "linkTask" {
+ // 鐙珛浠诲姟鐨勫鐞�
+ RunRule(args, group, taskId, message,label)
+ }
+ }
+ }
for _, group := range taskGroup.GroupRules {
//logger.Println("------------------------------浠诲姟瑙勫垯锛�",taskRule)
taskId := taskGroup.TaskId
@@ -131,9 +145,6 @@
if group.SetType == "linkTask" {
// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
LinkTask(args, group, taskId, message,label)
- } else {
- // 鐙珛浠诲姟鐨勫鐞�
- RunRule(args, group, taskId, message,label)
}
}
}
@@ -440,11 +451,11 @@
if result.(bool) {
logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
// 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
- label["linkCache"] = []*ResultMsg{}
+ label["linkCache"] = []ResultMsg{}
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
label["linkCache"] = append(label["linkCache"].([]ResultMsg),ruleRes.CacheData)
}
- logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]*ResultMsg)))
+ logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]ResultMsg)))
//os.Exit(1)
}
}
--
Gitblit v1.8.0