From af1996626affb7e34ad88978f618b5eec7e1972a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 11 十月 2019 14:50:50 +0800
Subject: [PATCH] add GetAllCamerasByServer
---
cameraApi.go | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index f732136..3c7b69e 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -9,19 +9,19 @@
type CameraApi struct{}
-func (api CameraApi) CameraAdd(paramBody map[string]interface{}) bool {
+func (api CameraApi) CameraAdd(paramBody map[string]interface{}) (bool,interface{}) {
url := BASIC_URL + DATA_URL_PREFIX + "/camera/add"
client := NewClient()
body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON,paramBody,nil,nil)
if err != nil {
- return false
+ return false,nil
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false
+ return false,nil
}
- return res.Success
+ return res.Success,res.Data
}
func (api CameraApi) CameraUpdate(paramBody map[string]interface{}) bool {
@@ -60,7 +60,7 @@
}
func (api CameraApi) CameraDelete(cid string) bool {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/delete/"+cid
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/del/"+cid
client := NewClient()
paramMap := make(map[string]string,0)
paramMap["cid"] = cid
@@ -116,6 +116,25 @@
err = json.Unmarshal(bytes, &cameras)
return cameras
+}
+
+func (api CameraApi) GetAllCamerasByServer(serverId string,cameraName string) (bool,interface{}) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/getAllCamerasByServer"
+ client := NewClient()
+ paramQuery := make(map[string]string,0)
+ paramQuery["serverId"] = serverId
+ paramQuery["cameraName"] = cameraName
+ body, err := client.DoGetRequest(url, paramQuery, nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false,nil
+ }
+
+ return res.Success,res.Data
}
//鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
@@ -309,7 +328,7 @@
func (api CameraApi) GetCamerasByRunType(runType int,cameraName string)(flag bool,cameras []protomsg.Camera){
url := BASIC_URL + DATA_URL_PREFIX + "/camera/getCamerasByRunType"
client := NewClient()
- paramQuery := make(map[string]string,0)
+ paramQuery := make(map[string]string,2)
paramQuery["runType"]=strconv.Itoa(runType)
paramQuery["cameraName"] = cameraName
body, err := client.DoGetRequest(url, paramQuery, nil)
--
Gitblit v1.8.0