From 89321bfe39e5a696abdb8ad5372d01e64ea6e2e7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 16 十一月 2020 17:54:43 +0800
Subject: [PATCH] 退出集群添加参数
---
cameraApi.go | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 16 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index bef1a77..5321e00 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 {
@@ -172,27 +172,46 @@
return res.Success,res.Data
}
-//鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
-func (api CameraApi) FindAllCameraAndTask() (cameraTasks []protomsg.CameraAndTaskInfo){
- url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
+func (api CameraApi) GetNodeCamera(searchType string,cameraName string) (bool,interface{}) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/nodeCamera"
client := NewClient()
-
- body, err := client.DoGetRequest(url, nil, nil)
+ paramQuery := make(map[string]string,0)
+ paramQuery["searchType"] = searchType
+ paramQuery["cameraName"] = cameraName
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
- return nil
+ return false,nil
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- logPrint(err)
- return nil
+ return false,nil
}
- bytes, _ := json.Marshal(res.Data)
- err = json.Unmarshal(bytes, &cameraTasks)
-
- return cameraTasks
+ return res.Success,res.Data
}
+
+////鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
+//func (api CameraApi) FindAllCameraAndTask() (cameraTasks []protomsg.CameraAndTaskInfo){
+// url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
+// client := NewClient()
+//
+// body, err := client.DoGetRequest(url, nil, nil)
+// if err != nil {
+// return nil
+// }
+//
+// var res Result
+// if err = json.Unmarshal(body, &res); err != nil {
+// logPrint(err)
+// return nil
+// }
+//
+// bytes, _ := json.Marshal(res.Data)
+// err = json.Unmarshal(bytes, &cameraTasks)
+//
+// return cameraTasks
+//}
func (api CameraApi) SaveCameraPolygon(paramBody map[string]interface{}) (bool,interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/polygon/save"
@@ -497,3 +516,74 @@
}
return true,list
}
+
+
+func (api CameraApi) FindOnMap(paramBody map[string]interface{}) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/findOnMap"
+ 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
+}
+
+func (api CameraApi) UpdatePos(paramBody map[string]interface{}) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updatePos"
+ 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
+}
+
+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