From eaf1da6b55de31feb35a1e5f7ac09ae3782c73ac Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 23 五月 2019 10:57:08 +0800
Subject: [PATCH] fix deliver.NewConsumer
---
cameraApi.go | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 2b3d484..451f837 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -1,6 +1,7 @@
package dbapi
import (
+ "basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
)
@@ -8,10 +9,11 @@
type CameraApi struct{}
//閫氳繃cameraId鑾峰彇鎽勫儚鏈轰俊鎭�
-func (api CameraApi) GetCameraById(cameraId string) (result Camera, err error) {
- url := BASIC_URL + "/data/api-v/camera/show/" + cameraId
+func (api CameraApi) GetCameraById(cameraId string) (result protomsg.Camera, err error) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/show/" + cameraId
+ client := NewClient()
- body, err := DoGetRequest(url, nil, nil)
+ body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
return result, err
}
@@ -19,6 +21,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
fmt.Println(err)
+ return result,err
}
bytes, _ := json.Marshal(res.Data)
@@ -26,3 +29,24 @@
return result, err
}
+
+func (api CameraApi) FindAll() (cameras []protomsg.Camera) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/showAll"
+ 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, &cameras)
+
+ return cameras
+}
--
Gitblit v1.8.0