From 315475c38fcb4c9ab45320ebe05cb79e1aedda67 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Wed, 1 Apr 2020 14:23:01 +0800 Subject: [PATCH] fix pageSize --- apis/config.go | 2 +- apis/dictData.go | 2 +- apis/dictType.go | 2 +- apis/loginLog.go | 2 +- apis/operlog.go | 2 +- apis/post.go | 2 +- apis/role.go | 2 +- apis/rolemenu.go | 39 --------------------------------------- apis/sysuser.go | 2 +- apis/tools/dbcolumns.go | 2 +- apis/tools/dbtables.go | 2 +- apis/tools/gen.go | 36 ++++++++++++++++++++++++++++++++++++ apis/tools/systables.go | 26 ++++++++++++++++++++------ 13 files changed, 66 insertions(+), 55 deletions(-) create mode 100644 apis/tools/gen.go diff --git a/apis/config.go b/apis/config.go index d6cac145..283331d3 100644 --- a/apis/config.go +++ b/apis/config.go @@ -45,7 +45,7 @@ func GetConfigList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/dictData.go b/apis/dictData.go index 80fcad8a..834ab5c8 100644 --- a/apis/dictData.go +++ b/apis/dictData.go @@ -48,7 +48,7 @@ func GetDictDataList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/dictType.go b/apis/dictType.go index b8c68580..8a7f6429 100644 --- a/apis/dictType.go +++ b/apis/dictType.go @@ -47,7 +47,7 @@ func GetDictTypeList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/loginLog.go b/apis/loginLog.go index 14465329..9cb047d1 100644 --- a/apis/loginLog.go +++ b/apis/loginLog.go @@ -47,7 +47,7 @@ func GetLoginLogList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/operlog.go b/apis/operlog.go index f64657c4..f3c8065b 100644 --- a/apis/operlog.go +++ b/apis/operlog.go @@ -47,7 +47,7 @@ func GetOperLogList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/post.go b/apis/post.go index 9a7ab693..31b2bbab 100644 --- a/apis/post.go +++ b/apis/post.go @@ -45,7 +45,7 @@ func GetPostList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/role.go b/apis/role.go index 2a4113e0..5e729b31 100644 --- a/apis/role.go +++ b/apis/role.go @@ -46,7 +46,7 @@ func GetRoleList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/rolemenu.go b/apis/rolemenu.go index d360a6f3..19e37d16 100644 --- a/apis/rolemenu.go +++ b/apis/rolemenu.go @@ -34,45 +34,6 @@ type RoleMenuPost struct { RoleMenu []models.RoleMenu } -// @Summary 创建角色菜单 -// @Description 获取JSON -// @Tags 角色菜单 -// @Accept application/x-www-form-urlencoded -// @Product application/x-www-form-urlencoded -// @Param role_id formData string true "role_id" -// @Param menu_id formData string true "menu_id" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/rolemenu [post] -func InsertRoleMenu(c *gin.Context) { - //roleId := c.Request.FormValue("role_id") - //menuId := c.Request.FormValue("menu_id") - //menus := strings.Split(menuId, ",") - //fmt.Println(menus) - //var t models.RoleMenu - //_,err := t.DeleteRoleMenu(roleId) - //if err != nil { - // c.JSON(http.StatusOK, gin.H{ - // "code": -1, - // "message": "添加失败1", - // }) - // return - //} - //_, err2 := t.Insert(roleId, menus) - //if err2 != nil { - // c.JSON(http.StatusOK, gin.H{ - // "code": -1, - // "message": "添加失败2", - // }) - // return - //} - var res models.Response - res.Msg = "添加成功" - c.JSON(http.StatusOK, res.ReturnOK()) - return - -} - // @Summary 删除用户菜单数据 // @Description 删除数据 // @Tags 角色菜单 diff --git a/apis/sysuser.go b/apis/sysuser.go index a139d542..2f42e11a 100644 --- a/apis/sysuser.go +++ b/apis/sysuser.go @@ -52,7 +52,7 @@ func GetSysUserList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/tools/dbcolumns.go b/apis/tools/dbcolumns.go index f6103b76..e7bcff80 100644 --- a/apis/tools/dbcolumns.go +++ b/apis/tools/dbcolumns.go @@ -39,7 +39,7 @@ func GetDBColumnList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/tools/dbtables.go b/apis/tools/dbtables.go index cb5bb77a..5a6976a4 100644 --- a/apis/tools/dbtables.go +++ b/apis/tools/dbtables.go @@ -38,7 +38,7 @@ func GetDBTableList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp diff --git a/apis/tools/gen.go b/apis/tools/gen.go new file mode 100644 index 00000000..c2cd7e61 --- /dev/null +++ b/apis/tools/gen.go @@ -0,0 +1,36 @@ +package tools + +import ( + "bytes" + "github.com/gin-gonic/gin" + "go-admin/models" + "go-admin/models/tools" + "go-admin/pkg" + "go-admin/utils" + "net/http" + "text/template" +) + +func Preview(c *gin.Context) { + table := tools.SysTables{} + id, err := utils.StringToInt64(c.Param("tableId")) + pkg.AssertErr(err, "", -1) + table.TableId = id + t1, err := template.ParseFiles("template/model.go.template") + pkg.AssertErr(err, "", -1) + t2, err := template.ParseFiles("template/api.go.template") + pkg.AssertErr(err, "", -1) + tab, _ := table.Get() + var b1 bytes.Buffer + err = t1.Execute(&b1, tab) + var b2 bytes.Buffer + err = t2.Execute(&b2, tab) + + mp := make(map[string]interface{}) + mp["template/model.go.template"] = b1.String() + mp["template/api.go.template"] = b2.String() + var res models.Response + res.Data = mp + + c.JSON(http.StatusOK, res.ReturnOK()) +} diff --git a/apis/tools/systables.go b/apis/tools/systables.go index de43c726..bc244796 100644 --- a/apis/tools/systables.go +++ b/apis/tools/systables.go @@ -40,7 +40,7 @@ func GetSysTableList(c *gin.Context) { mp["list"] = result mp["count"] = count mp["pageIndex"] = pageIndex - mp["pageIndex"] = pageSize + mp["pageSize"] = pageSize var res models.Response res.Data = mp @@ -97,13 +97,25 @@ func InsertSysTable(c *gin.Context) { strend := string([]byte(tablenamelist[i])[1:]) data.ClassName += strings.ToUpper(strStart) + strend data.PackageName += strings.ToLower(strStart) + strings.ToLower(strend) + data.ModuleName += strings.ToLower(strStart) + strings.ToLower(strend) } data.TplCategory = "crud" + data.Crud = true dbcolumn, err := dbColumn.GetList() data.CreateTime = utils.GetCurrntTime() data.CreateBy = utils.GetUserIdStr(c) data.TableComment = dbtable.TableComment + if dbtable.TableComment == "" { + data.TableComment = data.ClassName + } + + data.FunctionName = data.TableComment + data.BusinessName = data.ModuleName + data.IsLogicalDelete = "1" + data.LogicalDelete = true + data.LogicalDeleteColumn = "is_del" + data.FunctionAuthor = "wenjianzhang" for i := 0; i < len(dbcolumn); i++ { var column tools.SysColumns @@ -115,11 +127,6 @@ func InsertSysTable(c *gin.Context) { column.IsInsert = "1" column.QueryType = "EQ" column.IsPk = "0" - if strings.Contains(dbcolumn[i].ColumnKey, "PR") { - column.IsPk = "1" - column.Pk = true - data.PkColumn = dbcolumn[i].ColumnName - } namelist := strings.Split(dbcolumn[i].ColumnName, "_") for i := 0; i < len(namelist); i++ { @@ -132,6 +139,13 @@ func InsertSysTable(c *gin.Context) { column.JsonField += strings.ToUpper(strStart) + strend } } + if strings.Contains(dbcolumn[i].ColumnKey, "PR") { + column.IsPk = "1" + column.Pk = true + data.PkColumn = dbcolumn[i].ColumnName + data.PkGoField = column.GoField + data.PkJsonField = column.JsonField + } column.IsRequired = "0" if strings.Contains(dbcolumn[i].IsNullable, "NO") { column.IsRequired = "1"