From 712ef81c6b8813a498a66cf61ffcd37e5c502c8c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 01 十一月 2019 13:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/area.go | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/controllers/area.go b/controllers/area.go
index c566987..705c05c 100644
--- a/controllers/area.go
+++ b/controllers/area.go
@@ -14,10 +14,12 @@
Id string `json:"id"`
ParentId string `json:"parentId"`
Name string `json:"name"`
+ Alias string `json:"alias"`
}
// @Summary 鏄剧ず鏍戝舰缁撴瀯
// @Description 鏄剧ず宸︿晶鎵�鏈夊尯鍩熷拰鎽勫儚鏈�
+// @Security ApiKeyAuth
// @Produce json
// @Tags menu
// @Param parentid query string true "鍖哄煙鐨刬d"
@@ -38,6 +40,7 @@
// @Summary 鏄剧ずGb28181鏍戝舰缁撴瀯
// @Description 鏄剧ずGb28181鏍戝舰缁撴瀯
+// @Security ApiKeyAuth
// @Produce json
// @Tags menu
// @Param parentid query string true "鍖哄煙鐨刬d"
@@ -58,18 +61,16 @@
// @Summary 鍒锋柊Gb28181骞冲彴鏍�
// @Description 鍒锋柊Gb28181骞冲彴鏍�
+// @Security ApiKeyAuth
// @Produce json
// @Tags menu
-// @Param id formData string true "鍥芥爣骞冲彴id"
+// @Param id formData string false "鍥芥爣骞冲彴id"
// @Success 200 {string} json "{"code":200, data:"",msg:"璇锋眰鎴愬姛", success:true}"
// @Failure 200 {string} json "{"code":500, data:"",msg:"璇锋眰澶辫触", success:false}"
// @Router /data/api-v/area/gb28181TreeRefresh [post]
func (ac AreaController) Gb28181TreeRefresh(c *gin.Context) {
id := c.PostForm("id")
- if id =="" {
- util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
- return
- }
+
var api dbapi.AreaApi
if api.Gb28181TreeRefresh(id) {
util.ResponseFormat(c,code.UpdateSuccess,"鏇存柊鎴愬姛")
@@ -78,6 +79,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鍒犻櫎Gb28181骞冲彴
// @Description 鍒犻櫎Gb28181骞冲彴
// @Produce json
@@ -94,12 +96,13 @@
}
}
+// @Security ApiKeyAuth
// @Summary 娣诲姞menu鐨勫尯鍩�
// @Description 娣诲姞鐩綍涓婂尯鍩�
// @Produce json
// @Tags menu
-// @Param name query string true "鍖哄煙鍚嶅瓧"
-// @Param parentId query int true "涓婁竴绾х埗id"
+// @Param name formData string true "鍖哄煙鍚嶅瓧"
+// @Param parentId formData string true "涓婁竴绾х埗id"
// @Success 200 {string} json "{"code":200, data:"娣诲姞鐨勫尯鍩熶俊鎭�",msg:"璇锋眰鎴愬姛", success:true}"
// @Failure 200 {string} json "{"code":"閿欒鐮�", data:"鍑洪敊淇℃伅",msg:"璇锋眰澶辫触", success:false}"
// @Router /data/api-v/area/add [post]
@@ -121,14 +124,16 @@
}
}
+// @Security ApiKeyAuth
// @Summary 淇敼鍚嶅瓧
// @Description 淇敼鍖哄煙鍚嶅瓧
// @Accept json
// @Produce json
// @Tags menu
-// @Param id query int true "鍖哄煙id"
-// @Param name query string true "鍖哄煙鍚嶅瓧"
-// @Param parentId query int true "涓婁竴绾х埗id"
+// @Param id formData string true "鍖哄煙id"
+// @Param name formData string true "鍖哄煙鍚嶅瓧"
+// @Param parentId formData string true "涓婁竴绾х埗id"
+// @Param alias formData string false "澶囨敞鍚嶇О"
// @Success 200 {string} json "{"code":200, data:"",msg:"璇锋眰鎴愬姛", success:true}"
// @Failure 200 {string} json "{"code":"閿欒鐮�", data:"鍑洪敊淇℃伅",msg:"璇锋眰澶辫触", success:false}"
// @Router /data/api-v/area/update [post]
@@ -144,10 +149,12 @@
util.ResponseFormat(c, code.RequestParamError, "parentId鍙傛暟閿欒")
return
}
+ alias := c.PostForm("alias")
var model = AreaVo{
Id:id,
ParentId:parentId,
Name:name,
+ Alias: alias,
}
paramBody := util.Struct2Map(model)
var api dbapi.AreaApi
@@ -158,11 +165,12 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鍒犻櫎涓�涓尯鍩�
// @Description 鐐瑰嚮鍒犻櫎鎸夐挳鏃跺垹闄や竴涓尯鍩�
// @Produce json
// @Tags menu
-// @Param id query int true "褰撳墠id"
+// @Param id formData string true "褰撳墠id"
// @Success 200 {string} json "{"code":200, data:"鍒犻櫎鐨勫尯鍩熶俊鎭�",msg:"璇锋眰鎴愬姛", success:true}"
// @Failure 200 {string} json "{"code":"閿欒鐮�", data:"鍑洪敊淇℃伅",msg:"璇锋眰澶辫触", success:false}"
// @Router /data/api-v/area/del [post]
--
Gitblit v1.8.0