From 140e5169172c898527af85704d67f72e8af8a025 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 10:15:24 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index b4b84f7..73f84b7 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鏍囩
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
@@ -431,6 +431,11 @@
for k,result := range args.RuleResult {
tempMap[k] = result
}
+ for _,result := range args.RuleResult["yolo"].([]Result) {
+ for k,_ := range result.Others {
+ logger.Warn("鏀捐繘鑱斿姩缂撳瓨鐨勯敭鏄�",k)
+ }
+ }
va.CacheData = ResultMsg{message,tempMap}
logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
}
@@ -469,15 +474,11 @@
// result.Others["linkCache"] = label
// }
//}
- tempMap := make(map[string]interface{})
- for k,result := range args.RuleResult {
- tempMap[k] = result
- }
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],tempMap["yolo"].([]Result)[i+1:]...)
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result)[:i],args.RuleResult["yolo"].([]Result)[i+1:]...)
args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result),res)
}
}
--
Gitblit v1.8.0