From 5729425c8552b08d80f3b4c3488d0436c42fd50e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 09:41:43 +0800
Subject: [PATCH] label重大更新
---
ruleserver/ruleToformula.go | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 65491c1..41ec675 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -427,7 +427,11 @@
for _, va := range timeEle.RuleResults {
if va.CameraId == args.CameraId {
va.Result = strconv.FormatBool(isOk)
- va.CacheData = ResultMsg{message,args.RuleResult}
+ tempMap := make(map[string]interface{})
+ for k,result := range args.RuleResult {
+ tempMap[k] = result
+ }
+ va.CacheData = ResultMsg{message,tempMap}
logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
}
}
@@ -460,7 +464,19 @@
label["linkCache"] = append(label["linkCache"].([]ResultMsg),ruleRes.CacheData)
}
logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]ResultMsg)))
- //os.Exit(1)
+ //for _,result := range args.RuleResult["yolo"].([]Result) {
+ // if result.RuleGroupId == groupRule.GroupId {
+ // result.Others["linkCache"] = label
+ // }
+ //}
+ for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
+ if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婂師鏉ラ偅涓垹鎺夊啀瀛樹竴浠芥柊鐨�
+ res := args.RuleResult["yolo"].([]Result)[i]
+ res.Others["linkCache"] = label["linkCache"]
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result)[:i],args.RuleResult["yolo"].([]Result)[i+1:]...)
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result),res)
+ }
+ }
}
}
} else {
--
Gitblit v1.8.0