From 29db47f39c7bc0940592c96b587f51e4f0c659c1 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 14 十一月 2019 17:01:02 +0800
Subject: [PATCH] 看看缓存数据
---
ruleserver/ruleToformula.go | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index e754da2..7f2f17a 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -109,7 +109,7 @@
for _, areaMap := range sdkData.AreaMapList {
targets = append(targets,areaMap.AlarmObj...)
for _,obj := range areaMap.AlarmObj {
- logger.Info("涓綋闈欐鐨勭洰鏍�",obj.Id,obj.Location)
+ logger.Info("涓綋闈欐鐨勭洰鏍�",obj.Id,obj.Location,obj.CacheData)
}
}
}
@@ -174,6 +174,17 @@
}
}
logger.Debug("------locations鐨勫唴瀹癸細", yolos)
+ // 澶勭悊鐩爣瀹氭椂鏁版嵁
+ //targets := []*structure.Arg{}
+ //for _, sdkData := range args.Sdkdata {
+ // if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
+ // for _, areaMap := range sdkData.AreaMapList {
+ // if areaMap.IsEffective {
+ // yolos = append(yolos, putTargetsToResult(areaMap)...)
+ // }
+ // }
+ // }
+ //}
var islink bool
if groupRule.SetType == "linkTask" {
islink = true
@@ -191,6 +202,11 @@
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
labelTypes = append(labelTypes,1)
}
+ //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)))
+ // //labelTypes = append(labelTypes,2)
+ //}
// 缁欐寔缁椂闂寸殑绗竴寮犺祴浜堢紦瀛樻暟鎹紙閬嶅巻澶嶅埗锛�
if cacheId != "" { // 鏈夎繖甯ф暟鎹殑缂撳瓨
tempMap := make(map[string]interface{})
@@ -253,7 +269,14 @@
//logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return locations
}
-
+func putTargetsToResult(am *structure.AreaMap) []*structure.Arg {
+ locations := []*structure.Arg{}
+ if len(am.AlarmObj) > 0 {
+ locations = am.AlarmObj
+ }
+ //logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
+ return locations
+}
// 鑱斿姩浠诲姟鐨勫鐞�
func LinkTask(args *structure.SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label structure.Others) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
--
Gitblit v1.8.0