~jinersong/ruleprocess.git

			@@ -2,7 +2,7 @@

			import (
			"fmt"
			"ruleprocess/logger"
			"basic.com/valib/logger.git"
			"ruleprocess/structure"
			"strings"
			"time"
			@@ -33,36 +33,36 @@
			}

			func TimeTicker() {
			//logger.Info("定时器执行了")
			//fmt.Println("定时器执行了")
			ticker := time.NewTicker(1 * time.Second)
			go func(ticker *time.Ticker) {
			defer ticker.Stop()
			for {
			select {
			case <-ticker.C:
			logger.Info("定时器执行单元", time.Now().Unix())
			fmt.Println("定时器执行单元", time.Now().Unix())
			// 每秒钟计数器池子里所有的计数器元素都减一，减到0的是该报警的
			for k, timeEle := range TimeEleList {
			if timeEle.N > 0 {
			timeEle.N = timeEle.N - 1
			logger.Error("-------------------------------------打印定时器计数元素当前值-----------------------------------------：", timeEle.N)
			}
			if timeEle.GroupId != "" && timeEle.N == 0 {
			// 说明是联动任务的时间窗口到点儿了该销毁了,再来了再创建
			delete(TimeEleList, k)
			}
			//go func(ticker *time.Ticker) {
			defer ticker.Stop()
			for {
			select {
			case <-ticker.C:
			logger.Info("定时器执行单元", time.Now().Unix())
			fmt.Println("定时器执行单元", time.Now().Unix())
			// 每秒钟计数器池子里所有的计数器元素都减一，减到0的是该报警的
			rw.Lock()
			for k, timeEle := range TimeEleList {
			if timeEle.N > 0 {
			timeEle.N = timeEle.N - 1
			logger.Error("-------------------------------------打印定时器计数元素当前值-----------------------------------------：", timeEle.N)
			}
			case stop := <-stopChan:
			if stop {
			logger.Info("定时器结束")
			return
			//os.Exit(0)
			if timeEle.GroupId != "" && timeEle.N == 0 {
			// 说明是联动任务的时间窗口到点儿了该销毁了,再来了再创建
			delete(TimeEleList, k)
			}
			}
			rw.Unlock()
			case stop := <-stopChan:
			if stop {
			logger.Info("定时器结束")
			return
			//os.Exit(0)
			}
			}
			}(ticker)
			}
			//}(ticker)
			}
			func StopTimeTicker() {
			stopChan <- true
			@@ -74,6 +74,7 @@
			var flagTime string //
			// 判断有无此规则组的定时器
			flag := false
			rw.Lock()
			for k, _ := range TimeEleList {
			//logger.Debug("-----------------看看这个key和groupId", k, groupId)
			if strings.Contains(k, groupId) && k != groupId{
			@@ -116,10 +117,12 @@
			delete(TimeEleList, k)
			} else {
			if timeEle.BufferFlag > 0 {
			logger.Debug("缓冲区减减")
			timeEle.BufferFlag--
			}
			}
			} else {
			logger.Debug("-----------结果为假且不到0，杀死定时器")
			delete(TimeEleList, k)
			}
			}
			@@ -133,6 +136,7 @@
			flagTime = "00"
			}
			}
			rw.Unlock()
			return flagTime
			}