From c28ecf5f18443f8b0c5faa50afcaa12abd8f2d10 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 23 十月 2019 19:07:32 +0800
Subject: [PATCH] 设置平台信息返回值debug
---
gb28181Api.go | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/gb28181Api.go b/gb28181Api.go
index d9d6560..cf5baac 100644
--- a/gb28181Api.go
+++ b/gb28181Api.go
@@ -6,6 +6,7 @@
"fmt"
"log"
"strconv"
+ urlLib "net/url"
)
func SmartPrintStruct(src interface{}) string {
@@ -25,23 +26,27 @@
//SetPlatformServerInfo 璁剧疆鏈嶅姟鍣ㄤ俊鎭�
func (api Gb28181Api) SetPlatformServerInfo(serverInfo GbServerInfo) bool {
- url := BASIC_URL + DATA_URL_PREFIX + "/set_platform_server"
+ serverInfo.GbUsername = serverInfo.PublicID //閴存潈鍚嶅瓧涓嶇敓鏁堬紝鏈�濂藉拰璁惧id涓�鑷�
+
+ u := urlLib.Values{}
+ u.Set("gbsvrname", serverInfo.Name)
+ u.Set("gbsvrid", serverInfo.PublicID)
+ u.Set("gbsvrport", strconv.Itoa(serverInfo.GbServerPort))
+ u.Set("registerauth", strconv.FormatBool(serverInfo.RegisterAuth))
+ u.Set("gbusername", serverInfo.GbUsername)
+ u.Set("gbpasswd", serverInfo.GbPasswd)
+ str := u.Encode()
+ url := BASIC_URL + DATA_URL_PREFIX + "/set_platform_server?" + str
+ log.Println("url:", url)
+
client := NewClient()
-
- paramBody := make(map[string]string, 0)
- paramBody["gbsvrid"] = serverInfo.PublicID
- paramBody["gbsvrport"] = strconv.Itoa(serverInfo.GbServerPort)
- paramBody["gbsvrname"] = serverInfo.Name
- paramBody["rtspsvrport"] = strconv.Itoa(serverInfo.RtspServrPort)
-
- // fmt.Println("url:", url)
- body, err := client.DoGetRequest(url, paramBody, nil)
+ body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
return false
}
var res GbResult
- // fmt.Println("body", string(body))
+ log.Println("body:", string(body[:]))
if err = json.Unmarshal(body, &res); err != nil {
log.Println("jsonErr:", err)
return false
@@ -88,7 +93,7 @@
//GetDevicesByPageNO 鎸夐〉鑾峰彇涓嬬骇璁惧锛堝钩鍙版垨鎽勫儚鏈猴級鍒楄〃
//pageNo (鏁板瓧) 鎸囧畾鑾峰彇绗嚑椤碉紝绗竴娆′负1锛岃繑鍥炴�婚〉鏁帮紝鎬绘潯鏁扮瓑锛屽啀鏍规嵁杩欎簺淇℃伅鍘诲啀娆℃煡璇紝鐩村埌鍙栧畬鍏ㄩ儴
-func (api Gb28181Api) GetDevicesByPageNO(pageNo int) (DevicesInOnePage, bool) {
+func (api Gb28181Api) getDevicesByPageNO(pageNo int) (DevicesInOnePage, bool) {
url := BASIC_URL + DATA_URL_PREFIX + "/get_all_device/" + strconv.Itoa(pageNo)
client := NewClient()
@@ -115,7 +120,7 @@
//GetAllDevices 鑾峰彇鍏ㄩ儴涓嬬骇璁惧锛堝钩鍙版垨鎽勫儚鏈猴級淇℃伅鍒楄〃
func (api Gb28181Api) GetAllDevices() ([]DeviceInfo, bool) {
var deviceSlice []DeviceInfo
- devicesPerPage, flag := api.GetDevicesByPageNO(1)
+ devicesPerPage, flag := api.getDevicesByPageNO(1)
if !flag {
log.Println("GetDevicesByPageNO Error, deviceSlice is nil")
return deviceSlice, false
@@ -123,7 +128,7 @@
deviceSlice = devicesPerPage.Data
for i := 1; i < devicesPerPage.TotalPage; i++ {
- devicesPerPage, flag := api.GetDevicesByPageNO(i + 1)
+ devicesPerPage, flag := api.getDevicesByPageNO(i + 1)
if !flag {
log.Println("GetDevicesByPageNO Error,pageno:" + strconv.Itoa(i+1) + " ,deviceSlice is not completed")
return deviceSlice, false
@@ -139,7 +144,7 @@
//pageNo (鏁板瓧) 鎸囧畾鑾峰彇绗嚑椤碉紝绗竴娆′负1锛岃繑鍥炴�婚〉鏁帮紝鎬绘潯鏁扮瓑锛屽啀鏍规嵁杩欎簺淇℃伅鍘诲啀娆℃煡璇紝鐩村埌鍙栧畬鍏ㄩ儴
//srcType (瀛楃涓�) "all"-琛ㄧず鑾峰彇璁惧鐨勬墍鏈夎祫婧� "node"-鐖惰妭鐐逛笅鐨勭涓�绾ц祫婧�
//娉ㄦ剰锛氭牴鎹�"restype"瀛楁锛屽拷鐣ヨ祫婧愮粍锛屽彧淇濈暀閫氶亾璧勬簮------"restype"锛�(鏁板瓧)1-閫氶亾璧勬簮 2-璧勬簮缁�
-func (api Gb28181Api) GetCamsByDevAndPage(devID string, srcType string, pageNo int) (CamerasInOnePage, bool) {
+func (api Gb28181Api) getCamsByDevAndPage(devID string, srcType string, pageNo int) (CamerasInOnePage, bool) {
url := BASIC_URL + DATA_URL_PREFIX + "/get_all_channel/" + devID + "/" + srcType + "/" + strconv.Itoa(pageNo)
client := NewClient()
@@ -176,7 +181,7 @@
//devID (瀛楃涓�) 娉ㄥ唽鐨勮澶囩殑20浣峣d
func (api Gb28181Api) GetAllCamerasByDevID(devID string) ([]CameraInfo, bool) {
var cameraSlice []CameraInfo
- camerasPerPage, flag := api.GetCamsByDevAndPage(devID, "all", 1)
+ camerasPerPage, flag := api.getCamsByDevAndPage(devID, "all", 1)
if !flag {
log.Println("GetCamsByDevAndPage Error, deviceSlice is nil")
return cameraSlice, false
@@ -184,7 +189,7 @@
cameraSlice = camerasPerPage.Data
for i := 1; i < camerasPerPage.TotalPage; i++ {
- camerasPerPage, flag := api.GetCamsByDevAndPage(devID, "all", i+1)
+ camerasPerPage, flag := api.getCamsByDevAndPage(devID, "all", i+1)
if !flag {
log.Println("GetCamsByDevAndPage Error! devID:" + devID + ",type:all,pageno:" + strconv.Itoa(i+1) + " ,cameraSlice is not completed")
return cameraSlice, false
@@ -221,7 +226,7 @@
}
//GetAllCamerasByDomainUnit get all cameras by domainunit 鑾峰彇鎵�鏈夎鏀垮尯鍩熶笅鐨勮澶�
-func (api Gb28181Api) GetAllCamerasByDomainUnitAndPage(domainpubid string, pageNo int) (CamerasInOnePage, bool) {
+func (api Gb28181Api) getAllCamerasByDomainUnitAndPage(domainpubid string, pageNo int) (CamerasInOnePage, bool) {
url := BASIC_URL + DATA_URL_PREFIX + "/get_domainunit_channel/" + domainpubid + "/" + strconv.Itoa(pageNo)
client := NewClient()
@@ -248,7 +253,7 @@
//GetAllCamerasByDevID 鑾峰彇鎸囧畾琛屾斂鍖哄煙鐨勬憚鍍忔満鍒楄〃
func (api Gb28181Api) GetAllCamerasByDomainUnit(domainpubid string) ([]CameraInfo, bool) {
var cameraSlice []CameraInfo
- camerasPerPage, flag := api.GetAllCamerasByDomainUnitAndPage(domainpubid, 1)
+ camerasPerPage, flag := api.getAllCamerasByDomainUnitAndPage(domainpubid, 1)
if !flag {
log.Println("GetCamsByDevAndPage Error, deviceSlice is nil")
return cameraSlice, false
@@ -256,7 +261,7 @@
cameraSlice = camerasPerPage.Data
for i := 1; i < camerasPerPage.TotalPage; i++ {
- camerasPerPage, flag := api.GetAllCamerasByDomainUnitAndPage(domainpubid, i+1)
+ camerasPerPage, flag := api.getAllCamerasByDomainUnitAndPage(domainpubid, i+1)
if !flag {
log.Println("GetCamsByDevAndPage Error! devID:" + domainpubid + ",type:all,pageno:" + strconv.Itoa(i+1) + " ,cameraSlice is not completed")
return cameraSlice, false
@@ -307,6 +312,7 @@
}
}
+ log.Println("dmUnits:", dmUnits)
return dmUnits, true
}
@@ -348,6 +354,7 @@
api.getGroupsByGroupID(devID, &dmUnitAll)
+ log.Println("dmUnitAll:", dmUnitAll)
return dmUnitAll
}
@@ -404,6 +411,39 @@
return cameraSlice, true
}
+//updateResourceByID 鏇存柊涓嬬骇骞冲彴璧勬簮
+func (api Gb28181Api) updateResourceByID(devID string) bool {
+ url := BASIC_URL + "/vss/get_catalog/" + devID
+ client := NewClient()
+
+ body, err := client.DoGetRequest(url, nil, nil)
+ if err != nil {
+ log.Println("err:", err)
+ return false
+ }
+
+ var res GbResult
+ if err = json.Unmarshal(body, &res); err != nil {
+ log.Println("jsonErr:", err)
+ return false
+ }
+ if res.ErrCode != 0 {
+ log.Println("errcode: ", res.ErrCode, " errdesc: ", res.ErrDesc)
+ return false
+ }
+
+ return true
+}
+
+func (api Gb28181Api) UpdateAllResource() {
+ devices, b := api.GetAllDevices()
+ if b && len(devices) > 0 {
+ for _, device := range devices {
+ api.updateResourceByID(device.PublicID)
+ }
+ }
+}
+
//SetCameraPtz 2.3 PTZ浜戝彴鎺у埗
//"channelid": (瀛楃涓�) 閫氶亾20浣嶇紪鍙�
//"ptztype"锛� (瀛楃涓�) 鎺у埗绫诲瀷锛氫笂"up",涓�"down",宸�"left",鍙�"right",宸︿笂"leftup",宸︿笅"leftdown",鍙充笂"rightup",鍙充笅"rightdown",闀滃ご杩�"zoomin",闀滃ご杩�"zoomout",
@@ -419,7 +459,6 @@
return false
}
- //瑙ｆ瀽 CamerasInOnePage
var res GbResult
if err = json.Unmarshal(body, &res); err != nil {
log.Println("jsonErr:", err)
--
Gitblit v1.8.0