From 940117bea5848f7a09fe937eb2f0a7e2701ea55e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 03 七月 2019 18:10:09 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 22c11a4..b7e82a5 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -4,6 +4,7 @@
"encoding/json"
"fmt"
"log"
+ "os"
"ruleprocess/cache"
"sort"
"strconv"
@@ -207,6 +208,7 @@
args.RuleResult["face"] = []Arg{}
if len(taskRuleList) > 0 {
for _, taskRule := range taskRuleList {
+ //log.Println("------------------------------浠诲姟瑙勫垯锛�",taskRule)
ruleList := taskRule.GroupRules // 鑾峰彇鐨勬槸task涓嬮潰鐨勪换鍔＄粍
taskId := taskRule.TaskId
//log.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
@@ -231,7 +233,6 @@
if err := recover(); err != nil {
fmt.Println("姣斿瑙勫垯鏈夎", err.(string))
}
-
}()
log.Println("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠瑙勫垯--锛�",(*groupRule).GroupText)
resultSplice := []*LittleRuleResult{}
@@ -447,6 +448,7 @@
// 鑱斿姩浠诲姟鐨勫鐞�
func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
+ log.Println("------------------------------------------褰撳墠鏄仈鍔ㄤ换鍔★紝瑙勫垯鏄細",groupRule.GroupText)
var flag bool = true
var timeEle = TimeElement{N: 3, InitN: 3, GroupId: groupRule.GroupId}
for k, timeEle1 := range TimeEleList {
@@ -503,16 +505,23 @@
expression, _ := govaluate.NewEvaluableExpression(completeFormula)
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
+ log.Println("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
sdkName := ""
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
- if groupRule.Rules[j].SdkId == sdkData.SdkId && sdkData.IsYolo { // 鍙褰晊olo绗﹀悎瑙勫垯鐨剆dk
- sdkName = sdkName + "," + sdkData.SdkName
+ if groupRule.Rules[j].SdkId == sdkData.SdkId && sdkData.IsYolo && !strings.Contains(sdkName,sdkData.SdkName) { // 鍙褰晊olo绗﹀悎瑙勫垯鐨剆dk 鍚屾椂瑕侀伩鍏嶉噸澶嶆嫾鎺�
+ sdkName = sdkData.SdkName + " "
}
}
}
- // 杩囧畬瑙勫垯鍚庢墦涓爣绛撅紝鍛婅瘔璋冪敤鑰呮湰甯ф暟鎹拡瀵瑰摢涓换鍔″摢缁勮鍒欐姤璀︿簡
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkName, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText})
+ if sdkName != "" {
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkName, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText})
+ log.Println("-------------------yolo缁撴灉鏍囩",args.RuleResult["yolo"].([]Result))
+ }
+ if args.RuleResult["face"] != nil {
+ log.Println("-------------------face缁撴灉鏍囩",args.RuleResult["face"].([]Arg))
+ }
+ os.Exit(0)
}
}
} else {
--
Gitblit v1.8.0