From 936be93b83a8799a8400b2f1b49f1710eef6ce51 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 05 七月 2019 19:15:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/area.go | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/controllers/area.go b/controllers/area.go
index 0b5ff28..ae7cdbc 100644
--- a/controllers/area.go
+++ b/controllers/area.go
@@ -72,9 +72,9 @@
}
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,"娣诲姞澶辫触")
}
}
@@ -83,23 +83,33 @@
// @Accept json
// @Produce json
// @Tags menu
-// @Param id path int true "鍖哄煙id"
-// @Param area body controllers.AreaVo true "鍖哄煙缁撴瀯"
+// @Param id query int true "鍖哄煙id"
+// @Param name query string true "鍖哄煙鍚嶅瓧"
+// @Param parentId query int 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/update/{id} [put]
+// @Router /data/api-v/area/update [post]
func (ac AreaController) AreaUpdate(c *gin.Context) {
- var api dbapi.AreaApi
- var model AreaVo
-
- if err := c.BindJSON(&model);err !=nil {
- util.ResponseFormat(c, code.ComError, "鍙傛暟鏈夎")
+ id,err := strconv.Atoi(c.PostForm("id"))
+ if err !=nil{
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
return
}
-
+ name := c.PostForm("name")
+ parentId, err := strconv.Atoi(c.PostForm("parentId"))
+ if err !=nil {
+ util.ResponseFormat(c, code.RequestParamError, "parentId鍙傛暟閿欒")
+ return
+ }
+ var model = AreaVo{
+ Id:id,
+ ParentId:parentId,
+ Name:name,
+ }
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,"鏇存柊澶辫触")
}
@@ -112,18 +122,18 @@
// @Param id query int 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 [get]
+// @Router /data/api-v/area/del [post]
func (ac AreaController) AreaDelete(c *gin.Context) {
var api dbapi.AreaApi
- id := c.Query("id")
+ id := c.PostForm("id")
areaId, err := strconv.Atoi(id)
if err != nil {
- util.ResponseFormat(c, code.ComError, "浼犲叆闈炴暣褰㈡棤娉曡В鏋�")
+ util.ResponseFormat(c, code.ComError, "鍙傛暟鏈夎")
return
}
if api.AreaDelete(areaId) {
- util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
+ util.ResponseFormat(c, code.DelSuccess, "鍒犻櫎鎴愬姛")
} else {
util.ResponseFormat(c, code.ComError,"鍒犻櫎澶辫触")
}
--
Gitblit v1.8.0