From dccc4ad12f01ff31e58c803e6f25c130e240b6f1 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 14 五月 2021 10:46:21 +0800
Subject: [PATCH] fix
---
areaApi.go | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/areaApi.go b/areaApi.go
index 64fb84a..1fe7518 100644
--- a/areaApi.go
+++ b/areaApi.go
@@ -2,7 +2,6 @@
import (
"encoding/json"
- "fmt"
"strconv"
)
@@ -27,7 +26,7 @@
//parentId 瑕佹煡瀵荤殑鐩綍鏍戠殑鏍硅妭鐐筰d
//searchType(0:鍏ㄩ儴锛�1:鍒嗘瀽鎽勫儚鏈�,2:鐩戞帶鎽勫儚鏈�)
//cameraName锛堟憚鍍忔満鍚嶇О锛�
-func (api AreaApi) GetLocalCameraTree(parentId string, searchType string, cameraName string) []TreeMenu {
+func (api AreaApi) GetLocalCameraTree(parentId string, searchType string, cameraName string, isPlatform int) []TreeMenu {
var result []TreeMenu
client := NewClient()
@@ -37,6 +36,7 @@
params["parentId"] = parentId
params["searchType"] = searchType
params["cameraName"] = cameraName
+ params["isPlatform"] = strconv.Itoa(isPlatform)
respBody, err := client.DoGetRequest(url, params, nil)
if err != nil {
@@ -58,7 +58,7 @@
//parentId 瑕佹煡瀵荤殑鐩綍鏍戠殑鏍硅妭鐐筰d
//searchType(0:鍏ㄩ儴锛�1:鍒嗘瀽鎽勫儚鏈�,2:鐩戞帶鎽勫儚鏈�)
//cameraName锛堟憚鍍忔満鍚嶇О锛�
-func (api AreaApi) GetGb28181CameraTree(parentId string, searchType string, cameraName string) []TreeMenu {
+func (api AreaApi) GetGb28181CameraTree(parentId string, searchType string, cameraName string, isPlatform int) []TreeMenu {
var result []TreeMenu
client := NewClient()
@@ -68,6 +68,7 @@
params["parentId"] = parentId
params["searchType"] = searchType
params["cameraName"] = cameraName
+ params["isPlatform"] = strconv.Itoa(isPlatform)
respBody, err := client.DoGetRequest(url, params, nil)
if err != nil {
@@ -86,8 +87,7 @@
return result
}
-func (api AreaApi) Gb28181TreeRefresh(id string) bool {
- flag := false
+func (api AreaApi) Gb28181TreeRefresh(id string) (bool, interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/gb28181TreeRefresh"
client := NewClient()
paramBody := map[string]interface{}{
@@ -95,14 +95,13 @@
}
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
- return flag
+ return false, err.Error()
}
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- return flag
+ return false, err.Error()
}
- flag = res.Success
- return flag
+ return res.Success, res.Data
}
func (api AreaApi) Gb28181TreeDelete() bool {
@@ -150,7 +149,7 @@
}
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return flag
}
flag = res.Success
--
Gitblit v1.8.0