From e838f3a03d53bc3f91061c8747f1bd677963f640 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 09 七月 2019 17:15:06 +0800
Subject: [PATCH] fix url bug
---
areaApi.go | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/areaApi.go b/areaApi.go
index dbc3b9a..4bfae03 100644
--- a/areaApi.go
+++ b/areaApi.go
@@ -3,7 +3,6 @@
import (
"encoding/json"
"fmt"
- "basic.com/pubsub/protomsg.git"
)
type AreaApi struct {
@@ -12,48 +11,45 @@
//parentId 瑕佹煡瀵荤殑鐩綍鏍戠殑鏍硅妭鐐筰d
//searchType(0:鍏ㄩ儴锛�1:鍒嗘瀽鎽勫儚鏈�,2:鐩戞帶鎽勫儚鏈�)
//cameraName锛堟憚鍍忔満鍚嶇О锛�
-func (api AreaApi) GetLocalCameraTree(parentId int, searchType int, cameraName string) []TreeMenu {
+func (api AreaApi) GetLocalCameraTree(parentId string, searchType string, cameraName string,treeType string) []TreeMenu {
var result []TreeMenu
client := NewClient()
url := BASIC_URL + DATA_URL_PREFIX + "/area/localmenu"
params := make(map[string]string, 0)
- params["parentId"] = string(parentId)
- params["searchType"] = string(searchType)
+ params["parentId"] = parentId
+ params["searchType"] = searchType
params["cameraName"] = cameraName
respBody, err := client.DoGetRequest(url, params, nil)
if err != nil {
- return result
+ return nil
}
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- fmt.Println(err)
+ return nil
}
bytes, _ := json.Marshal(res.Data)
- err = json.Unmarshal(bytes, &result)
- if err != nil {
- fmt.Println(err)
+ if err = json.Unmarshal(bytes, &result);err !=nil{
+ return nil
}
return result
}
//娣诲姞鐩綍鑺傜偣
-func (api AreaApi) AreaAdd(area protomsg.Area) bool {
+func (api AreaApi) AreaAdd(paramBody map[string]interface{}) bool {
flag := false
url := BASIC_URL + DATA_URL_PREFIX + "/area/add"
client := NewClient()
- paramBody := Struct2Map(area)
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
return flag
}
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- fmt.Println(err)
return flag
}
flag = res.Success
@@ -61,16 +57,12 @@
}
//鐩綍鏇存柊
-func (api AreaApi) AreaUpdate(area protomsg.Area) bool {
+func (api AreaApi) AreaUpdate(paramBody map[string]interface{}) bool {
flag := false
- url := BASIC_URL + DATA_URL_PREFIX + "/area/update/" + string(area.Id)
+ url := BASIC_URL + DATA_URL_PREFIX + "/area/update"
client := NewClient()
- if area.Name == "" || area.Id == 0 {
- return flag
- }
- paramBody := Struct2Map(area)
- respBody, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, paramBody, nil)
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil, nil)
if err != nil {
return flag
}
@@ -84,22 +76,21 @@
}
//鍒犻櫎鐩綍
-func (api AreaApi) AreaDelete(id int) bool {
+func (api AreaApi) AreaDelete(id string) bool {
flag := false
- if id == 0 {
+ if id == "" {
return flag
}
url := BASIC_URL + DATA_URL_PREFIX + "/area/del"
client := NewClient()
- paramQuery := make(map[string]string, 0)
- paramQuery["id"] = string(id)
- respBody, err := client.DoGetRequest(url, paramQuery, nil)
+ paramBody := make(map[string]interface{}, 0)
+ paramBody["id"] = id
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil, nil)
if err != nil {
return flag
}
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- fmt.Println(err)
return flag
}
flag = res.Success
--
Gitblit v1.8.0