From 72b7bd50772b4e9a466d5a7b30350639b61a9ffb Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 15 十一月 2019 10:44:37 +0800
Subject: [PATCH] 新建目标数据存入方法
---
ruleserver/ruleToformula.go | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 3335889..12f138d 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -175,16 +175,16 @@
}
logger.Debug("------locations鐨勫唴瀹癸細", yolos)
// 澶勭悊鐩爣瀹氭椂鏁版嵁
- //targets := []*structure.Arg{}
- //for _, sdkData := range args.Sdkdata {
- // if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
- // for _, areaMap := range sdkData.AreaMapList {
- // if areaMap.IsEffective {
- // yolos = append(yolos, putTargetsToResult(areaMap)...)
- // }
- // }
- // }
- //}
+ targets := []*structure.Arg{}
+ for _, sdkData := range args.Sdkdata {
+ if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
+ for _, areaMap := range sdkData.AreaMapList {
+ if areaMap.IsEffective {
+ targets = append(targets, putTargetsToResult(areaMap)...)
+ }
+ }
+ }
+ }
var islink bool
if groupRule.SetType == "linkTask" {
islink = true
@@ -202,11 +202,11 @@
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
labelTypes = append(labelTypes,1)
}
- //if len(targets) > 0 {
- // args.RuleResult["target"] = append(args.RuleResult["target"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, targets, polygonId, islink,label})
- // //logger.Info("-------------------鐩爣鎸佺画缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
- // //labelTypes = append(labelTypes,2)
- //}
+ if len(targets) > 0 {
+ args.RuleResult["target"] = append(args.RuleResult["target"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, targets, polygonId, islink,label})
+ //logger.Info("-------------------鐩爣鎸佺画缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
+ //labelTypes = append(labelTypes,2)
+ }
// 缁欐寔缁椂闂寸殑绗竴寮犺祴浜堢紦瀛樻暟鎹紙閬嶅巻澶嶅埗锛�
if cacheId != "" { // 鏈夎繖甯ф暟鎹殑缂撳瓨
tempMap := make(map[string]interface{})
--
Gitblit v1.8.0