From deb66f92a4b350bc228894dcb3a3dd2f7dabf04a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 15:38:15 +0800
Subject: [PATCH] 改造init方法
---
ruleserver/ruleToformula.go | 4 ++--
main.go | 2 +-
labelFilter/readyDataForLabel.go | 8 +++++---
labelFilter/ruleForLabel.go | 28 ++++++++++++++++++++++++++++
ruleserver/readyDataForRule.go | 2 +-
5 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index a645b5b..143302f 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -11,11 +11,12 @@
CameraName string
CameraAddr string
TaskId string
+ Time string
Persons []ruleserver.Arg
DefenceLevel string
}
-
-func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) Label {
+// 鎶婃暟鎹閰嶅埌label
+func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
label.CameraId = result.Cid
camera, err := cache.GetCameraById(result.Cid)
if err != nil {
@@ -26,5 +27,6 @@
label.TaskId = result.Tasklab.Taskid
label.Persons = result.RuleResult["face"].([]ruleserver.Arg)
//labelData.DefenceLevel = result.
- return Label{}
}
+
+// 浠庣紦瀛樹腑鏌ュ嚭鎵�鏈夌殑瑙勫垯鏁版嵁
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 28d5a6c..3768a0c 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -1 +1,29 @@
package labelFilter
+
+import (
+ "github.com/knetic/govaluate"
+ "ruleprocess/logger"
+)
+
+func Judge(){
+
+}
+//
+func timeJudge(label *Label,groupRule *GroupRule){
+
+}
+// 鍒ゆ柇绗竴涓椂闂存槸鍚﹀皬浜庣浜屼釜鏃堕棿
+func isBefore(time1 string,time2 string) bool{
+ expression, err:= govaluate.NewEvaluableExpression("t1 < t2");
+ if err != nil {
+ logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒")
+ }
+ parameters := make(map[string]interface{},8)
+ parameters["t1"] = time1
+ parameters["t2"] = time2
+ result, err1:= expression.Evaluate(parameters)
+ if err1 != nil {
+ logger.Error("甯﹀叆鍙傛暟鏈夎")
+ }
+ return result.(bool)
+}
\ No newline at end of file
diff --git a/main.go b/main.go
index 0fc6c26..d6a9bdf 100644
--- a/main.go
+++ b/main.go
@@ -40,7 +40,7 @@
go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
logger.Info("cache init completed!!!",<- initchan)//dbserver鍒濆鍖栧畬姣�
//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
-
+ ruleserver.Init()
go ruleserver.TimeTicker()
nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
wg.Wait()
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index a2ae4a1..40d7542 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -22,7 +22,7 @@
Serverport string `yaml:"serverPort"`
Dbtablepersons string `yaml:"dbTablePersons"`
}
-func init() {
+func Init() {
data, err := ioutil.ReadFile("./config/conf.yml")
if err != nil {
fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index dd48572..ca66c66 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -254,8 +254,8 @@
}
if completeFormula != "" {
logger.Info("缁撴灉鍏紡-----------锛�", completeFormula)
- expression, _ := govaluate.NewEvaluableExpression(completeFormula)
- if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") {
+ expression, err := govaluate.NewEvaluableExpression(completeFormula)
+ if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err != nil{
panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙ｆ瀽")
}
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
--
Gitblit v1.8.0