From 7d5355bbd4ac904466c57a93963dac63a3a0f288 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 01 七月 2019 15:39:35 +0800
Subject: [PATCH] ---注释
---
ruleserver/ruleToformula.go | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c5a562e..3b584ec 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -183,9 +183,7 @@
areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
areaMap.CountAreaObjs(arg)
- log.Println("-------areaMap鐨勫唴瀹�",areaMap)
arg.AreaMapList = append(arg.AreaMapList, areaMap)
- log.Println("-------AreaMapList鐨勫唴瀹�",arg.AreaMapList)
}
}
@@ -231,9 +229,6 @@
// 鍏堣繃瀹屾潯浠惰鍒�
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
- if sdkData.SdkId == "812b674b-2375-4589-919a-5c1c3278a975" {
- log.Println("鍏ヤ镜鐨勭畻娉曟暟鎹�", sdkData)
- }
for _, areaMap := range sdkData.AreaMapList {
ruleResult := filterRule(groupRule.Rules[j], &areaMap)
if ruleResult.Result != "" {
@@ -293,6 +288,7 @@
completeFormula = completeFormula + va.Result
}
if completeFormula != "" {
+ log.Println("鐪嬬湅鍏紡-----------锛�", completeFormula)
expression, _ := govaluate.NewEvaluableExpression(completeFormula)
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
--
Gitblit v1.8.0