From 590c075d30a61f9ecb380a908860d6c827526e09 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 22 八月 2019 16:08:24 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.1.14/r/dbapi
---
areaApi.go | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/areaApi.go b/areaApi.go
index 4bfae03..aa8da42 100644
--- a/areaApi.go
+++ b/areaApi.go
@@ -11,7 +11,7 @@
//parentId 瑕佹煡瀵荤殑鐩綍鏍戠殑鏍硅妭鐐筰d
//searchType(0:鍏ㄩ儴锛�1:鍒嗘瀽鎽勫儚鏈�,2:鐩戞帶鎽勫儚鏈�)
//cameraName锛堟憚鍍忔満鍚嶇О锛�
-func (api AreaApi) GetLocalCameraTree(parentId string, searchType string, cameraName string,treeType string) []TreeMenu {
+func (api AreaApi) GetLocalCameraTree(parentId string, searchType string, cameraName string) []TreeMenu {
var result []TreeMenu
client := NewClient()
@@ -39,6 +39,37 @@
return result
}
+//parentId 瑕佹煡瀵荤殑鐩綍鏍戠殑鏍硅妭鐐筰d
+//searchType(0:鍏ㄩ儴锛�1:鍒嗘瀽鎽勫儚鏈�,2:鐩戞帶鎽勫儚鏈�)
+//cameraName锛堟憚鍍忔満鍚嶇О锛�
+func (api AreaApi) GetGb28181CameraTree(parentId string, searchType string, cameraName string) []TreeMenu {
+ var result []TreeMenu
+
+ client := NewClient()
+
+ url := BASIC_URL + DATA_URL_PREFIX + "/area/gb28181Tree"
+ params := make(map[string]string, 0)
+ params["parentId"] = parentId
+ params["searchType"] = searchType
+ params["cameraName"] = cameraName
+
+ respBody, err := client.DoGetRequest(url, params, nil)
+ if err != nil {
+ return nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(respBody, &res); err != nil {
+ return nil
+ }
+
+ bytes, _ := json.Marshal(res.Data)
+ if err = json.Unmarshal(bytes, &result);err !=nil{
+ return nil
+ }
+ return result
+}
+
//娣诲姞鐩綍鑺傜偣
func (api AreaApi) AreaAdd(paramBody map[string]interface{}) bool {
flag := false
--
Gitblit v1.8.0