From e49473afa5e9c1586c06b971d19fbc51560deef6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 31 五月 2019 13:13:26 +0800
Subject: [PATCH] add rply mode

---
 cameraApi.go |   72 ++++++++++++++++++++++++++++++++++--
 1 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/cameraApi.go b/cameraApi.go
index 2b3d484..e7ff5e4 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -1,17 +1,37 @@
 package dbapi
 
 import (
+	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
 	"fmt"
 )
 
 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) CameraAdd(camera protomsg.Camera) bool {
+	url := BASIC_URL + DATA_URL_PREFIX + "/camera/add"
+	client := NewClient()
+	bodyParam := make(map[string]interface{},0)
+	bodyParam["name"]=camera.Name
+	bodyParam["areaid"] = camera.Areaid
+	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON,bodyParam,nil,nil)
+	if err != nil {
+		return false
+	}
 
-	body, err := DoGetRequest(url, nil, nil)
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false
+	}
+	return res.Success
+}
+
+//閫氳繃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 := client.DoGetRequest(url, nil, nil)
 	if err != nil {
 		return result, err
 	}
@@ -19,6 +39,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 +47,46 @@
 
 	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
+}
+
+//鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
+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