From 0bd35e1e48e8e17c5eccfc92d706730619d5437f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 11:53:16 +0800
Subject: [PATCH] 定时器小改以及持续时间第一张画框
---
insertdata/insertDataToEs.go | 4 ++++
ruleserver/timeTicker.go | 50 +++++++++++++++++++++++++-------------------------
2 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index ba89ac2..a54a5c3 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -368,6 +368,10 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
+ logger.Debug("鎸佺画鏃堕棿绗竴寮犵敾妗嗭細")
+ for _,res := range msg1.RuleResult["yolo"].([]structure.Result) {
+ logger.Debug("鎸佺画鏃堕棿绗竴寮犺鍒欙細",res)
+ }
resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err1 != nil {
logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index 7650091..a572879 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -34,35 +34,35 @@
func TimeTicker() {
ticker := time.NewTicker(1 * time.Second)
- go func(ticker *time.Ticker) {
- defer ticker.Stop()
- for {
- select {
- case <-ticker.C:
- 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
- logger.Error("-------------------------------------鎵撳嵃瀹氭椂鍣ㄨ鏁板厓绱犲綋鍓嶅��-----------------------------------------锛�", timeEle.N)
- }
- if timeEle.GroupId != "" && timeEle.N == 0 {
- // 璇存槑鏄仈鍔ㄤ换鍔＄殑鏃堕棿绐楀彛 鍒扮偣鍎夸簡璇ラ攢姣佷簡,鍐嶆潵浜嗗啀鍒涘缓
- delete(TimeEleList, k)
- }
+ //go func(ticker *time.Ticker) {
+ defer ticker.Stop()
+ for {
+ select {
+ case <-ticker.C:
+ 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
+ logger.Error("-------------------------------------鎵撳嵃瀹氭椂鍣ㄨ鏁板厓绱犲綋鍓嶅��-----------------------------------------锛�", timeEle.N)
}
- rw.Unlock()
- case stop := <-stopChan:
- if stop {
- logger.Info("瀹氭椂鍣ㄧ粨鏉�")
- return
- //os.Exit(0)
+ if timeEle.GroupId != "" && timeEle.N == 0 {
+ // 璇存槑鏄仈鍔ㄤ换鍔＄殑鏃堕棿绐楀彛 鍒扮偣鍎夸簡璇ラ攢姣佷簡,鍐嶆潵浜嗗啀鍒涘缓
+ delete(TimeEleList, k)
}
}
+ rw.Unlock()
+ case stop := <-stopChan:
+ if stop {
+ logger.Info("瀹氭椂鍣ㄧ粨鏉�")
+ return
+ //os.Exit(0)
+ }
}
- }(ticker)
+ }
+ //}(ticker)
}
func StopTimeTicker() {
stopChan <- true
--
Gitblit v1.8.0