~jinersong/ruleprocess.git

			@@ -4,7 +4,7 @@

			require (
			basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1
			basic.com/pubsub/protomsg.git v0.0.0-20190622023307-97ef3bf336ef
			basic.com/pubsub/protomsg.git v0.0.0-20190622044013-0d3ee5a9c502
			basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
			github.com/Microsoft/go-winio v0.4.12 // indirect
			github.com/ajg/form v1.5.1 // indirect

			@@ -2,6 +2,8 @@
			basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
			basic.com/pubsub/protomsg.git v0.0.0-20190622023307-97ef3bf336ef h1:gUV9FEa23v+2AY4Rvrwh6omHBlV+qyae58GTU8NAv3Y=
			basic.com/pubsub/protomsg.git v0.0.0-20190622023307-97ef3bf336ef/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
			basic.com/pubsub/protomsg.git v0.0.0-20190622044013-0d3ee5a9c502 h1:H+//LYF4+YwVD2A9GUP0ETL8p5RANgtDHpOgu/421sE=
			basic.com/pubsub/protomsg.git v0.0.0-20190622044013-0d3ee5a9c502/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
			basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 h1:9flC2o3kasaM2Y6I+mY+mxmve/pyAY/UzGQZLT3lFHM=
			basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
			code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=

			@@ -110,7 +110,7 @@
			type Result struct {
			TaskId string // 任务id
			RuleGroupId string // 规则组id
			AlarmLevel string // 报警等级
			AlarmLevel int32 // 报警等级
			RuleText string // 文字版规则组
			}

			@@ -347,7 +347,7 @@
			if flag {
			fmt.Println("定时器报警了")
			// 过完规则后打个标签，告诉调用者本帧数据针对哪个任务哪组规则报警了
			arg.RuleResult = append(arg.RuleResult, Result{taskId, groupRule.GroupId,groupRule.AlarmLevel,groupRule.RuleText})
			arg.RuleResult = append(arg.RuleResult, Result{taskId, groupRule.GroupId,groupRule.AlarmLevel,groupRule.GroupText})
			return true
			} else {
			return false

	go.mod	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	go.sum	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruleserver/ruleToformula.go	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史