From f529b0fe67d68a4be6e9690043ee5d6837be72df Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期二, 12 一月 2021 11:05:50 +0800
Subject: [PATCH] getAppInfo and voice add
---
cameraRuleApi.go | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/cameraRuleApi.go b/cameraRuleApi.go
index ef22177..e0f08a7 100644
--- a/cameraRuleApi.go
+++ b/cameraRuleApi.go
@@ -25,7 +25,7 @@
}
func (api CameraRuleApi) FindByCameraId(cameraId string) (bool,interface{}) {
- url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/findByCameraId"
client := NewClient()
param := map[string]string {
"cameraId": cameraId,
@@ -44,21 +44,21 @@
return res.Success, res.Data
}
-func (api CameraRuleApi) Save(reqBody map[string]interface{}) bool {
+func (api CameraRuleApi) Save(reqBody map[string]interface{}) (bool,interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/save"
client := NewClient()
body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
if err != nil {
logPrint(err)
- return false
+ return false, err.Error()
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- logPrint(err)
- return false
+ logPrint("result:", res, "err:", err, "body:", string(body))
+ return false, err.Error()
}
- return res.Success
+ return res.Success, res.Data
}
func (api CameraRuleApi) PasteRules(reqBody map[string]interface{}) bool {
@@ -78,21 +78,21 @@
return res.Success
}
-func (api CameraRuleApi) SaveLinkRulesByGroup(reqBody map[string]interface{}) bool {
+func (api CameraRuleApi) SaveLinkRulesByGroup(reqBody map[string]interface{}) (bool, interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/saveLinkRulesByGroup"
client := NewClient()
body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
if err != nil {
logPrint(err)
- return false
+ return false, err.Error()
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false
+ return false, err.Error()
}
- return res.Success
+ return res.Success, res.Data
}
func (api CameraRuleApi) GetLinkRulesByCameraIds(reqBody map[string]interface{}) (bool,interface{}) {
@@ -130,12 +130,9 @@
}
func (api CameraRuleApi) DeleteByGroup(groupId string) bool {
- url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/deleteByGroup"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/deleteGroup/"+groupId
client := NewClient()
- paraM := map[string]string {
- "groupId": groupId,
- }
- body, err := client.DoGetRequest(url, paraM,nil)
+ body, err := client.DoDeleteRequest(url, CONTENT_TYPE_JSON, nil,nil)
if err != nil {
logPrint(err)
return false
@@ -143,7 +140,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- logPrint(err)
+ logPrint(err, "body:", string(body))
return false
}
return res.Success
--
Gitblit v1.8.0