From d12b1401c5ee616b107bc60ee32df4f93b4f18c3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 31 七月 2019 15:51:03 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 7a4fe96..8069d4e 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -399,7 +399,7 @@
}
}
if flag1 {
- TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre,nil})
+ TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre,ResultMsg{}})
}
}
}
@@ -412,7 +412,8 @@
for _, va := range timeEle.RuleResults {
if va.CameraId == args.CameraId {
va.Result = strconv.FormatBool(isOk)
- va.CacheData = ResultMsg{message,args.RuleResult}
+
+ //va.CacheData = ResultMsg{message,args.RuleResult}
logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
}
}
@@ -440,11 +441,11 @@
if result.(bool) {
logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
// 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
- label["linkCache"] = []*ResultMsg{}
+ label["linkCache"] = []ResultMsg{}
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
label["linkCache"] = append(label["linkCache"].([]ResultMsg),ruleRes.CacheData)
}
- logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]*ResultMsg)))
+ logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]ResultMsg)))
//os.Exit(1)
}
}
--
Gitblit v1.8.0