From b121c021391d550b319b76064b31b23a440583ac Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 31 七月 2019 18:55:18 +0800
Subject: [PATCH] label重大更新
---
ruleserver/ruleToformula.go | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 1c09054..186c097 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -328,13 +328,17 @@
}
}
}
+ nihao := make(map[string]interface{})
+ for k,v := range label{
+ nihao[k] = v
+ }
//logger.Debug("------locations鐨勫唴瀹癸細", locations)
if sdkNames != "" {
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,label})
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,nihao})
//logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
}
if faceFlag {
- args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId,label},faces})
+ args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId,nihao},faces})
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
}
return true
@@ -456,7 +460,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