From c0d33072098bf68d1a9734c31e01756a5b7c50a8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 23 五月 2019 18:30:34 +0800
Subject: [PATCH] add camera note
---
cameraApi.go | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 202bcf7..17bee01 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -1,7 +1,7 @@
package dbapi
import (
- "dbapi/protomsg"
+ "basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
)
@@ -30,6 +30,7 @@
return result, err
}
+//鏌ユ壘鎵�鏈夋憚鍍忔満
func (api CameraApi) FindAll() (cameras []protomsg.Camera) {
url := BASIC_URL + DATA_URL_PREFIX + "/camera/showAll"
client := NewClient()
@@ -50,3 +51,25 @@
return cameras
}
+
+//鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
+func (api CameraApi) FindAllCameraAndTask() (cameraTasks []protomsg.CameraAndTaskInfo){
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
+ client := NewClient()
+
+ body, err := client.DoGetRequest(url, nil, nil)
+ if err != nil {
+ return nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ fmt.Println(err)
+ return nil
+ }
+
+ bytes, _ := json.Marshal(res.Data)
+ err = json.Unmarshal(bytes, &cameraTasks)
+
+ return cameraTasks
+}
\ No newline at end of file
--
Gitblit v1.8.0