From 11a04ff41abe8e84925249c7118e7b47150fb0ff Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 三月 2021 11:22:15 +0800
Subject: [PATCH] 判断数据类型
---
gb28181Api.go | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/gb28181Api.go b/gb28181Api.go
index d8fae2f..dc23192 100644
--- a/gb28181Api.go
+++ b/gb28181Api.go
@@ -382,8 +382,10 @@
return camera,errors.New("gb28181-service not found")
}
client := NewClient(WithNodes(netNode))
-
- body, err := client.DoGetRequest(url, nil, nil)
+ paramQuery := map[string]string {
+ "cid": cameraId,
+ }
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return camera, err
}
@@ -423,15 +425,21 @@
return res.Success
}
-func (api Gb28181Api) FindAll() (cameras []protomsg.Camera) {
+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,
+ "runType": runType,
+ "cameraId": cameraId,
+ "areaId": areaId,
+ }
- body, err := client.DoGetRequest(url, nil, nil)
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return nil
}
--
Gitblit v1.8.0