From cc9d7e2dfad7c634e8ce69d02ce5fc4065e809e4 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期日, 25 四月 2021 11:34:47 +0800
Subject: [PATCH] 使用bhsgo by lichao
---
gb28181Api.go | 70 -----------------------------------
1 files changed, 0 insertions(+), 70 deletions(-)
diff --git a/gb28181Api.go b/gb28181Api.go
index dc23192..cb018eb 100644
--- a/gb28181Api.go
+++ b/gb28181Api.go
@@ -3,7 +3,6 @@
import (
"basic.com/pubsub/protomsg.git"
"encoding/json"
- "errors"
"strconv"
)
@@ -14,9 +13,6 @@
//鍥芥爣閰嶇疆鏄剧ず
func (api Gb28181Api) Show() (flag bool,gbConfig protomsg.Gb28181Config) {
netNode := getNetNode(Topic_Gb28181_Service)
- if netNode == nil {
- return false, gbConfig
- }
url := DATA_URL_PREFIX + "/gb28181/configShow"
client := NewClient(WithNodes(netNode))
respBody, err := client.DoGetRequest(url, nil, nil)
@@ -40,9 +36,6 @@
func (api Gb28181Api) Edit(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/gb28181/configEdit"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false
- }
flag := false
client := NewClient(WithNodes(netNode))
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
@@ -59,9 +52,6 @@
func (api Gb28181Api) FindAreaByParentId(parentId string) (bool,interface{}) {
url := DATA_URL_PREFIX + "/gb28181/findAreaByParentId"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
- if netNode == nil {
- return false, nil
- }
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string, 0)
paramMap["parentId"] = parentId
@@ -79,9 +69,6 @@
func (api Gb28181Api) NewGbId(code string) (bool,interface{}) {
url := DATA_URL_PREFIX + "/gb28181/newGbId"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
- if netNode == nil {
- return false, nil
- }
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string, 0)
paramMap["code"] = code
@@ -102,9 +89,6 @@
func (api Gb28181Api) GetGb28181CameraTree(parentId string, searchType string, cameraName string) []TreeMenu {
url := DATA_URL_PREFIX + "/gb28181/tree"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
- if netNode == nil {
- return nil
- }
var result []TreeMenu
client := NewClient(WithNodes(netNode))
@@ -135,9 +119,6 @@
func (api Gb28181Api) Gb28181TreeRefresh(id string) bool {
url := DATA_URL_PREFIX + "/gb28181/treeRefresh"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false
- }
flag := false
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
@@ -159,9 +140,6 @@
func (api Gb28181Api) Gb28181TreeDelete() bool {
url := DATA_URL_PREFIX + "/gb28181/treeDelete"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false
- }
flag := false
client := NewClient(WithNodes(netNode))
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, nil, nil, nil)
@@ -180,9 +158,6 @@
func (api Gb28181Api) GetAllCamerasByServer(serverId string,cameraName string) (b bool,cams []protomsg.Camera) {
url := DATA_URL_PREFIX + "/gb28181/getAllCamerasByServer"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
paramQuery := make(map[string]string,0)
paramQuery["serverId"] = serverId
@@ -207,9 +182,6 @@
func (api Gb28181Api) FindOnMap(isOnMap bool, floor int, cameraName string) (b bool, cams []protomsg.Camera) {
url := DATA_URL_PREFIX + "/gb28181/camera/findOnMap"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
paramBody:= map[string]interface{}{
"isOnMap": isOnMap,
@@ -240,9 +212,6 @@
func (api Gb28181Api) UpdatePos(id string, floor int, longitude float32, latitude float32) bool {
url := DATA_URL_PREFIX + "/gb28181/camera/updatePos"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
paramBody:= map[string]interface{}{
"id": id,
@@ -268,9 +237,6 @@
func (api Gb28181Api) NodeCamera() (bool, interface{}) {
url := DATA_URL_PREFIX + "/gb28181/camera/nodeCamera"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
@@ -288,9 +254,6 @@
func (api Gb28181Api) Coord(cameraId string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/gb28181/camera/coord"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
paramQuery := map[string]string {
"cameraId": cameraId,
@@ -311,9 +274,6 @@
func (api Gb28181Api) UpdateCoord(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/gb28181/camera/updateCoord"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
if err != nil {
@@ -334,9 +294,6 @@
func (api Gb28181Api) CameraUpdate(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/gb28181/camera/update"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
body, err := client.DoPutRequest(url,CONTENT_TYPE_JSON,paramBody,nil)
if err != nil {
@@ -353,9 +310,6 @@
func (api Gb28181Api) UpdateSnapshotUrl(cameraId string, snapshot string) bool {
url := DATA_URL_PREFIX + "/gb28181/camera/updateSnapshot"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
paramBody :=make(map[string]interface{},0)
paramBody["snapshot"] = snapshot
@@ -378,9 +332,6 @@
func (api Gb28181Api) GetCameraById(cameraId string) (camera protomsg.Camera, err error) {
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")
- }
client := NewClient(WithNodes(netNode))
paramQuery := map[string]string {
"cid": cameraId,
@@ -404,9 +355,6 @@
func (api Gb28181Api) UpdateCameraArea(cameraId string, areaId string) bool {
url := DATA_URL_PREFIX + "/gb28181/camera/updateCameraArea"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{} {
"cameraId": cameraId,
@@ -428,9 +376,6 @@
func (api Gb28181Api) FindAll(cameraName string, runType string, cameraId string, areaId string) (cameras []protomsg.Camera) {
url := DATA_URL_PREFIX + "/gb28181/camera/showAll"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return nil
- }
client := NewClient(WithNodes(netNode))
paramQuery := map[string]string {
"cameraName": cameraName,
@@ -461,9 +406,6 @@
func (api Gb28181Api) GetCamerasByRunType(runType int,cameraName string)(flag bool,cameras []protomsg.Camera){
url := DATA_URL_PREFIX + "/gb28181/camera/getCamerasByRunType"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
paramQuery := make(map[string]string,2)
paramQuery["runType"]=strconv.Itoa(runType)
@@ -492,9 +434,6 @@
func (api Gb28181Api) UpdateRunEnable(cameraId string,runEnable bool) (bool,interface{}){
url := DATA_URL_PREFIX + "/gb28181/camera/updateRunEnable"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false, nil
- }
client := NewClient(WithNodes(netNode))
paramBody :=make(map[string]interface{},0)
paramBody["cameraId"] = cameraId
@@ -516,9 +455,6 @@
func (api Gb28181Api) UpdateIsRunningState(cameraId string,isRunning bool) (bool,interface{}){
url := DATA_URL_PREFIX + "/gb28181/camera/updateIsRunningState"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
paramBody :=make(map[string]interface{},0)
paramBody["cameraId"] = cameraId
@@ -540,9 +476,6 @@
func (api Gb28181Api) UpdateIsRunningAll(cameraIds []string) (bool,interface{}){
url := DATA_URL_PREFIX + "/gb28181/camera/updateIsRunningAll"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
paramBody :=make(map[string]interface{},0)
paramBody["cameraIds"] = cameraIds
@@ -564,9 +497,6 @@
func (api Gb28181Api) ChangeRunType(paramBody map[string]interface{}) (bool,interface{}){
url := DATA_URL_PREFIX + "/gb28181/camera/changeRunType"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
if err != nil {
--
Gitblit v1.8.0