From d3b72f9587126ab6b4b7424934afcfa187a6c8a4 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 01 二月 2021 14:21:10 +0800
Subject: [PATCH] 本地摄像机和国标摄像机的FindAll添加参数
---
gb28181Api.go | 9 +++++++--
cameraApi.go | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index d53e9c4..1e9c8b4 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -145,15 +145,20 @@
return res.Success
}
-func (api CameraApi) FindAll() (cameras []protomsg.Camera) {
+func (api CameraApi) FindAll(cameraName string, runType string, cameraId string) (cameras []protomsg.Camera) {
url := DATA_URL_PREFIX + "/camera/showAll"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
if netNode == nil {
return nil
}
client := NewClient(WithNodes(netNode))
+ paramQuery := map[string]string {
+ "cameraName": cameraName,
+ "runType": runType,
+ "cameraId": cameraId,
+ }
- body, err := client.DoGetRequest(url, nil, nil)
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return nil
}
diff --git a/gb28181Api.go b/gb28181Api.go
index 83ab3bc..4a6603b 100644
--- a/gb28181Api.go
+++ b/gb28181Api.go
@@ -425,15 +425,20 @@
return res.Success
}
-func (api Gb28181Api) FindAll() (cameras []protomsg.Camera) {
+func (api Gb28181Api) FindAll(cameraName string, runType string, cameraId 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,
+ }
- body, err := client.DoGetRequest(url, nil, nil)
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return nil
}
--
Gitblit v1.8.0