From 584bb9effc9750d679e3227d8ce8519ec516935e Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 07 一月 2021 15:33:41 +0800
Subject: [PATCH] 调整gb28181Api中的url
---
gb28181Api.go | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/gb28181Api.go b/gb28181Api.go
index 5e5e469..d8fae2f 100644
--- a/gb28181Api.go
+++ b/gb28181Api.go
@@ -38,12 +38,12 @@
}
func (api Gb28181Api) Edit(paramBody map[string]interface{}) bool {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/configEdit"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false
}
flag := false
- url := DATA_URL_PREFIX + "/gb28181/configEdit"
client := NewClient(WithNodes(netNode))
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
@@ -57,11 +57,11 @@
}
func (api Gb28181Api) FindAreaByParentId(parentId string) (bool,interface{}) {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/findAreaByParentId"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
if netNode == nil {
return false, nil
}
- url := DATA_URL_PREFIX + "/gb28181/findAreaByParentId"
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string, 0)
paramMap["parentId"] = parentId
@@ -77,11 +77,11 @@
}
func (api Gb28181Api) NewGbId(code string) (bool,interface{}) {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/newGbId"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
if netNode == nil {
return false, nil
}
- url := DATA_URL_PREFIX + "/gb28181/newGbId"
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string, 0)
paramMap["code"] = code
@@ -100,7 +100,8 @@
//searchType(0:鍏ㄩ儴锛�1:鍒嗘瀽鎽勫儚鏈�,2:鐩戞帶鎽勫儚鏈�)
//cameraName锛堟憚鍍忔満鍚嶇О锛�
func (api Gb28181Api) GetGb28181CameraTree(parentId string, searchType string, cameraName string) []TreeMenu {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/tree"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
if netNode == nil {
return nil
}
@@ -108,7 +109,6 @@
client := NewClient(WithNodes(netNode))
- url := DATA_URL_PREFIX + "/gb28181/gb28181Tree"
params := make(map[string]string, 0)
params["parentId"] = parentId
params["searchType"] = searchType
@@ -133,12 +133,12 @@
//鍥芥爣鏍戝埛鏂�
func (api Gb28181Api) Gb28181TreeRefresh(id string) bool {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/treeRefresh"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false
}
flag := false
- url := DATA_URL_PREFIX + "/gb28181/gb28181TreeRefresh"
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
"id":id,
@@ -157,12 +157,12 @@
//鍥芥爣鏍戝垹闄�
func (api Gb28181Api) Gb28181TreeDelete() bool {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/treeDelete"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false
}
flag := false
- url := DATA_URL_PREFIX + "/gb28181/gb28181TreeDelete"
client := NewClient(WithNodes(netNode))
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, nil, nil, nil)
if err != nil {
@@ -178,11 +178,11 @@
//鑾峰彇鏈妭鐐圭殑鎵�鏈夊浗鏍囨憚鍍忔満
func (api Gb28181Api) GetAllCamerasByServer(serverId string,cameraName string) (b bool,cams []protomsg.Camera) {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/getAllCamerasByServer"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
if netNode == nil {
return false,nil
}
- url := DATA_URL_PREFIX + "/gb28181/getAllCamerasByServer"
client := NewClient(WithNodes(netNode))
paramQuery := make(map[string]string,0)
paramQuery["serverId"] = serverId
@@ -205,11 +205,11 @@
//鏌ユ壘鍦板浘涓婄殑鍥芥爣鎽勫儚鏈�
func (api Gb28181Api) FindOnMap(isOnMap bool, floor int, cameraName string) (b bool, cams []protomsg.Camera) {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/camera/findOnMap"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false,nil
}
- url := DATA_URL_PREFIX + "/camera/findOnMap"
client := NewClient(WithNodes(netNode))
paramBody:= map[string]interface{}{
"isOnMap": isOnMap,
@@ -238,11 +238,11 @@
//鏇存柊鎽勫儚鏈虹粡绾害浠ュ強妤煎眰
func (api Gb28181Api) UpdatePos(id string, floor int, longitude float32, latitude float32) bool {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/camera/updatePos"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false
}
- url := DATA_URL_PREFIX + "/camera/updatePos"
client := NewClient(WithNodes(netNode))
paramBody:= map[string]interface{}{
"id": id,
@@ -266,11 +266,11 @@
//鏌ラ泦缇ゅ唴鎵�鏈夊浗鏍囨憚鍍忔満
func (api Gb28181Api) NodeCamera() (bool, interface{}) {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/camera/nodeCamera"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false,nil
}
- url := DATA_URL_PREFIX + "/camera/nodeCamera"
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
@@ -286,11 +286,11 @@
//閫氳繃id鑾峰彇鍥芥爣杩涚▼涓殑鎽勫儚鏈哄潗鏍囪缃�
func (api Gb28181Api) Coord(cameraId string) (bool, interface{}) {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/camera/coord"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false,nil
}
- url := DATA_URL_PREFIX + "/camera/coord"
client := NewClient(WithNodes(netNode))
paramQuery := map[string]string {
"cameraId": cameraId,
@@ -309,11 +309,11 @@
//鏇存柊鍥芥爣杩涚▼涓憚鍍忔満鐨勮浆鎹㈠潗鏍�
func (api Gb28181Api) UpdateCoord(paramBody map[string]interface{}) bool {
- netNode := getNetNode(Topic_Gb28181_Service)
+ url := DATA_URL_PREFIX + "/gb28181/camera/updateCoord"
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false
}
- url := DATA_URL_PREFIX + "/camera/updateCoord"
client := NewClient(WithNodes(netNode))
body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
if err != nil {
@@ -332,7 +332,7 @@
func (api Gb28181Api) CameraUpdate(paramBody map[string]interface{}) bool {
- url := DATA_URL_PREFIX + "/camera/update"
+ url := DATA_URL_PREFIX + "/gb28181/camera/update"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false
@@ -351,7 +351,7 @@
}
func (api Gb28181Api) UpdateSnapshotUrl(cameraId string, snapshot string) bool {
- url := DATA_URL_PREFIX + "/camera/updateSnapshot"
+ url := DATA_URL_PREFIX + "/gb28181/camera/updateSnapshot"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false
@@ -376,7 +376,7 @@
//閫氳繃cameraId鑾峰彇鎽勫儚鏈轰俊鎭�
func (api Gb28181Api) GetCameraById(cameraId string) (camera protomsg.Camera, err error) {
- url := DATA_URL_PREFIX + "/camera/show"
+ url := DATA_URL_PREFIX + "/gb28181/camera/show"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return camera,errors.New("gb28181-service not found")
@@ -400,7 +400,7 @@
}
func (api Gb28181Api) UpdateCameraArea(cameraId string, areaId string) bool {
- url := DATA_URL_PREFIX + "/camera/updateCameraArea"
+ url := DATA_URL_PREFIX + "/gb28181/camera/updateCameraArea"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false
@@ -424,7 +424,7 @@
}
func (api Gb28181Api) FindAll() (cameras []protomsg.Camera) {
- url := DATA_URL_PREFIX + "/camera/showAll"
+ url := DATA_URL_PREFIX + "/gb28181/camera/showAll"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return nil
@@ -451,7 +451,7 @@
//鏍规嵁杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
//runType(0:鑾峰彇杞鍒楄〃锛�1锛氳幏鍙栧疄鏃跺垪琛�)
func (api Gb28181Api) GetCamerasByRunType(runType int,cameraName string)(flag bool,cameras []protomsg.Camera){
- url := DATA_URL_PREFIX + "/camera/getCamerasByRunType"
+ url := DATA_URL_PREFIX + "/gb28181/camera/getCamerasByRunType"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false,nil
@@ -482,7 +482,7 @@
}
func (api Gb28181Api) UpdateRunEnable(cameraId string,runEnable bool) (bool,interface{}){
- url := DATA_URL_PREFIX + "/camera/updateRunEnable"
+ url := DATA_URL_PREFIX + "/gb28181/camera/updateRunEnable"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false, nil
@@ -506,7 +506,7 @@
}
func (api Gb28181Api) UpdateIsRunningState(cameraId string,isRunning bool) (bool,interface{}){
- url := DATA_URL_PREFIX + "/camera/updateIsRunningState"
+ url := DATA_URL_PREFIX + "/gb28181/camera/updateIsRunningState"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false,nil
@@ -530,7 +530,7 @@
}
func (api Gb28181Api) UpdateIsRunningAll(cameraIds []string) (bool,interface{}){
- url := DATA_URL_PREFIX + "/camera/updateIsRunningAll"
+ url := DATA_URL_PREFIX + "/gb28181/camera/updateIsRunningAll"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false,nil
@@ -554,7 +554,7 @@
//鎵归噺鍒囨崲鎽勫儚鏈鸿疆璇㈡垨瀹炴椂鐘舵��
func (api Gb28181Api) ChangeRunType(paramBody map[string]interface{}) (bool,interface{}){
- url := DATA_URL_PREFIX + "/camera/changeRunType"
+ url := DATA_URL_PREFIX + "/gb28181/camera/changeRunType"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
if netNode == nil {
return false,nil
--
Gitblit v1.8.0