From 0af42b765509096a3300bdb6a31f2b56f2854c5d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 03 七月 2019 18:53:52 +0800
Subject: [PATCH] 注释掉联动任务

---
 ruleserver/ruleToformula.go |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index e273b15..0521e83 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -217,7 +217,7 @@
 					if len(temp) > 0 {
 						if ruleList[i].SetType == "linkTask" {
 							// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
-							LinkTask(args, ruleList[i], taskId)
+							//LinkTask(args, ruleList[i], taskId)
 						} else {
 							// 鐙珛浠诲姟鐨勫鐞�
 							RunRule(args, ruleList[i], taskId)
@@ -448,6 +448,7 @@
 // 鑱斿姩浠诲姟鐨勫鐞�
 func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) {
 	// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
+	log.Println("------------------------------------------褰撳墠鏄仈鍔ㄤ换鍔★紝瑙勫垯鏄細",groupRule.GroupText)
 	var flag bool = true
 	var timeEle = TimeElement{N: 3, InitN: 3, GroupId: groupRule.GroupId}
 	for k, timeEle1 := range TimeEleList {
@@ -500,6 +501,7 @@
 			for _, va := range timeEle.RuleResults {
 				completeFormula = completeFormula + va.RuleWithPre + "" + va.Result
 			}
+			log.Println("---------------------------鑱斿姩浠诲姟鐨勫叕寮�",completeFormula)
 			if completeFormula != "" {
 				expression, _ := govaluate.NewEvaluableExpression(completeFormula)
 				result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�

--
Gitblit v1.8.0