From 00c6fb6a7196832f46bbce513b58bc6d9a3c9fa5 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 23 七月 2019 19:29:03 +0800
Subject: [PATCH] add permissions
---
controllers/area.go | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/controllers/area.go b/controllers/area.go
index c4ba15d..4d5771f 100644
--- a/controllers/area.go
+++ b/controllers/area.go
@@ -5,28 +5,14 @@
"webserver/extend/code"
"webserver/extend/util"
"github.com/gin-gonic/gin"
- "strconv"
)
type AreaController struct {
}
-//type TreeMenu struct {
-// Id string `json:"id" `
-// Type string `json:"type"` // 濡傛灉涓嶆槸MENU锛屽尯鍒嗘湰鍦版憚鍍忔満锛堝垎鏋愬拰鐩戞帶锛変互鍙婂浗鏍囨憚鍍忔満
-// Name string `json:"name"`
-// Areanodes []TreeMenu `json:"children"`
-//}
-//
-//type TreeNode struct {
-// Id int
-// Name string
-// Parentid int
-//}
-
type AreaVo struct {
- Id int `json:"id"`
- ParentId int `json:"parentId"`
+ Id string `json:"id"`
+ ParentId string `json:"parentId"`
Name string `json:"name"`
}
@@ -48,6 +34,24 @@
util.ResponseFormat(c, code.Success, arr)
}
+// @Summary 鏄剧ずGb28181鏍戝舰缁撴瀯
+// @Description 鏄剧ずGb28181鏍戝舰缁撴瀯
+// @Produce json
+// @Tags menu
+// @Param parentid query int true "鍖哄煙鐨刬d"
+// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁"}"
+// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅"}"
+// @Router /data/api-v/area/localmenu [get]
+func (ac AreaController) CameraGb28181Tree(c *gin.Context) {
+ parentIdStr := c.Query("parentid")
+ searchTypeStr := c.Query("searchType")
+ cameraName := c.Query("cameraName")
+
+ var api dbapi.AreaApi
+ arr := api.GetGb28181CameraTree(parentIdStr, searchTypeStr, cameraName)
+ util.ResponseFormat(c, code.Success, arr)
+}
+
// @Summary 娣诲姞menu鐨勫尯鍩�
// @Description 娣诲姞鐩綍涓婂尯鍩�
// @Produce json
@@ -61,20 +65,17 @@
var api dbapi.AreaApi
name := c.PostForm("name")
- parentId, err := strconv.Atoi(c.PostForm("parentId"))
- if err !=nil {
- util.ResponseFormat(c, code.RequestParamError, "parentId鍙傛暟閿欒")
- return
- }
+ parentId := c.PostForm("parentId")
+
var model = AreaVo{
Name:name,
ParentId:parentId,
}
paramBody := util.Struct2Map(model)
if api.AreaAdd(paramBody) {
- util.ResponseFormat(c,code.Success,"淇濆瓨鎴愬姛")
+ util.ResponseFormat(c,code.AddSuccess,"娣诲姞鎴愬姛")
} else {
- util.ResponseFormat(c,code.ComError,"淇濆瓨澶辫触")
+ util.ResponseFormat(c,code.ComError,"娣诲姞澶辫触")
}
}
@@ -90,14 +91,14 @@
// @Failure 200 {string} json "{"code":"閿欒鐮�", data:"鍑洪敊淇℃伅",msg:"璇锋眰澶辫触", success:false}"
// @Router /data/api-v/area/update [post]
func (ac AreaController) AreaUpdate(c *gin.Context) {
- id,err := strconv.Atoi(c.PostForm("id"))
- if err !=nil{
+ id := c.PostForm("id")
+ if id == ""{
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
return
}
name := c.PostForm("name")
- parentId, err := strconv.Atoi(c.PostForm("parentId"))
- if err !=nil {
+ parentId := c.PostForm("parentId")
+ if parentId == "" {
util.ResponseFormat(c, code.RequestParamError, "parentId鍙傛暟閿欒")
return
}
@@ -109,7 +110,7 @@
paramBody := util.Struct2Map(model)
var api dbapi.AreaApi
if api.AreaUpdate(paramBody) {
- util.ResponseFormat(c,code.Success,"鏇存柊鎴愬姛")
+ util.ResponseFormat(c,code.UpdateSuccess,"鏇存柊鎴愬姛")
}else {
util.ResponseFormat(c,code.ComError,"鏇存柊澶辫触")
}
@@ -126,14 +127,14 @@
func (ac AreaController) AreaDelete(c *gin.Context) {
var api dbapi.AreaApi
id := c.PostForm("id")
- areaId, err := strconv.Atoi(id)
- if err != nil {
+
+ if id == "" {
util.ResponseFormat(c, code.ComError, "鍙傛暟鏈夎")
return
}
- if api.AreaDelete(areaId) {
- util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
+ if api.AreaDelete(id) {
+ util.ResponseFormat(c, code.DelSuccess, "鍒犻櫎鎴愬姛")
} else {
util.ResponseFormat(c, code.ComError,"鍒犻櫎澶辫触")
}
--
Gitblit v1.8.0