From 4e1f09e0e7cde7912bd5a6739fb06efdd977efae Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 07 八月 2019 11:23:51 +0800
Subject: [PATCH] 所过的规则组标识时联动任务还是独立任务
---
ruleserver/ruleToformula.go | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 64aa870..32f1bcd 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -40,6 +40,7 @@
args []*Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
filterData []*Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
time string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
+ isEffective bool // 瑙勫垯涓槸鍚︾敤鍒颁簡姝ゅ尯鍩�
keepRight bool // 鏄惁闈犲彸琛�
isStatic bool // 鏄惁闈欐
}
@@ -90,6 +91,7 @@
RuleText string // 鏂囧瓧鐗堣鍒欑粍
Location []Rect // 鐩爣鐨勫潗鏍�
AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
+ IsLink bool // 鏄惁鏄仈鍔ㄤ换鍔�
Others
}
type Others struct {
@@ -336,12 +338,18 @@
}
}
//logger.Debug("------locations鐨勫唴瀹癸細", locations)
+ var islink bool
+ if groupRule.SetType == "linlkTask" {
+ islink = true
+ } else {
+ islink = false
+ }
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, islink,label,})
//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, islink,label,}, faces})
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
logger.Info("杩囧畬瑙勫垯鏃舵煡鐪嬩汉鑴告爣绛撅細")
if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]FaceResult)) > 0 {
--
Gitblit v1.8.0