From 6f1ae979d13028006ccdca01e310d2b5d2d53c5c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 15 八月 2019 16:27:44 +0800
Subject: [PATCH] 把数据定义模块儿提取出来
---
algorithm/timeSlot/timeSlot.go | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/algorithm/timeSlot/timeSlot.go b/algorithm/timeSlot/timeSlot.go
index b3de4a1..4c3150d 100644
--- a/algorithm/timeSlot/timeSlot.go
+++ b/algorithm/timeSlot/timeSlot.go
@@ -6,11 +6,11 @@
"github.com/knetic/govaluate"
"ruleprocess/cache"
"ruleprocess/logger"
- "ruleprocess/ruleserver"
+ "ruleprocess/structure"
"time"
)
-func TimeRuleResult(rule *protomsg.Rule, am *ruleserver.AreaMap) ruleserver.LittleRuleResult {
+func TimeRuleResult(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "time_rule" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙�
//logger.Info("----------褰撳墠鏃堕棿瑙勫垯锛�---------", rule)
@@ -39,7 +39,7 @@
break
}
}
- return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
if rule.Operator == "unsatisfy" || rule.Operator == "!=" { // 涓嶆弧瓒虫墍閫夌殑鏃堕棿瑙勫垯
@@ -59,18 +59,18 @@
break
}
}
- return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
}
}
- return ruleserver.LittleRuleResult{}
+ return structure.LittleRuleResult{}
}
// 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
-func GetTimeById(id string, index int) []ruleserver.TimeRange {
+func GetTimeById(id string, index int) []structure.TimeRange {
_, cameraTimeRule := cache.GetTimeRuleById(id)
- var timeRangeList []ruleserver.Day
+ var timeRangeList []structure.Day
err := json.Unmarshal([]byte(cameraTimeRule.TimeRule), &timeRangeList)
if err != nil {
logger.Error("鍙栨椂闂磋鍒欐椂鍙嶅簭鍒楀寲閿欒锛�")
--
Gitblit v1.8.0