From 9c9d127a3e6d117da7e914689c88e6bbff922269 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 15:57:30 +0800
Subject: [PATCH] 联动任务---

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

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 4f8151d..7634abd 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -426,6 +426,9 @@
 			timeEle = *timeEle1
 		}
 	}
+	for _,ruleRe := range timeEle.RuleResults {
+		logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁----",ruleRe.CameraId,ruleRe.Sort)
+	}
 	if flag { // 濡傛灉杩樻病鏈夎繖涓畾鏃跺櫒鍏冪礌灏辨柊澧炰竴涓�
 		//timeEle := TimeElement{N: 2, InitN: 2, GroupId: groupRule.GroupId} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
 		//TimeEleList = make(map[string]timeElement)
@@ -445,6 +448,7 @@
 			}
 		}
 	}
+	logger.Info("")
 	// 寰�鏁扮粍閲岃祴鍊�
 	isOk,labelTypes := RunRule(args, groupRule, taskId, message, label)
 	if isOk {
@@ -475,10 +479,8 @@
 		}
 		// 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
 		var isPerfect = true
-		logger.Info("鑱斿姩浠诲姟鏁扮粍锛�")
 		for _, va := range timeEle.RuleResults {
 			//logger.Info("---------------------鐬呯瀰褰撳墠鏁扮粍________________锛�", *va)
-			logger.Info("鑱斿姩瀛愬厓绱狅細",va.Sort,va.RuleWithPre,va.Result,va.CameraId)
 			if va.Result == "" && va.RuleWithPre != "||" {
 				isPerfect = false
 			}

--
Gitblit v1.8.0