From b2f549332f6f890b252c3cc6abcbd35fdc6ae2e5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 11:09:08 +0800
Subject: [PATCH] 调整配置文件的引用位置
---
cache/cache.go | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/cache/cache.go b/cache/cache.go
index 4a7ad31..b0578cf 100644
--- a/cache/cache.go
+++ b/cache/cache.go
@@ -5,23 +5,27 @@
"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
func Init(initChan chan bool,dbIp string,surveyPort int,pubSubPort int){
- urlSurvey := "tcp://" + dbIp + strconv.Itoa(surveyPort)
- urlPubSub := "tcp://" + dbIp + strconv.Itoa(pubSubPort)
+ cMap = shardmap.New(uint8(32))
+ urlSurvey := "tcp://" + dbIp + ":" + strconv.Itoa(surveyPort)
+ urlPubSub := "tcp://" + dbIp + ":" + strconv.Itoa(pubSubPort)
client, _ := gopherdiscovery.ClientWithSub(urlSurvey, urlPubSub, uuid.NewV4().String())
recvMsg := client.HeartBeatMsg()
fmt.Println(<-recvMsg)
@@ -43,6 +47,10 @@
initCameraTaskRules()//鍒濆鍖栨憚鍍忔満浠诲姟瑙勫垯缂撳瓨
+ initCamera()//鍒濆鍖栨憚鍍忔満淇℃伅
+
+ initServerInfo()//鍒濆鍖栨湇鍔″櫒閰嶇疆淇℃伅
+
initChan <- true
}
@@ -54,15 +62,37 @@
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://鏇存柊鏃堕棿瑙勫垯
initTimeRules()
+ case protomsg.TableChanged_T_CameraTask://鏇存柊鎽勫儚鏈鸿鍒欓厤缃弬鏁�
+ initCameraTaskRules()
case protomsg.TableChanged_T_CameraTaskArgs://鏇存柊鎽勫儚鏈鸿鍒欓厤缃弬鏁�
initCameraTaskRules()
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)
}
}
@@ -103,7 +133,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)
--
Gitblit v1.8.0