From d877ebc4cbf3f5d2ec922ca060ea344a993b2766 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 10:00:15 +0800
Subject: [PATCH] ---
---
labelFilter/ruleForLabel.go | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index b4b3764..980fa54 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -4,17 +4,16 @@
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"github.com/knetic/govaluate"
- "os"
"ruleprocess/logger"
"ruleprocess/ruleserver"
"strconv"
"time"
)
-func Judge(result ruleserver.ResultMsg) {
+func Judge(msg ruleserver.ResultMsg) {
// 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
label := new(Label)
- label.DataFormatToLabel(result)
+ label.DataFormatToLabel(msg)
logger.Info("label鐨勪俊鎭細", label.CameraName, label.DefenceLevel, label.Time)
if label.CameraName == "" {
logger.Error("鏃犳晥鏁版嵁锛岀洿鎺ヨ繑鍥�")
@@ -72,11 +71,11 @@
if result.(bool) {
logger.Info("閫氳繃瑙勫垯锛岃〃杈惧紡涓猴細", result)
// 鎺ㄩ�佹湇鍔″櫒
- pushData(ruleGroup.Urls, result.(ruleserver.ResultMsg))
- os.Exit(1)
+ pushData(ruleGroup.Urls, msg)
+ //os.Exit(1)
} else {
logger.Info("娌￠�氳繃瑙勫垯,琛ㄨ揪寮忎负锛�", result)
- os.Exit(1)
+ //os.Exit(1)
}
}
}
@@ -88,6 +87,7 @@
// 鏄惁绗﹀悎鏃堕棿瑙勫垯
func timeJudge(label *Label, groupRule protomsg.EventPush) string {
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 {
@@ -301,7 +301,8 @@
// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
func pushData(urls []*protomsg.PushUrl, data ruleserver.ResultMsg) {
for _, url := range urls {
- Push(url.Url, data)
+ logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
+ Push("tcp://192.168.1.123:40012", data)
}
}
--
Gitblit v1.8.0