From b624035a9b6bbcd0b9d11503aa0b00815c61f38a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 15:58:45 +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..7a26d75 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -105,24 +105,27 @@
SdkDataFormat(args.CameraId, arg, cameraPolygons)
}
// 璺戞湰鎽勫儚鏈虹殑鎵�鏈夎鍒欑粍 涓�缁勪竴缁勮窇
+ logger.Debug("褰撳墠鎽勫儚鏈烘墽琛岀殑浠诲姟鏄細",message.Tasklab.Taskname)
taskGroup := GetRuleGroup(args.CameraId, args.TaskId) // 鏈憚鍍忔満涓嬫墍鏈変换鍔＄粍
//logger.Println("鐪嬩笅鎽勫儚鏈轰笅鐨勪换鍔＄粍锛�",taskRuleList)
// 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
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