From 466947c1eeda6938ab6ef11497f6c8a96a574920 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 13 十一月 2019 14:46:57 +0800
Subject: [PATCH] targetLocation
---
ruleserver/ruleToformula.go | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c9407ed..bb78fda 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -2,21 +2,15 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
"github.com/knetic/govaluate"
"plugin"
"ruleprocess/cache"
- "ruleprocess/structure"
"ruleprocess/logger"
"ruleprocess/structure"
"sort"
"strconv"
"strings"
"sync"
- "time"
-
- "basic.com/pubsub/protomsg.git"
- "github.com/knetic/govaluate"
)
@@ -196,7 +190,7 @@
}
}
}
- //logger.Debug("------locations鐨勫唴瀹癸細", locations)
+ logger.Debug("------locations鐨勫唴瀹癸細", locations)
var islink bool
if groupRule.SetType == "linkTask" {
islink = true
@@ -436,6 +430,7 @@
// 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
func duration(rule *protomsg.Rule, groupId string, am *structure.AreaMap, args *structure.SdkDatas, message *protomsg.SdkMessage) string{
+ cacheId := ""
if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
//logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
--
Gitblit v1.8.0