From 12e2759b74e52e3d852dff26146136e943fb68ca Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 12 七月 2019 15:37:50 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c4522aa..7fbf941 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -166,7 +166,7 @@
func GetPolygons(cameraId string) []protomsg.CameraPolygon {
var cameraPolygons []protomsg.CameraPolygon
cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
-
+ logger.Debug("------=======鏌ョ湅涓嬪叏閮ㄥ尯鍩燂細",cameraPolygons)
return cameraPolygons
}
@@ -282,12 +282,14 @@
logger.Info("-------------浜鸿劯姣斿涔嬪墠鐩爣鏁伴噺",len(areaMap.args))
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
if groupRule.Rules[j].PolygonId == areaMap.areaId {
+ logger.Info("--------------鐪嬬湅compareFlag鐨勫�硷細",compareFlag)
for _, arg := range areaMap.args {
if compareFlag == 1 {
arg.fillLiker()
}
if compareFlag == 2 {
array := strings.Split(tableIds, ",")
+ logger.Info("--------------------------鐪嬬湅瀵规瘮搴曞簱鐨勫��;",array)
for i := 0; i < len(array)-1; i++ {
arg.fillLiker()
}
@@ -586,7 +588,8 @@
// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
func Json2points(areaPoints string) []Point {
var pts []Point
- if areaPoints == "" {
+ if areaPoints == "[]" {
+ logger.Error("=====================姝ゅ尯鍩熶负鍏ㄩ儴鍖哄煙")
pts = append(pts, Point{0, 0})
pts = append(pts, Point{0, 540})
pts = append(pts, Point{960, 540})
@@ -701,8 +704,7 @@
//logger.Info("瑙勫垯鐨勭畻娉昳d鍜屽尯鍩熺殑绠楁硶id锛�", rule.SdkId, "===", am.sdkId)
if rule.PolygonId == am.areaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
- if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" {
- // 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ
+ if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" && rule.SdkArgAlias != "compareBase"{
argValue, err := strconv.ParseFloat(rule.SdkArgValue, 64)
if err != nil {
logger.Error("瑙勫垯閰嶇疆鐨勯槇鍊奸潪娉�")
--
Gitblit v1.8.0