From 2b5f0681383dce4e352c7b8daee6e09e0458bc7c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 31 七月 2019 15:32:28 +0800
Subject: [PATCH] 联动任务缓存数据(结构重整)---指针换成值

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

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index fe2796d..7a4fe96 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -412,7 +412,7 @@
 		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)
 			}
 		}
@@ -442,7 +442,7 @@
 					// 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
 					label["linkCache"] = []*ResultMsg{}
 					for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
-						label["linkCache"] = append(label["linkCache"].([]*ResultMsg),ruleRes.CacheData)
+						label["linkCache"] = append(label["linkCache"].([]ResultMsg),ruleRes.CacheData)
 					}
 					logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]*ResultMsg)))
 					//os.Exit(1)
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index 2bd8280..8c9e980 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -28,7 +28,7 @@
 	Sort        int32     // 鎽勫儚鏈哄湪瑙勫垯缁勪腑搴忓彿
 	Result      string    // 鎽勫儚鏈鸿繃婊ゆ暟鎹緱鍑虹殑缁撴灉
 	RuleWithPre string    // 鎽勫儚鏈轰箣闂寸殑杩炴帴绗�
-	CacheData   *ResultMsg // 缂撳瓨褰撳墠甯ф暟鎹�
+	CacheData   ResultMsg // 缂撳瓨褰撳墠甯ф暟鎹�
 }
 
 func TimeTicker() {

--
Gitblit v1.8.0