From 340db27a81cb13dc39bd754fb2f70440b54f0e32 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 17 十二月 2020 14:06:58 +0800
Subject: [PATCH] 添加CameraGroupApi.go

---
 cameraRuleApi.go |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/cameraRuleApi.go b/cameraRuleApi.go
index 1d03a34..e0f08a7 100644
--- a/cameraRuleApi.go
+++ b/cameraRuleApi.go
@@ -25,33 +25,40 @@
 }
 
 func (api CameraRuleApi) FindByCameraId(cameraId string) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/"+cameraId
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/findByCameraId"
 	client := NewClient()
-	body, err := client.DoGetRequest(url,nil,nil)
+	param := map[string]string {
+		"cameraId": cameraId,
+	}
+	body, err := client.DoGetRequest(url,param,nil)
 	if err != nil {
+		logPrint(err)
 		return false,nil
 	}
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
+		logPrint(err)
 		return false,nil
 	}
 	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 {
-		return false
+		logPrint(err)
+		return false, err.Error()
 	}
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		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 {
@@ -59,29 +66,33 @@
 	client := NewClient()
 	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
 	if err != nil {
+		logPrint(err)
 		return false
 	}
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
+		logPrint(err)
 		return false
 	}
 	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 {
-		return false
+		logPrint(err)
+		return false, err.Error()
 	}
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false
+		logPrint(err)
+		return false, err.Error()
 	}
-	return res.Success
+	return res.Success, res.Data
 }
 
 func (api CameraRuleApi) GetLinkRulesByCameraIds(reqBody map[string]interface{}) (bool,interface{}) {
@@ -89,11 +100,13 @@
 	client := NewClient()
 	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
 	if err != nil {
+		logPrint(err)
 		return false,nil
 	}
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
+		logPrint(err)
 		return false,nil
 	}
 	return res.Success, res.Data
@@ -104,29 +117,30 @@
 	client := NewClient()
 	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
 	if err != nil {
+		logPrint(err)
 		return false
 	}
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
+		logPrint(err)
 		return false
 	}
 	return res.Success
 }
 
 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
 	}
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
+		logPrint(err, "body:", string(body))
 		return false
 	}
 	return res.Success
@@ -137,11 +151,13 @@
 	client := NewClient()
 	body, err := client.DoGetRequest(url, nil,nil)
 	if err != nil {
+		logPrint(err)
 		return false,nil
 	}
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
+		logPrint(err)
 		return false,nil
 	}
 	if !res.Success {

--
Gitblit v1.8.0