From 7f27fef93bd62eb1367a43430fee594cf33eb54e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 12 七月 2019 16:49:59 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 2 +-
ruleserver/ruleToformula.go | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 2f6d7ca..99e8323 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -296,7 +296,7 @@
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
- logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細",resp)
}
} else {
isAlarm = 0
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 0ff5a7d..3294759 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -122,7 +122,7 @@
type SdkDatas struct {
CameraId string
Sdkdata []*SdkData
- RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []Arg yolo: []Result
+ RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []Arg yolo: []Result cacheData: SdkDatas
}
// 灏嗕紶閫掕繃鏉ョ殑鍙傛暟杞寲涓�
@@ -470,6 +470,7 @@
}
}
}
+ //TimerAlarm(args,groupRule.GroupId)
if flag {
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
@@ -500,6 +501,7 @@
}
}
}
+ logger.Debug("------locations鐨勫唴瀹癸細",locations)
if sdkNames != "" {
args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, locations,polygonId})
logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
@@ -516,14 +518,15 @@
return false
}
}
-func TimerAlarm(groupId string) (int) {
- var flagTime int = 0
+func TimerAlarm(args SdkDatas,groupId string) (int) {
+ var flagTime int = 0 // 涓�0鐨勬剰鎬濇槸
for k, timeEle := range TimeEleList {
if strings.Contains(k, groupId) {
if timeEle.N == 0 && !timeEle.AlarmFlag { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0 鏆備笖璁や负涓�缁勮鍒欏彧鏈変竴涓畾鏃跺櫒
logger.Info("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
flagTime = 1
timeEle.AlarmFlag = true
+ args.RuleResult["cacheData"] = timeEle.CacheSdkData
}
if timeEle.N == 0 && timeEle.AlarmFlag {
logger.Info("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
--
Gitblit v1.8.0