From 11a04ff41abe8e84925249c7118e7b47150fb0ff Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 三月 2021 11:22:15 +0800
Subject: [PATCH] 判断数据类型
---
cameraApi.go | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index fcfdb19..c5278c4 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -1,4 +1,4 @@
-package dbapi
+package bhomedbapi
import (
"basic.com/pubsub/protomsg.git"
@@ -81,7 +81,7 @@
}
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string,0)
- paramMap["cid"] = cid
+ paramMap["id"] = cid
body, err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM,nil,paramMap)
if err != nil {
return false
@@ -102,8 +102,10 @@
return camera,errors.New("camera-service not found")
}
client := NewClient(WithNodes(netNode))
-
- body, err := client.DoGetRequest(url, nil, nil)
+ paramQuery := map[string]string {
+ "id": cameraId,
+ }
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return camera, err
}
@@ -143,15 +145,21 @@
return res.Success
}
-func (api CameraApi) FindAll() (cameras []protomsg.Camera) {
+func (api CameraApi) FindAll(cameraName string, runType string, cameraId string, areaId 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,
+ "areaId": areaId,
+ }
- body, err := client.DoGetRequest(url, nil, nil)
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return nil
}
--
Gitblit v1.8.0