From 346621ed7d192360008645ea2bbeb2d7b6f665bc Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期日, 28 六月 2020 20:03:10 +0800
Subject: [PATCH] fix DeleteGroup

---
 cameraRuleApi.go |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/cameraRuleApi.go b/cameraRuleApi.go
index 7e60a29..6438f3c 100644
--- a/cameraRuleApi.go
+++ b/cameraRuleApi.go
@@ -24,16 +24,38 @@
 	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
 }
 
+func (api CameraRuleApi) FindByCameraId(cameraId string) (bool,interface{}) {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/findByCameraId"
+	client := NewClient()
+	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 {
 	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
 	}
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
+		logPrint(err)
 		return false
 	}
 	return res.Success
@@ -44,11 +66,13 @@
 	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
@@ -59,26 +83,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 RuleTemplateApi) GetLinkRulesByCameraIds(reqBody map[string]interface{}) (bool,interface{}) {
+func (api CameraRuleApi) GetLinkRulesByCameraIds(reqBody map[string]interface{}) (bool,interface{}) {
 	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/getLinkRulesByCameraIds"
 	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
@@ -89,44 +117,47 @@
 	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)
 		return false
 	}
 	return res.Success
 }
 
-func (api CameraRuleApi) FindAll(groupId string) (flag bool,allRules []protomsg.CameraAndRules) {
+func (api CameraRuleApi) FindAll() (flag bool,allRules []protomsg.CameraAndRules) {
 	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/findAll"
 	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