From 9d88c7c467f8d93af4aab9ba0b6d6c01c2ffc546 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:35:30 +0800
Subject: [PATCH] add get buckets contrl

---
 controllers/cameraRule.go |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/controllers/cameraRule.go b/controllers/cameraRule.go
index 60e6bbf..013a4e0 100644
--- a/controllers/cameraRule.go
+++ b/controllers/cameraRule.go
@@ -2,6 +2,7 @@
 
 import (
 	"basic.com/dbapi.git"
+	"basic.com/valib/logger.git"
 	"github.com/gin-gonic/gin"
 	"webserver/extend/code"
 	"webserver/extend/util"
@@ -17,22 +18,25 @@
 	TargetIds []string `json:"targetIds" binging:"required"`
 }
 
+// @Security ApiKeyAuth
 // @Summary 鏄剧ず鎽勫儚鏈哄満鏅鍒�
 // @Description 鏄剧ず鎽勫儚鏈哄満鏅鍒�
 // @Accept json
 // @Produce json
 // @Tags 鎽勫儚鏈鸿鍒�
+// @Param cameraId query string true "鎽勫儚鏈篿d"
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
-// @Router /data/api-v/camera/rule/{cameraId} [get]
+// @Router /data/api-v/camera/rule/findByCameraId [get]
 func (crc CameraRuleController) FindByCameraId(c *gin.Context) {
-	cameraId := c.Param("cameraId")
+	cameraId := c.Query("cameraId")
 	if cameraId == "" {
 		util.ResponseFormat(c,code.RequestParamError,"")
 		return
 	}
 	var api dbapi.CameraRuleApi
 	b,d := api.FindByCameraId(cameraId)
+	logger.Debug("b:", b, d)
 	if b {
 		util.ResponseFormat(c,code.Success,d)
 	} else {
@@ -40,6 +44,7 @@
 	}
 }
 
+// @Security ApiKeyAuth
 // @Summary 淇濆瓨鎽勫儚鏈虹嫭绔嬭鍒�
 // @Description 淇濆瓨鎽勫儚鏈虹嫭绔嬭鍒�
 // @Accept json
@@ -58,13 +63,15 @@
 	}
 	param := util.Struct2Map(reqBody)
 	var api dbapi.CameraRuleApi
-	if api.Save(param) {
+	b,d := api.Save(param)
+	if b {
 		util.ResponseFormat(c,code.Success,"")
 	} else {
-		util.ResponseFormat(c,code.ComError,"")
+		util.ResponseFormat(c,code.ComError,d)
 	}
 }
 
+// @Security ApiKeyAuth
 // @Summary 澶嶅埗鎽勫儚鏈鸿鍒欏埌閫夊畾鐨勫涓憚鍍忔満
 // @Description 澶嶅埗鎽勫儚鏈鸿鍒欏埌閫夊畾鐨勫涓憚鍍忔満
 // @Accept json
@@ -90,6 +97,7 @@
 	}
 }
 
+// @Security ApiKeyAuth
 // @Summary 淇濆瓨鑱斿姩浠诲姟瑙勫垯鍙傛暟
 // @Description 淇濆瓨鑱斿姩浠诲姟瑙勫垯鍙傛暟
 // @Accept json
@@ -107,13 +115,15 @@
 	}
 	param := util.Struct2Map(saveBody)
 	var api dbapi.CameraRuleApi
-	if api.SaveLinkRulesByGroup(param) {
-		util.ResponseFormat(c,code.Success,saveBody)
+	b,d := api.SaveLinkRulesByGroup(param)
+	if b {
+		util.ResponseFormat(c,code.Success, d)
 	} else {
-		util.ResponseFormat(c,code.ComError, "")
+		util.ResponseFormat(c,code.ComError, d)
 	}
 }
 
+// @Security ApiKeyAuth
 // @Summary 鏍规嵁澶氫釜鎽勫儚鏈篿d鏌ヨ鑱斿姩浠诲姟瑙勫垯璁剧疆
 // @Description 鏍规嵁澶氫釜鎽勫儚鏈篿d鏌ヨ鑱斿姩浠诲姟瑙勫垯璁剧疆
 // @Accept json
@@ -144,6 +154,7 @@
 
 }
 
+// @Security ApiKeyAuth
 // @Summary 淇敼瑙勫垯缁勬姤璀︾瓑绾�
 // @Description 淇敼瑙勫垯缁勬姤璀︾瓑绾�
 // @Produce json
@@ -168,14 +179,15 @@
 	}
 }
 
+// @Security ApiKeyAuth
 // @Summary 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
 // @Description 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
 // @Produce json
-// @Tags CameraTaskArgs
+// @Tags 鎽勫儚鏈鸿鍒�
 // @Param groupId path string true "浠诲姟绠楁硶鍙傛暟鍒嗙粍id"
 // @Success 200 {string} json "{"code":200, success:true, msg:"璇锋眰澶勭悊鎴愬姛", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:"閿欒淇℃伅鍐呭"}"
-// @Router /data/api-v/camera/rule/deleteGroup/{groupId} [get]
+// @Router /data/api-v/camera/rule/deleteGroup/{groupId} [delete]
 func (crc CameraRuleController) DeleteByGroup(c *gin.Context) {
 	groupId := c.Param("groupId")
 	if groupId == "" {
@@ -185,6 +197,7 @@
 	var api dbapi.CameraRuleApi
 	if api.DeleteByGroup(groupId) {
 		util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")//鎽勫儚鏈轰换鍔″弬鏁板垹闄ゅ畬浜�
+	} else {
+		util.ResponseFormat(c, code.ComError, "鍒犻櫎澶辫触")
 	}
-	util.ResponseFormat(c, code.ComError, "鍒犻櫎澶辫触")
 }
\ No newline at end of file

--
Gitblit v1.8.0