From b4add78c5c4f581f8c005c8b4ccf090e03424be1 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 01 十一月 2019 18:02:42 +0800
Subject: [PATCH] ---
---
ruleserver/timeTicker.go | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index 4c4d901..7650091 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -2,7 +2,8 @@
import (
"fmt"
- "ruleprocess/logger"
+ "basic.com/valib/logger.git"
+ "ruleprocess/structure"
"strings"
"time"
)
@@ -18,21 +19,20 @@
InitN int // 璧嬪�煎悗灏变笉鍙樼殑鍒濆鍊�
BufferFlag int // 缂撳啿瀹归敊浣� 杩炵画n甯alse鎵嶄负false
AlarmFlag bool // 鎶ヨ鏍囧織浣� 瀹氭椂鍣ㄥ紑鍚悗绗竴娆℃姤璀︽椂浼氳缃负true 寰�鍚庡啀鏉ユ姤璀︿篃涓嶄細鎻掕繘ES
- CacheSdkData ResultMsg // 瀹氭椂鍣ㄧ殑缂撳瓨鏁版嵁 鎸佺画鏃堕棿绫荤殑寮�鍚畾鏃跺櫒鏃惰缂撳瓨涓�甯�
+ CacheSdkData structure.ResultMsg // 瀹氭椂鍣ㄧ殑缂撳瓨鏁版嵁 鎸佺画鏃堕棿绫荤殑寮�鍚畾鏃跺櫒鏃惰缂撳瓨涓�甯�
GroupId string // 鑱斿姩瑙勫垯闇�瑕佽褰曚笅姝ゆ椂鐨勮鍒欑粍id
RuleResults []*RuleResult
}
type RuleResult struct {
// 姣忎釜鎽勫儚鏈轰竴涓粨鏋勪綋
- CameraId string // 鎽勫儚鏈篿d
- Sort int32 // 鎽勫儚鏈哄湪瑙勫垯缁勪腑搴忓彿
- Result string // 鎽勫儚鏈鸿繃婊ゆ暟鎹緱鍑虹殑缁撴灉
- RuleWithPre string // 鎽勫儚鏈轰箣闂寸殑杩炴帴绗�
+ CameraId string // 鎽勫儚鏈篿d
+ Sort int32 // 鎽勫儚鏈哄湪瑙勫垯缁勪腑搴忓彿
+ Result string // 鎽勫儚鏈鸿繃婊ゆ暟鎹緱鍑虹殑缁撴灉
+ RuleWithPre string // 鎽勫儚鏈轰箣闂寸殑杩炴帴绗�
+ CacheData structure.ResultMsg // 缂撳瓨褰撳墠甯ф暟鎹�
}
func TimeTicker() {
- logger.Info("瀹氭椂鍣ㄦ墽琛屼簡")
- fmt.Println("瀹氭椂鍣ㄦ墽琛屼簡")
ticker := time.NewTicker(1 * time.Second)
go func(ticker *time.Ticker) {
defer ticker.Stop()
@@ -42,6 +42,7 @@
logger.Info("瀹氭椂鍣ㄦ墽琛屽崟鍏�", time.Now().Unix())
fmt.Println("瀹氭椂鍣ㄦ墽琛屽崟鍏�", time.Now().Unix())
// 姣忕閽熻鏁板櫒姹犲瓙閲屾墍鏈夌殑璁℃暟鍣ㄥ厓绱犻兘鍑忎竴锛屽噺鍒�0鐨勬槸璇ユ姤璀︾殑
+ rw.Lock()
for k, timeEle := range TimeEleList {
if timeEle.N > 0 {
timeEle.N = timeEle.N - 1
@@ -52,6 +53,7 @@
delete(TimeEleList, k)
}
}
+ rw.Unlock()
case stop := <-stopChan:
if stop {
logger.Info("瀹氭椂鍣ㄧ粨鏉�")
@@ -68,55 +70,59 @@
}
// 鍒ゆ柇鏄惁绗﹀悎瀹氭椂鍣ㄦ潯浠�
-func TimerAlarm(args *SdkDatas, groupId string, result bool) (string) {
+func TimerAlarm(oth *structure.Others, groupId string, result bool) (string) {
var flagTime string //
// 鍒ゆ柇鏈夋棤姝よ鍒欑粍鐨勫畾鏃跺櫒
flag := false
+ rw.Lock()
for k, _ := range TimeEleList {
//logger.Debug("-----------------鐪嬬湅杩欎釜key鍜実roupId", k, groupId)
- if strings.Contains(k, groupId) {
+ if strings.Contains(k, groupId) && k != groupId{
flag = true
}
}
if flag { // 鏈夊畾鏃跺櫒
if result { // 缁撴灉涓虹湡
for k, timeEle := range TimeEleList {
- if strings.Contains(k, groupId) {
+ if strings.Contains(k, groupId) && k != groupId{
if timeEle.N == 0 && timeEle.AlarmFlag {
logger.Debug("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
flagTime = "11"
- args.RuleResult["timeLabel"] = flagTime
+ oth.TimeLabel = flagTime
}
if timeEle.N == 0 && !timeEle.AlarmFlag { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0 鏆備笖璁や负涓�缁勮鍒欏彧鏈変竴涓畾鏃跺櫒
logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
flagTime = "10"
timeEle.AlarmFlag = true
- args.RuleResult["cacheData"] = timeEle.CacheSdkData
- args.RuleResult["timeLabel"] = flagTime
+ oth.CacheData = []structure.ResultMsg{}
+ oth.CacheData = append(oth.CacheData,timeEle.CacheSdkData)
+ oth.TimeLabel = flagTime
}
if timeEle.N != 0 {
flagTime = "00"
// 鏈夊畾鏃跺櫒浣嗕笉涓�0鎶婂凡鎵撶殑鏍囩鍒犻櫎
// args.RuleResult = nil
- logger.Debug("------------------------缁撴灉涓虹湡浣嗚鏁板櫒涓嶅埌0锛屼笉鎶ヨ,姝ゆ椂鐨勮鏁板櫒鐨勫�间负锛�", timeEle.N)
+ 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)
flagTime = "12"
- args.RuleResult["timeLabel"] = flagTime
+ oth.TimeLabel = flagTime
delete(TimeEleList, k)
} else {
if timeEle.BufferFlag > 0 {
+ logger.Debug("缂撳啿鍖哄噺鍑�")
timeEle.BufferFlag--
}
}
} else {
+ logger.Debug("-----------缁撴灉涓哄亣涓斾笉鍒�0锛屾潃姝诲畾鏃跺櫒")
delete(TimeEleList, k)
}
}
@@ -125,11 +131,12 @@
} else { // 鏃犲畾鏃跺櫒
if result {
flagTime = "01"
- args.RuleResult["timeLabel"] = flagTime
+ oth.TimeLabel = flagTime
} else {
flagTime = "00"
}
}
+ rw.Unlock()
return flagTime
}
@@ -141,7 +148,7 @@
func (p SubList) Less(i, j int) bool { return p[i].Sort < p[j].Sort }
// 缁撴瀯浣撴牴鎹煇瀛楁鎺掑簭
-type resultList []*LittleRuleResult
+type resultList []*structure.LittleRuleResult
func (p resultList) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
func (p resultList) Len() int { return len(p) }
--
Gitblit v1.8.0