From 340db27a81cb13dc39bd754fb2f70440b54f0e32 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 17 十二月 2020 14:06:58 +0800
Subject: [PATCH] 添加CameraGroupApi.go
---
syssetApi.go | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/syssetApi.go b/syssetApi.go
index 78ecdb4..f5260c4 100644
--- a/syssetApi.go
+++ b/syssetApi.go
@@ -3,7 +3,6 @@
import (
"basic.com/pubsub/protomsg.git"
"encoding/json"
- "fmt"
"strconv"
)
@@ -64,7 +63,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -83,7 +82,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -341,21 +340,30 @@
return res.Success,res.Data
}
-func (api SysSetApi) GetResourceConfig() (flag bool,d interface{}){
+func (api SysSetApi) GetResourceConfig() (flag bool,rc protomsg.ResourceConfig){
url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/getResourceConfig"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return false, nil
+ return false, rc
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false, nil
+ return false, rc
}
-
- return res.Success,res.Data
+ b, err := json.Marshal(res.Data)
+ if err !=nil {
+ return false,rc
+ } else {
+ err = json.Unmarshal(b, &rc)
+ if err !=nil {
+ return false,rc
+ } else {
+ return true,rc
+ }
+ }
}
func (api SysSetApi) SaveResourceConfig(paramBody map[string]interface{}) (flag bool,d interface{}){
--
Gitblit v1.8.0