From 40ff82ab78140e77e7b9352fb461ac604fcd3a96 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 15 十一月 2019 18:14:35 +0800
Subject: [PATCH] 目标类型整体插入
---
algorithm/static/static.go | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index 3ceb127..f5faa99 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -114,18 +114,20 @@
}
if len(am.FilterData) < 0 {
logger.Info("鏈抚鍖哄煙鍐呮棤鏁版嵁锛岃繑鍥�")
+ // 娓呯┖缂撳瓨鐨勭洰鏍�
+
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
m := make(map[string]interface{})
m["target"] = []structure.Result{}
m["target"] = append(m["target"].([]structure.Result), structure.Result{args.TaskId, "", "", true, 0, "", am.FilterData, am.AreaJson, false,*lable})
- if structure.StaticMap[am.AreaId] == nil || len(structure.StaticMap[am.AreaId].Targets) == 0 { // 鍗崇涓�甯ф暟鎹�(涔熶笉涓�瀹�)锛岃繕娌℃湁缂撳瓨
+ if structure.StaticMap[am.AreaId] == nil || len(structure.StaticMap[am.AreaId].Targets) == 0 {
logger.Info("涔嬪墠鏃犵紦瀛樺苟涓旀娆″尯鍩熷唴鏈変汉")
objs := []*structure.Obj{}
for _, tar := range am.FilterData {
- obj := &structure.Obj{Id: tar.Id, Location: tar.Location, N: initN, InitN:initN,AlarmFlag: false, BufferFlag: 10, CacheSdkData:structure.ResultMsg{message, m}}
+ obj := &structure.Obj{Id: tar.Id, Location: tar.Location, N: initN, InitN:initN, AlarmFlag: false, BufferFlag: 10, CacheSdkData:structure.ResultMsg{message, m}}
objs = append(objs, obj)
}
structure.StaticMap[am.AreaId] = &structure.CameraArea{objs}
@@ -151,7 +153,6 @@
// 鎶婃弧瓒虫潯浠剁殑鐩爣鏀捐繘areaMap涓�
am.AlarmObj = tars
// 鏇存柊鏁版嵁,鎶婃柊鏉ョ殑鏁版嵁鍐欏叆缂撳瓨
- objs := []*structure.Obj{}
for _, tar := range am.FilterData {
flag1 := false
for _, OBJ := range structure.StaticMap[am.AreaId].Targets {
@@ -159,12 +160,11 @@
flag1 = true
}
}
- if !flag1 { // 闆嗗悎涓病鏈夌殑鎵嶆彃鍏�
- obj := &structure.Obj{Id: tar.Id, Location: tar.Location, N: initN,InitN:initN,AlarmFlag: false, BufferFlag: 10, CacheSdkData: structure.ResultMsg{message, m}}
- objs = append(objs, obj)
+ if !flag1 { // 闆嗗悎涓病鏈夌殑鎵嶆彃鍏�
+ obj := &structure.Obj{Id: tar.Id, Location: tar.Location, N: initN, InitN:initN,AlarmFlag: false, BufferFlag: 10, CacheSdkData: structure.ResultMsg{message, m}}
+ structure.StaticMap[am.AreaId].Targets = append(structure.StaticMap[am.AreaId].Targets, obj)
}
}
- structure.StaticMap[am.AreaId] = &structure.CameraArea{objs}
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
}
--
Gitblit v1.8.0