From 30825f2903224e1f52954547500950317f5a473e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 13:27:50 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.1.14/r/ruleprocess
---
insertdata/insertDataToEs.go | 7 ++++---
cache/cache.go | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/cache/cache.go b/cache/cache.go
index f72a1e0..5f4c813 100644
--- a/cache/cache.go
+++ b/cache/cache.go
@@ -5,15 +5,18 @@
"basic.com/pubsub/cache.git/shardmap"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/gopherdiscovery.git"
+ "errors"
"fmt"
"github.com/gogo/protobuf/proto"
"github.com/satori/go.uuid"
"strconv"
)
const (
+ PREFIX_CAMERA = "CAMERA_"
PREFIX_POLYGON = "POLYGON_"
PREFIX_TIME = "TIME_"
PREFIX_RULE = "RULE_"
+ SERVER_KEY = "SERVERINFO"
)
var cMap *shardmap.ShardMap
@@ -44,6 +47,10 @@
initCameraTaskRules()//鍒濆鍖栨憚鍍忔満浠诲姟瑙勫垯缂撳瓨
+ initCamera()//鍒濆鍖栨憚鍍忔満淇℃伅
+
+ initServerInfo()//鍒濆鍖栨湇鍔″櫒閰嶇疆淇℃伅
+
initChan <- true
}
@@ -55,6 +62,10 @@
return
}
switch newUpdateMsg.Table {
+ case protomsg.TableChanged_T_Server:
+ initServerInfo()
+ case protomsg.TableChanged_T_Camera:
+ initCamera()
case protomsg.TableChanged_T_CameraPolygon://鏇存柊鎽勫儚鏈哄鍙樺舰
initPolygons()
case protomsg.TableChanged_T_TimeRule://鏇存柊鏃堕棿瑙勫垯
@@ -64,6 +75,22 @@
default:
fmt.Println("unknown operation")
+ }
+}
+
+func initServerInfo() {
+ var api dbapi.SysSetApi
+ b, s := api.GetServerInfo()
+ if b{
+ cMap.Set(SERVER_KEY,s)
+ }
+}
+
+func initCamera() {
+ var api dbapi.CameraApi
+ cameras := api.FindAll()
+ for _,cam := range cameras {
+ cMap.Set(PREFIX_CAMERA + cam.Id,cam)
}
}
@@ -104,7 +131,24 @@
}
}
+func GetServerInfo() (con protomsg.LocalConfig,err error) {
+ config, b := cMap.Get(SERVER_KEY)
+ if b {
+ return config.(protomsg.LocalConfig),nil
+ } else {
+ return con,errors.New("conf not found")
+ }
+}
+//閫氳繃cameraId鑾峰彇鎽勫儚鏈轰俊鎭�
+func GetCameraById(cameraId string) (c protomsg.Camera,err error) {
+ cam, b := cMap.Get(PREFIX_CAMERA + cameraId)
+ if b {
+ return cam.(protomsg.Camera),nil
+ } else {
+ return c,errors.New("camera not found")
+ }
+}
func GetPolygonsByCameraId(cameraId string) []protomsg.CameraPolygon{
obj, b := cMap.Get(PREFIX_POLYGON + cameraId)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index c8319c6..2f0b44f 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -6,6 +6,7 @@
"fmt"
"log"
"net"
+ "ruleprocess/cache"
"strings"
"time"
@@ -211,12 +212,12 @@
}
// log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
- flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
- if !flag {
+ localConfig, err := cache.GetServerInfo()
+ if err !=nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
- camera, err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
+ camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
--
Gitblit v1.8.0