From 740800875ea9f2b02674d91d4246bbf070d3a760 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 10:02:15 +0800
Subject: [PATCH] label重大更新
---
ruleserver/ruleToformula.go | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 186c097..bce9a16 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -297,7 +297,7 @@
}
// 杩涜瀹氭椂鍣ㄧ殑澶勭悊鍜屽垽鏂�
timeFlag := TimerAlarm(label, groupRule.GroupId, result.(bool))
- if timeFlag == "01" || timeFlag == "10" || timeFlag == "11" { // 婊¤冻瀹氭椂鍣ㄦ潯浠�
+ if timeFlag == "01" || timeFlag == "10" || timeFlag == "11" { // 娌℃湁瀹氭椂鍣ㄦ垨鑰呮弧瓒冲畾鏃跺櫒鏉′欢
// 鎵撲汉鑴告爣绛惧拰yolo鏍囩
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
@@ -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,11 +464,11 @@
label["linkCache"] = append(label["linkCache"].([]ResultMsg),ruleRes.CacheData)
}
logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]ResultMsg)))
- for _,result := range args.RuleResult["yolo"].([]Result) {
- if result.RuleGroupId == groupRule.GroupId {
- result.Others["linkCache"] = label
- }
- }
+ //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]
--
Gitblit v1.8.0