扩大全部区域判断范围

panlei

2019-07-15 6778d033d1659069119cd0fb7fc5947b29c1cd5e

 ruleserver/ruleToformula.go

@@ -546,10 +546,16 @@
         for k, timeEle := range TimeEleList {
            if strings.Contains(k, groupId) {
               if timeEle.AlarmFlag {
                  logger.Debug("------------------------------杀死定时器，报警此帧状态改变的数据，此时的计数器的值为",timeEle.N)
                  flagTime = "12"
                  args.RuleResult["timeLabel"] = flagTime
                  delete(TimeEleList,k)
                  if timeEle.BufferFlag == 0 {
                     logger.Debug("------------------------------杀死定时器，报警此帧状态改变的数据，此时的计数器的值为",timeEle.N)
                     flagTime = "12"
                     args.RuleResult["timeLabel"] = flagTime
                     delete(TimeEleList,k)
                  } else {
                     if timeEle.BufferFlag > 0 {
                        timeEle.BufferFlag--
                     }
                  }
               } else {
                  delete(TimeEleList,k)
               }
@@ -622,7 +628,7 @@
// 将字符串格式的坐标序列化为Point格式
func Json2points(areaPoints string) []Point {
   var pts []Point
   if areaPoints == "[]" {
   if areaPoints == "[]" || areaPoints == ""{
      logger.Error("=====================此区域为全部区域")
      pts = append(pts, Point{0, 0})
      pts = append(pts, Point{0, 540})
@@ -885,7 +891,7 @@

         if flag {
            timeLength, _ := strconv.Atoi(rule.SdkArgValue)
            timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, CacheSdkData: ResultMsg{message,args.RuleResult}} // 扔进去一个定时器元素（并缓存当前画面帧数据）
            timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false,BufferFlag:10, CacheSdkData: ResultMsg{message,args.RuleResult}} // 扔进去一个定时器元素（并缓存当前画面帧数据）
            //TimeEleList = make(map[string]timeElement)
            TimeEleList[groupId+" "+rule.Id] = &timeEle // 定时器元素以摄像机id拼接区域id为键
            logger.Info("创建了计数器并且计数器集合为：", TimeEleList)