From f9b37525a5901d59edf9235c7df4ffd192d35943 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 15 十一月 2019 11:34:34 +0800
Subject: [PATCH] ---
---
algorithm/static/static.go | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index 813abe2..75fec1f 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -112,11 +112,13 @@
initN = init
}
}
- if structure.StaticMap[am.AreaId] == nil || len(structure.StaticMap[am.AreaId].Targets) == 0 { // 鍗崇涓�甯ф暟鎹�(涔熶笉涓�瀹�)锛岃繕娌℃湁缂撳瓨
- logger.Info("涔嬪墠鏃犵紦瀛�")
+ if (structure.StaticMap[am.AreaId] == nil || len(structure.StaticMap[am.AreaId].Targets) == 0) && len(am.FilterData) > 0 { // 鍗崇涓�甯ф暟鎹�(涔熶笉涓�瀹�)锛岃繕娌℃湁缂撳瓨
+ logger.Info("涔嬪墠鏃犵紦瀛樺苟涓旀娆″尯鍩熷唴鏈変汉")
+ args.RuleResult["target"] = []structure.Result{}
+ args.RuleResult["target"] = append(args.RuleResult["target"].([]structure.Result), structure.Result{args.TaskId, "", "", true, 0, "", am.FilterData, am.AreaJson, false,nil})
objs := []*structure.Obj{}
for _, tar := range am.FilterData {
- obj := &structure.Obj{Id: tar.Id, Location: tar.Location, N: initN,InitN:initN,CacheSdkData:structure.ResultMsg{message, nil}}
+ obj := &structure.Obj{Id: tar.Id, Location: tar.Location, N: initN,InitN:initN,CacheSdkData:structure.ResultMsg{message, args.RuleResult}}
objs = append(objs, obj)
}
structure.StaticMap[am.AreaId] = &structure.CameraArea{objs}
--
Gitblit v1.8.0