From 8b9f4b0a54ccd281b38c41ec928e35d810a74202 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 11 六月 2020 13:49:59 +0800
Subject: [PATCH] fix FindAllTaskSdkRun
---
areaApi.go | 136 ++++++++++++++++++++++++++++++++++----------
1 files changed, 104 insertions(+), 32 deletions(-)
diff --git a/areaApi.go b/areaApi.go
index dbc3b9a..e23ee39 100644
--- a/areaApi.go
+++ b/areaApi.go
@@ -2,58 +2,135 @@
import (
"encoding/json"
- "fmt"
- "basic.com/pubsub/protomsg.git"
+ "strconv"
)
type AreaApi struct {
+ Ip string
+ Port int
+}
+
+func (api AreaApi) getBasicUrl() string {
+ if api.Ip == "" {
+ return BASIC_URL
+ }
+ if api.Ip == "" {
+ api.Ip = DEFAULT_IP
+ }
+ if api.Port == 0 {
+ api.Port = DEFAULT_PORT
+ }
+ return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
}
//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) []TreeMenu {
var result []TreeMenu
client := NewClient()
- url := BASIC_URL + DATA_URL_PREFIX + "/area/localmenu"
+ url := api.getBasicUrl() + 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 {
- flag := false
- url := BASIC_URL + DATA_URL_PREFIX + "/area/add"
+//parentId 瑕佹煡瀵荤殑鐩綍鏍戠殑鏍硅妭鐐筰d
+//searchType(0:鍏ㄩ儴锛�1:鍒嗘瀽鎽勫儚鏈�,2:鐩戞帶鎽勫儚鏈�)
+//cameraName锛堟憚鍍忔満鍚嶇О锛�
+func (api AreaApi) GetGb28181CameraTree(parentId string, searchType string, cameraName string) []TreeMenu {
+ var result []TreeMenu
+
client := NewClient()
- paramBody := Struct2Map(area)
+
+ url := api.getBasicUrl() + 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) Gb28181TreeRefresh(id string) bool {
+ flag := false
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/gb28181TreeRefresh"
+ client := NewClient()
+ paramBody := map[string]interface{}{
+ "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
+ return flag
+}
+
+func (api AreaApi) Gb28181TreeDelete() bool {
+ flag := false
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/gb28181TreeDelete"
+ client := NewClient()
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, nil, nil, nil)
+ if err != nil {
+ return flag
+ }
+ var res Result
+ if err = json.Unmarshal(respBody, &res); err != nil {
+ return flag
+ }
+ flag = res.Success
+ return flag
+}
+
+//娣诲姞鐩綍鑺傜偣
+func (api AreaApi) AreaAdd(paramBody map[string]interface{}) bool {
+ flag := false
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/add"
+ client := NewClient()
+ 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 {
return flag
}
flag = res.Success
@@ -61,22 +138,18 @@
}
//鐩綍鏇存柊
-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 := api.getBasicUrl() + 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
}
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return flag
}
flag = res.Success
@@ -84,22 +157,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"
+ url := api.getBasicUrl() + 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