From 05efb91c8e0494ef96ff84e90b924c4baa13b75a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 10:30:46 +0800
Subject: [PATCH] ---
---
labelFilter/ruleForLabel.go | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index d5ba34f..3bc1592 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -4,7 +4,6 @@
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"github.com/knetic/govaluate"
- "os"
"ruleprocess/logger"
"ruleprocess/ruleserver"
"strconv"
@@ -31,7 +30,11 @@
for _, ruleGroup := range allRules {
if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
// 鍏堣繃鏃堕棿瑙勫垯
- timeJudge(label, ruleGroup)
+ timeFlag := timeJudge(label, ruleGroup)
+ if !timeFlag {
+ logger.Info("涓嶅湪瑙勫垯鐨勬椂闂磋寖鍥村唴锛屼笉鎺ㄩ�侊紒")
+ return
+ }
result := ""
var Connector string
if ruleGroup.IsSatisfyAll {
@@ -73,10 +76,10 @@
logger.Info("閫氳繃瑙勫垯锛岃〃杈惧紡涓猴細", result)
// 鎺ㄩ�佹湇鍔″櫒
pushData(ruleGroup.Urls, msg)
- os.Exit(1)
+ //os.Exit(1)
} else {
logger.Info("娌￠�氳繃瑙勫垯,琛ㄨ揪寮忎负锛�", result)
- os.Exit(1)
+ //os.Exit(1)
}
}
}
@@ -86,15 +89,16 @@
}
// 鏄惁绗﹀悎鏃堕棿瑙勫垯
-func timeJudge(label *Label, groupRule protomsg.EventPush) string {
+func timeJudge(label *Label, groupRule protomsg.EventPush) bool {
timeNow := time.Now().Format("2006-01-02 15:04:05")
+ logger.Info("鏍囩杩囨护鍣ㄨ捣濮嬫椂闂翠负锛�",groupRule.TimeStart,groupRule.TimeEnd)
flag1 := isBefore(groupRule.TimeStart, timeNow)
flag2 := isBefore(timeNow, groupRule.TimeEnd)
if flag1 && flag2 {
- return "true"
+ return true
} else {
logger.Info("涓嶅湪瑙勫畾鐨勬椂闂磋寖鍥村唴锛�")
- return "false"
+ return false
}
}
@@ -123,6 +127,7 @@
if rule.TopicArg == "addr" {
formula = "'" + label.CameraAddr + "'" + rule.Operator + "'" + rule.RuleValue + "'"
}
+ logger.Info("-------鎵撳嵃鎽勫儚鏈鸿鍒欏叕寮忥細",formula)
expression, err := govaluate.NewEvaluableExpression(formula);
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
@@ -159,6 +164,7 @@
for _, liker := range arg.Liker {
formula := "'" + liker.TableId + "'" + rule.Operator + "'" + rule.RuleValue + "'"
expression, err := govaluate.NewEvaluableExpression(formula);
+ logger.Info("-------鎵撳嵃搴曞簱瑙勫垯鍏紡锛�",formula)
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
//return "false"
@@ -198,6 +204,7 @@
// 鍏朵粬杩欎釜鍊煎厛杩欎箞澶勭悊
return "true"
}
+ logger.Info("-------鎵撳嵃浜哄憳瑙勫垯鍏紡锛�",formula)
expression, err := govaluate.NewEvaluableExpression(formula);
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
@@ -221,6 +228,7 @@
}
} else {
formula := strconv.Itoa(int(personGroup.AlarmLevel)) + rule.Operator + formate(rule.RuleValue)
+ logger.Info("-------鎵撳嵃浜哄憳绛夌骇瑙勫垯鍏紡锛�",formula)
expression, err := govaluate.NewEvaluableExpression(formula);
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
@@ -257,6 +265,7 @@
} else {
for _, def := range label.DefenceLevel {
formula := strconv.Itoa(int(def)) + rule.Operator + formate(rule.RuleValue)
+ logger.Info("-------鎵撳嵃甯冮槻绛夌骇瑙勫垯鍏紡锛�",formula)
expression, err := govaluate.NewEvaluableExpression(formula);
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
@@ -281,6 +290,7 @@
func taskJudge(label *Label, rule *protomsg.EventPushRule) string {
formula := "'"+label.TaskId +"'"+ rule.Operator +"'"+ rule.RuleValue+"'"
expression, err := govaluate.NewEvaluableExpression(formula);
+ logger.Info("-------鎵撳嵃浠诲姟瑙勫垯鍏紡锛�",formula)
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
return "false"
@@ -302,7 +312,7 @@
func pushData(urls []*protomsg.PushUrl, data ruleserver.ResultMsg) {
for _, url := range urls {
logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
- Push("tcp://"+url.Url, data)
+ Push("tcp://192.168.1.123:40012", data)
}
}
--
Gitblit v1.8.0