panlei
2019-07-13 dd753957ef55cbb17dce17771fb17469f90088e6
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)
               }
@@ -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:6, CacheSdkData: ResultMsg{message,args.RuleResult}} // 扔进去一个定时器元素(并缓存当前画面帧数据)
            //TimeEleList = make(map[string]timeElement)
            TimeEleList[groupId+" "+rule.Id] = &timeEle // 定时器元素以摄像机id拼接区域id为键
            logger.Info("创建了计数器并且计数器集合为:", TimeEleList)