From ad2d58a45c9b9adbc77e0ef2f8a464e2fc65db45 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 05 八月 2019 15:31:33 +0800
Subject: [PATCH] ---
---
labelFilter/ruleForLabel.go | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index ccc3cf5..5301818 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -4,16 +4,26 @@
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"github.com/knetic/govaluate"
+ "os"
"ruleprocess/logger"
"ruleprocess/ruleserver"
"strconv"
"time"
)
-func Judge(label *Label, result ruleserver.ResultMsg){
+func Judge(result ruleserver.ResultMsg){
+ // 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
+ label := new(Label)
+ label.DataFormatToLabel(result)
+ logger.Info("label鐨勪俊鎭細",label.CameraName,label.DefenceLevel,label.Time)
+ if label.CameraName == "" {
+ logger.Error("鏃犳晥鏁版嵁锛岀洿鎺ヨ繑鍥�")
+ return
+ }
//鎷垮埌鎵�鏈夎鍒欑粍
var api dbapi.EventPushApi
b,allRules := api.FindAllDetails()
+ logger.Info("鏌ョ湅鎵�鏈夎鍒欑粍锛�",allRules)
if !b {
logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
}
@@ -49,6 +59,7 @@
}
// 寰楀嚭鎬荤殑鍒ゆ柇缁撴灉
if result != "" {
+ logger.Info("鎬荤殑鍒ゆ柇缁撴灉锛�",result)
result = result[2:] // 鎶婂墠涓や綅瀛楃鍘绘帀
expression, err:= govaluate.NewEvaluableExpression(result);
if err != nil {
@@ -58,13 +69,14 @@
if err1 != nil {
logger.Error("甯﹀叆鍙傛暟鏈夎")
}
- logger.Warn("瑙勫垯鍒ゆ柇缁撴灉鏄細",)
if result.(bool) {
logger.Info("閫氳繃瑙勫垯锛岃〃杈惧紡涓猴細",result)
// 鎺ㄩ�佹湇鍔″櫒
pushData(ruleGroup.Urls,result.(ruleserver.ResultMsg))
+ os.Exit(1)
} else {
logger.Info("娌￠�氳繃瑙勫垯,琛ㄨ揪寮忎负锛�",result)
+ os.Exit(1)
}
}
}
@@ -191,5 +203,7 @@
}
// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
func pushData (urls []*protomsg.PushUrl, data ruleserver.ResultMsg){
-
+ for _,url := range urls {
+ Push(url.Url,data)
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0