~jinersong/ruleprocess.git

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

			import (
			"basic.com/pubsub/protomsg.git"
			"basic.com/valib/logger.git"
			logger "github.com/jeanphorn/log4go"
			"github.com/knetic/govaluate"
			"ruleprocess/ruleserver"
			"ruleprocess/structure"
			@@ -142,7 +142,7 @@
			// logger.Info("具体目标：",tar.Location)
			//}
			for _, tar := range structure.StaticMap[am.AreaId].Targets {
			singleResult,arg := SingleStatic(tar,am,lable,90)
			singleResult,arg := SingleStatic(tar,am,lable,95)
			if singleResult {
			flag = "true"
			tars = append(tars,arg)
			@@ -223,11 +223,14 @@
			if tar.N == 0 && tar.AlarmFlag {
			logger.Debug("-------------------------符合持续时间规则但并不是首次，不报警")
			flagTime = "11"
			o.TimeLable = flagTime
			o.CacheData = tar.CacheSdkData
			}
			if tar.N == 0 && !tar.AlarmFlag { // 这组规则的定时器要全部等于0 暂且认为一组规则只有一个定时器
			logger.Debug("———————————-------------首次符合持续时间规则并报警")
			flagTime = "10"
			tar.AlarmFlag = true
			o.TimeLable = flagTime
			o.CacheData = tar.CacheSdkData
			}
			if tar.N != 0 {