From 29203dd4304359e00584b35beaee83beb78a9a88 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 15 十一月 2019 13:36:48 +0800
Subject: [PATCH] --
---
ruleserver/ruleToformula.go | 18 +++++++++---------
algorithm/static/static.go | 7 ++++---
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index aa6e161..cd205fb 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -114,11 +114,12 @@
}
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,*lable})
+ 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, args.RuleResult}}
+ 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}
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 8b6506e..097c6c8 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -102,17 +102,17 @@
result := false
sdkNames := ""
polygonId := ""
- targets11 := []*structure.Arg{} // 绗﹀悎鏉′欢鐨勭洰鏍�
+ //targets11 := []*structure.Arg{} // 绗﹀悎鏉′欢鐨勭洰鏍�
// 鎶婁竴甯ф暟鎹拰涓�缁勮鍒欏彂缁欑畻娉曢儴鍒嗭紝寰楀嚭鍒ゆ柇缁撴灉
result,sdkNames,polygonId = CallMiddleware(args,*groupRule,&label,message)
- for _, sdkData := range args.Sdkdata {
- for _, areaMap := range sdkData.AreaMapList {
- targets11 = append(targets11,areaMap.AlarmObj...)
- for _,obj := range areaMap.AlarmObj {
- logger.Info("涓綋闈欐鐨勭洰鏍�",obj.Id, obj.Location, obj.CacheData.Cid, len(obj.CacheData.Data))
- }
- }
- }
+ //for _, sdkData := range args.Sdkdata {
+ // for _, areaMap := range sdkData.AreaMapList {
+ // targets11 = append(targets11,areaMap.AlarmObj...)
+ // for _,obj := range areaMap.AlarmObj {
+ // logger.Info("涓綋闈欐鐨勭洰鏍�",obj.Id, obj.Location, obj.CacheData.Cid, len(obj.CacheData.Data))
+ // }
+ // }
+ //}
//logger.Info("绗﹀悎鏉′欢鐨勭洰鏍囨暟鎹細",targets)
if result {
// 鏈�鍚庤繃鎸佺画鏃堕棿绛夋椂闂寸淮搴︾殑鏉′欢 鎶婃椂闂磋鍒欎綅缃皟鏁村埌杩欎釜浣嶇疆鏄负浜嗙紦瀛樻暟鎹� 锛侊紒锛侊紒锛乸s: 瀵圭敾闈腑鍗曚釜鐩爣鍋氬畾鏃跺櫒鐨勪笉鐢ㄥ啀杩囩敾闈㈠畾鏃跺櫒
--
Gitblit v1.8.0