From 5d6651a0c9e966307d66769e8581e6da205faaab Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 15 十一月 2019 14:25:43 +0800
Subject: [PATCH] 完善静止算法
---
algorithm/static/static.go | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index d9857a6..6dbd73e 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -113,16 +113,19 @@
}
}
if len(am.FilterData) < 0 {
+ logger.Info("鏈抚鍖哄煙鍐呮棤鏁版嵁锛岃繑鍥�")
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
- if (structure.StaticMap[am.AreaId] == nil || len(structure.StaticMap[am.AreaId].Targets) == 0) { // 鍗崇涓�甯ф暟鎹�(涔熶笉涓�瀹�)锛岃繕娌℃湁缂撳瓨
+ 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 { // 鍗崇涓�甯ф暟鎹�(涔熶笉涓�瀹�)锛岃繕娌℃湁缂撳瓨
logger.Info("涔嬪墠鏃犵紦瀛樺苟涓旀娆″尯鍩熷唴鏈変汉")
- 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})
+
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, m}}
+ obj := &structure.Obj{Id: tar.Id, Location: tar.Location, N: initN, InitN:initN, CacheSdkData:structure.ResultMsg{message, m}}
objs = append(objs, obj)
}
structure.StaticMap[am.AreaId] = &structure.CameraArea{objs}
@@ -132,12 +135,12 @@
flag := "false"
// 浠ヤ箣鍓嶉潤姝㈢殑瀵硅薄涓轰富鍒ゆ柇鏄惁闈欐
tars := []*structure.Arg{}
- logger.Info("鐪嬩竴涓嬮潤姝㈠尯鍩熷唴鐨勭洰鏍囷細",am.AreaId)
+ //logger.Info("鐪嬩竴涓嬮潤姝㈠尯鍩熷唴鐨勭洰鏍囷細",am.AreaId)
+ //for _, tar := range structure.StaticMap[am.AreaId].Targets {
+ // logger.Info("鍏蜂綋鐩爣锛�",tar.Location)
+ //}
for _, tar := range structure.StaticMap[am.AreaId].Targets {
- logger.Info("鍏蜂綋鐩爣锛�",tar.Location)
- }
- for _, tar := range structure.StaticMap[am.AreaId].Targets {
- singleResult,arg := SingleStatic(tar,am,lable,90)
+ singleResult,arg := SingleStatic(tar,am,lable,95)
if singleResult {
flag = "true"
tars = append(tars,arg)
@@ -149,15 +152,15 @@
am.AlarmObj = tars
// 鏇存柊鏁版嵁,鎶婃柊鏉ョ殑鏁版嵁鍐欏叆缂撳瓨
objs := []*structure.Obj{}
- for _, tar := range am.FilterData {
+ for _, tar := range am.FilterData {m
flag1 := false
for _, OBJ := range structure.StaticMap[am.AreaId].Targets {
if tar.Id == OBJ.Id {
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, nil}}
+ 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)
}
}
--
Gitblit v1.8.0