From 5d6651a0c9e966307d66769e8581e6da205faaab Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 15 十一月 2019 14:25:43 +0800
Subject: [PATCH] 完善静止算法
---
ruleserver/ruleToformula.go | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 12f138d..097c6c8 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -102,17 +102,17 @@
result := false
sdkNames := ""
polygonId := ""
- targets := []*structure.Arg{} // 绗﹀悎鏉′欢鐨勭洰鏍�
+ //targets11 := []*structure.Arg{} // 绗﹀悎鏉′欢鐨勭洰鏍�
// 鎶婁竴甯ф暟鎹拰涓�缁勮鍒欏彂缁欑畻娉曢儴鍒嗭紝寰楀嚭鍒ゆ柇缁撴灉
result,sdkNames,polygonId = CallMiddleware(args,*groupRule,&label,message)
- for _, sdkData := range args.Sdkdata {
- for _, areaMap := range sdkData.AreaMapList {
- targets = append(targets,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: 瀵圭敾闈腑鍗曚釜鐩爣鍋氬畾鏃跺櫒鐨勪笉鐢ㄥ啀杩囩敾闈㈠畾鏃跺櫒
@@ -204,7 +204,7 @@
}
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)))
+ logger.Info("-------------------鐩爣鎸佺画缁撴灉鏍囩", len(args.RuleResult["target"].([]structure.Result)))
//labelTypes = append(labelTypes,2)
}
// 缁欐寔缁椂闂寸殑绗竴寮犺祴浜堢紦瀛樻暟鎹紙閬嶅巻澶嶅埗锛�
@@ -238,6 +238,7 @@
// 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏉�姝诲畾鏃跺櫒鐨勬搷浣�
TimerAlarm(&label, groupRule.GroupId, result)
//fmt.Println(timeFlag)
+ logger.Info("涓嶇鍚堣鍒�")
return false,[]int{}
}
}
--
Gitblit v1.8.0