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 +++++++++++++++++++++++++--
algorithm/static/static.go | 14 +++++---------
2 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index f33faf2..813abe2 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -116,7 +116,7 @@
logger.Info("涔嬪墠鏃犵紦瀛�")
objs := []*structure.Obj{}
for _, tar := range am.FilterData {
- obj := &structure.Obj{Id: tar.Id, Location: tar.Location, N: initN,InitN:initN}
+ obj := &structure.Obj{Id: tar.Id, Location: tar.Location, N: initN,InitN:initN,CacheSdkData:structure.ResultMsg{message, nil}}
objs = append(objs, obj)
}
structure.StaticMap[am.AreaId] = &structure.CameraArea{objs}
@@ -190,20 +190,20 @@
}
}
if flag { // 褰撳墠妫�娴嬪璞′繚鎸侀潤姝紙id鐩哥瓑骞朵笖閲嶅悎搴﹂珮浜庨槇鍊硷級
- flagTime := TimerAlarm(lable,person,flag,am.AreaId)
+ flagTime := TimerAlarm(o,person,flag,am.AreaId)
if flagTime == "10" || flagTime == "11" {
return flag,o
} else {
return false,o
}
} else {
- TimerAlarm(lable,person,flag,am.AreaId)
+ TimerAlarm(o,person,flag,am.AreaId)
return flag,o
}
}
var rw sync.RWMutex
// 鍒ゆ柇鏄惁绗﹀悎瀹氭椂鍣ㄦ潯浠�
-func TimerAlarm(oth *structure.Others,person *structure.Obj, result bool,areaId string) (string) {
+func TimerAlarm(o *structure.Arg,person *structure.Obj, result bool,areaId string) (string) {
var flagTime string //
logger.Info("鐩爣鐨勫畾鏃跺櫒锛�")
rw.Lock()
@@ -214,15 +214,12 @@
if tar.N == 0 && tar.AlarmFlag {
logger.Debug("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
flagTime = "11"
- oth.TimeLabel = flagTime
}
if tar.N == 0 && !tar.AlarmFlag { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0 鏆備笖璁や负涓�缁勮鍒欏彧鏈変竴涓畾鏃跺櫒
logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
flagTime = "10"
tar.AlarmFlag = true
- oth.CacheData = []structure.ResultMsg{}
- oth.CacheData = append(oth.CacheData,tar.CacheSdkData)
- oth.TimeLabel = flagTime
+ o.CacheData = tar.CacheSdkData
}
if tar.N != 0 {
flagTime = "00"
@@ -239,7 +236,6 @@
if tar.BufferFlag == 0 {
logger.Debug("------------------------------鏉�姝昏鏁板櫒锛屾姤璀︽甯х姸鎬佹敼鍙樼殑鏁版嵁锛屾鏃剁殑璁℃暟鍣ㄧ殑鍊间负", tar.N)
flagTime = "12"
- oth.TimeLabel = flagTime
structure.StaticMap[areaId].Targets = append(structure.StaticMap[areaId].Targets[:index],structure.StaticMap[areaId].Targets[index+1:]...)
} else {
if tar.BufferFlag > 0 {
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