From c09b5b7f6d8fd8aa0cf176521bae39a62d795dea Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 16:44:52 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 75e8050..0c48495 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -101,6 +101,7 @@
// 鎷垮埌鏈憚鍍忔満鐨勫尯鍩�
cameraPolygons := GetPolygons(args.CameraId)
// 鎶婃墍鏈夌殑sdk鎻愬彇鐨勬暟鎹兘鎸夋墍灞炴憚鍍忔満鐨勫尯鍩熷綊缃�
+ logger.Debug("褰撳墠鎽勫儚鏈篿d涓猴細",message.Cid,"褰撳墠鎽勫儚鏈烘墽琛岀殑浠诲姟鏄細",message.Tasklab.Taskname)
for _, arg := range args.Sdkdata {
SdkDataFormat(args.CameraId, arg, cameraPolygons)
}
@@ -111,18 +112,20 @@
args.RuleResult = make(map[string]interface{})
args.RuleResult["yolo"] = []Result{}
args.RuleResult["face"] = []Arg{}
- for _, group := range taskGroup.GroupRules {
- //logger.Println("------------------------------浠诲姟瑙勫垯锛�",taskRule)
- taskId := taskGroup.TaskId
- //logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
- temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
- if len(temp) > 0 {
- if group.SetType == "linkTask" {
- // groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
- LinkTask(args, group, taskId, message)
- } else {
- // 鐙珛浠诲姟鐨勫鐞�
- RunRule(args, group, taskId, message)
+ if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
+ for _, group := range taskGroup.GroupRules {
+ //logger.Println("------------------------------浠诲姟瑙勫垯锛�",taskRule)
+ taskId := taskGroup.TaskId
+ //logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
+ temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
+ if len(temp) > 0 {
+ if group.SetType == "linkTask" {
+ // groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
+ LinkTask(args, group, taskId, message)
+ } else {
+ // 鐙珛浠诲姟鐨勫鐞�
+ RunRule(args, group, taskId, message)
+ }
}
}
}
@@ -252,8 +255,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