From 6f81848489bf07dcb9d72007cda214f8e860f09d Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 04 三月 2021 17:03:54 +0800
Subject: [PATCH] add findAllCameraLink
---
cameraRuleApi.go | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/cameraRuleApi.go b/cameraRuleApi.go
index 4f9e5a8..f219df5 100644
--- a/cameraRuleApi.go
+++ b/cameraRuleApi.go
@@ -257,8 +257,44 @@
return res.Data.(bool)
}
+
+func (api CameraRuleApi) FindAllCameraLink() (b bool, list []protomsg.CameraLink) {
+ url := DATA_URL_PREFIX + "/camera/findAllCameraLink"
+ netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
+ if netNode == nil {
+ return false, nil
+ }
+ client := NewClient(WithNodes(netNode))
+ body, err := client.DoGetRequest(url, nil,nil)
+ if err != nil {
+ logPrint(err)
+ return false, nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ logPrint(err)
+ return false, nil
+ }
+ if !res.Success {
+ return false, nil
+ } else {
+ bts, e := json.Marshal(res.Data)
+ if e != nil {
+ logPrint(e)
+ return false, nil
+ }
+ err = json.Unmarshal(bts, &list)
+ if err == nil {
+ return true, list
+ } else {
+ return false ,nil
+ }
+ }
+}
+
func (api CameraRuleApi) FindLinksByCameraIds(camIds []string) (b bool,linkList []protomsg.CameraLink) {
- url := DATA_URL_PREFIX + "/camera/rule/existRunningTask"
+ url := DATA_URL_PREFIX + "/camera/rule/findLinksByCameraIds"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
if netNode == nil {
return false, nil
@@ -286,7 +322,7 @@
return false, nil
}
err = json.Unmarshal(bts, &linkList)
- if err != nil {
+ if err == nil {
return true, linkList
}
}
--
Gitblit v1.8.0