把数据定义模块儿提取出来

panlei

2019-08-15 6f1ae979d13028006ccdca01e310d2b5d2d53c5c

 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 { // 首先规则所对应的区域id要跟区域数据的id对的上
      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("取时间规则时反序列化错误！")