From b149d73c29df3170af79d4d85da1be44692b3acc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 30 七月 2019 20:30:36 +0800
Subject: [PATCH] 联动任务缓存数据
---
ruleserver/timeTicker.go | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index d8126a7..e236763 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -24,10 +24,11 @@
}
type RuleResult struct {
// 姣忎釜鎽勫儚鏈轰竴涓粨鏋勪綋
- CameraId string // 鎽勫儚鏈篿d
- Sort int32 // 鎽勫儚鏈哄湪瑙勫垯缁勪腑搴忓彿
- Result string // 鎽勫儚鏈鸿繃婊ゆ暟鎹緱鍑虹殑缁撴灉
- RuleWithPre string // 鎽勫儚鏈轰箣闂寸殑杩炴帴绗�
+ CameraId string // 鎽勫儚鏈篿d
+ Sort int32 // 鎽勫儚鏈哄湪瑙勫垯缁勪腑搴忓彿
+ Result string // 鎽勫儚鏈鸿繃婊ゆ暟鎹緱鍑虹殑缁撴灉
+ RuleWithPre string // 鎽勫儚鏈轰箣闂寸殑杩炴帴绗�
+ CacheData *ResultMsg // 缂撳瓨褰撳墠甯ф暟鎹�
}
func TimeTicker() {
@@ -73,8 +74,8 @@
// 鍒ゆ柇鏈夋棤姝よ鍒欑粍鐨勫畾鏃跺櫒
flag := false
for k, _ := range TimeEleList {
- logger.Debug("-----------------鐪嬬湅杩欎釜key鍜実roupId", k, groupId)
- if strings.Contains(k, groupId) {
+ //logger.Debug("-----------------鐪嬬湅杩欎釜key鍜実roupId", k, groupId)
+ if strings.Contains(k, groupId) && k != groupId{
flag = true
}
}
@@ -91,20 +92,21 @@
logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
flagTime = "10"
timeEle.AlarmFlag = true
- args.RuleResult["cacheData"] = timeEle.CacheSdkData
+ args.RuleResult["cacheData"] = []ResultMsg{}
+ args.RuleResult["cacheData"] = append(args.RuleResult["cacheData"].([]ResultMsg),timeEle.CacheSdkData)
args.RuleResult["timeLabel"] = flagTime
}
if timeEle.N != 0 {
flagTime = "00"
// 鏈夊畾鏃跺櫒浣嗕笉涓�0鎶婂凡鎵撶殑鏍囩鍒犻櫎
- args.RuleResult = nil
- logger.Debug("------------------------缁撴灉涓虹湡浣嗚鏁板櫒涓嶅埌0锛屼笉鎶ヨ,姝ゆ椂鐨勮鏁板櫒鐨勫�间负锛�", timeEle.N)
+ // args.RuleResult = nil
+ logger.Debug("------------------------缁撴灉涓虹湡浣嗚鏁板櫒涓嶅埌0锛屼笉鎶ヨ,姝ゆ椂鐨勮鏁板櫒", k, "鐨勫�间负锛�", timeEle.N)
}
}
}
} else { // 缁撴灉涓哄亣
for k, timeEle := range TimeEleList {
- if strings.Contains(k, groupId) {
+ if strings.Contains(k, groupId) && k != groupId{
if timeEle.AlarmFlag {
if timeEle.BufferFlag == 0 {
logger.Debug("------------------------------鏉�姝诲畾鏃跺櫒锛屾姤璀︽甯х姸鎬佹敼鍙樼殑鏁版嵁锛屾鏃剁殑璁℃暟鍣ㄧ殑鍊间负", timeEle.N)
@@ -121,7 +123,6 @@
}
}
}
-
}
} else { // 鏃犲畾鏃跺櫒
if result {
--
Gitblit v1.8.0