From 351d03c5ea2ade96c2a796bb6fa3382699c422ee Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 30 十一月 2019 13:49:02 +0800
Subject: [PATCH] ---
---
labelFilter/ruleForLabel.go | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index bb4f9a5..c5483a4 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -3,7 +3,7 @@
import (
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/alecthomas/log4go"
"github.com/golang/protobuf/proto"
"github.com/knetic/govaluate"
"ruleprocess/structure"
@@ -160,7 +160,7 @@
func baseJudge(label *Label, rule *protomsg.EventPushRule) string {
if rule.RuleValue == "all" {
for _, personGroup := range label.Persons {
- for _, arg := range personGroup.Args {
+ for _, arg := range personGroup.AlarmObj {
if len(arg.Liker) > 0 {
logger.Info("婊¤冻鍏ㄩ儴搴曞簱瑙勫垯")
return "true"
@@ -170,7 +170,7 @@
return "false"
} else {
for _, personGroup := range label.Persons {
- for _, arg := range personGroup.Args {
+ for _, arg := range personGroup.AlarmObj {
for _, liker := range arg.Liker {
formula := "'" + liker.TableId + "'" + rule.Operator + "'" + rule.RuleValue + "'"
expression, err := govaluate.NewEvaluableExpression(formula);
@@ -199,7 +199,7 @@
//鏄惁绗﹀悎浜哄憳瑙勫垯
func personJudge(label *Label, rule *protomsg.EventPushRule) string {
for _, personGroup := range label.Persons {
- for _, person := range personGroup.Args {
+ for _, person := range personGroup.AlarmObj {
formula := ""
if rule.TopicArg == "sex" {
formula = strconv.Itoa(int(person.ThftRes.Gender)) + rule.Operator + rule.RuleValue
@@ -232,7 +232,7 @@
}
if rule.TopicArg == "monitorLevel" {
if rule.RuleValue == "all" {
- if len(personGroup.Args) > 0 {
+ if len(personGroup.AlarmObj) > 0 {
logger.Info("绗﹀悎浜哄憳绛夌骇涓哄叏閮ㄧ殑瑙勫垯")
return "true"
}
@@ -321,16 +321,14 @@
// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
for _, url := range urls {
- logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
+ logger.Debug("鎺ㄩ�佸湴鍧�锛�",url.Url)
bytes,err1 := proto.Marshal(data)
if err1 != nil {
logger.Info("搴忓垪鍖栧け璐ワ細",err1)
}
if _, ok := urlPool[url.Url] ; ok {
urlPool[url.Url] <- bytes
- logger.Info("chan淇℃伅鑰岋細 ", urlPool[url.Url])
}
- logger.Info("chan淇℃伅浠ワ細 ", urlPool[url.Url])
}
--
Gitblit v1.8.0