From bcb7cc1f3c209b073ea491b3f81fbdf0e1466d24 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 14:02:57 +0800
Subject: [PATCH] ---

---
 ruleserver/ruleToformula.go |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 29826a0..7100bd7 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -270,9 +270,9 @@
 			completeFormula = completeFormula[1:]
 		}
 		logger.Info("-------------------鐪嬬湅鎷旀瘺鍚庣殑琛ㄨ揪寮忥細", completeFormula)
-		expression, _ := govaluate.NewEvaluableExpression(completeFormula)
-		result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
-		return result.(bool)
+		//expression, _ := govaluate.NewEvaluableExpression(completeFormula)
+		//result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+		//return result.(bool)
 	}
 	if completeFormula != "" {
 		logger.Info("缁撴灉鍏紡-----------锛�", completeFormula)
@@ -335,11 +335,11 @@
 				//logger.Debug("------locations鐨勫唴瀹癸細", locations)
 				if sdkNames != "" {
 					args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,label})
-					//logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
+					logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
 				}
 				if faceFlag {
 					args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId,label},faces})
-					//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
+					logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
 				}
 				return true
 			} else {
@@ -479,13 +479,8 @@
 						label.LinkCache = append(label.LinkCache,ruleRes.CacheData)
 					}
 					logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label.LinkCache))
-					//for _,result := range args.RuleResult["yolo"].([]Result) {
-					//	if result.RuleGroupId == groupRule.GroupId {
-					//		result.Others["linkCache"] = label
-					//	}
-					//}
 					for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++  {
-						if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婂師鏉ラ偅涓垹鎺夊啀瀛樹竴浠芥柊鐨�
+						if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
 							args.RuleResult["yolo"].([]Result)[i].Others.LinkCache = label.LinkCache
 						}
 					}

--
Gitblit v1.8.0