From ff521a22d519a822fdac224c4571d6a2a2ad7f19 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 13 七月 2019 11:38:02 +0800
Subject: [PATCH] 报警标志位接口转string
---
cache/cache.go | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/cache/cache.go b/cache/cache.go
index 70af5aa..764b264 100644
--- a/cache/cache.go
+++ b/cache/cache.go
@@ -5,6 +5,7 @@
"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"
@@ -16,6 +17,7 @@
PREFIX_TIME = "TIME_"
PREFIX_RULE = "RULE_"
SERVER_KEY = "SERVERINFO"
+ PREFIX_SDK = "SDK_"
)
var cMap *shardmap.ShardMap
@@ -50,6 +52,8 @@
initServerInfo()//鍒濆鍖栨湇鍔″櫒閰嶇疆淇℃伅
+ initSdks() //鍒濆鍖杝dk鍒楄〃淇℃伅
+
initChan <- true
}
@@ -61,12 +65,20 @@
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()
+ case protomsg.TableChanged_T_Sdk://鏇存柊sdk閰嶇疆
+ initSdks()
default:
fmt.Println("unknown operation")
@@ -126,22 +138,30 @@
}
}
-func GetServerInfo() *protomsg.LocalConfig {
+func initSdks(){
+ var api dbapi.SdkApi
+ sdks := api.FindAll("")
+ for _,sdk :=range sdks {
+ cMap.Set(PREFIX_SDK+sdk.Id,sdk)
+ }
+}
+
+func GetServerInfo() (con protomsg.LocalConfig,err error) {
config, b := cMap.Get(SERVER_KEY)
if b {
- return config.(*protomsg.LocalConfig)
+ return config.(protomsg.LocalConfig),nil
} else {
- return nil
+ return con,errors.New("conf not found")
}
}
//閫氳繃cameraId鑾峰彇鎽勫儚鏈轰俊鎭�
-func GetCameraById(cameraId string) *protomsg.Camera {
+func GetCameraById(cameraId string) (c protomsg.Camera,err error) {
cam, b := cMap.Get(PREFIX_CAMERA + cameraId)
if b {
- return cam.(*protomsg.Camera)
+ return cam.(protomsg.Camera),nil
} else {
- return nil
+ return c,errors.New("camera not found")
}
}
@@ -172,4 +192,13 @@
} else {
return nil
}
+}
+
+func GetSdkById(sdkId string) (sdk protomsg.Sdk,err error){
+ obj,b :=cMap.Get(PREFIX_SDK + sdkId)
+ if b {
+ return obj.(protomsg.Sdk),nil
+ } else {
+ return sdk,errors.New("sdk not found")
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0