From b64bb2dd19cba5c16774fc52c943743d9f136b94 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 01 二月 2021 11:14:21 +0800
Subject: [PATCH] GetAllCamerasByServer添加cameraId参数
---
cameraApi.go | 70 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 6 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 01682c3..b40efd0 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -39,19 +39,19 @@
return res.Success,res.Data
}
-func (api CameraApi) CameraUpdate(paramBody map[string]interface{}) bool {
+func (api CameraApi) CameraUpdate(paramBody map[string]interface{}) (bool,interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/update"
client := NewClient()
body, err := client.DoPutRequest(url,CONTENT_TYPE_JSON,paramBody,nil)
if err != nil {
- return false
+ return false, err
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false
+ return false, err
}
- return res.Success
+ return res.Success, res.Data
}
func (api CameraApi) UpdateSnapshotUrl(cameraId string, snapshot string) bool {
@@ -79,7 +79,7 @@
client := NewClient()
paramMap := make(map[string]string,0)
paramMap["cid"] = cid
- body, err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM,nil,paramMap)
+ body, err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM,nil, paramMap, nil)
if err != nil {
return false
}
@@ -132,6 +132,26 @@
return res.Success
}
+func (api CameraApi) CameraAreaDel(cameraId string, areaId string) (bool,interface{}) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/cameraAreaDel"
+ client := NewClient()
+ paramBody := map[string]interface{} {
+ "cameraId": cameraId,
+ "areaId": areaId,
+ }
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil,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
+}
+
func (api CameraApi) FindAll() (cameras []protomsg.Camera) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/showAll"
client := NewClient()
@@ -153,12 +173,14 @@
return cameras
}
-func (api CameraApi) GetAllCamerasByServer(serverId string,cameraName string) (bool,interface{}) {
+func (api CameraApi) GetAllCamerasByServer(serverId string,runType string, cameraName string, cameraId string) (bool,interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/getAllCamerasByServer"
client := NewClient()
paramQuery := make(map[string]string,0)
paramQuery["serverId"] = serverId
paramQuery["cameraName"] = cameraName
+ paramQuery["runType"] = runType
+ paramQuery["cameraId"] = cameraId
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return false,nil
@@ -550,4 +572,40 @@
}
return res.Success,res.Data
+}
+
+func (api CameraApi) GetCoord(cameraId string) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/coord"
+ client := NewClient()
+ paramQuery := map[string]string {
+ "cameraId": cameraId,
+ }
+ 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
+}
+
+func (api CameraApi) UpdateCoord(paramBody map[string]interface{}) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updateCoord"
+ client := NewClient()
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ logPrint(err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
}
\ No newline at end of file
--
Gitblit v1.8.0