public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 10:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix pageSize

Browse Source
This commit is contained in:
zhangwenjian
2020-04-01 14:23:01 +08:00
parent a8d4c996ff
commit 315475c38f
13 changed files with 66 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apis/config.go
+1 -1
View File
@@ -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
apis/dictData.go
+1 -1
View File
@@ -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
apis/dictType.go
+1 -1
View File
@@ -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
apis/loginLog.go
+1 -1
View File
@@ -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
apis/operlog.go
+1 -1
View File
@@ -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
apis/post.go
+1 -1
View File
@@ -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
apis/role.go
+1 -1
View File
@@ -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
apis/rolemenu.go
-39
View File
@@ -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 角色菜单
apis/sysuser.go
+1 -1
View File
@@ -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
apis/tools/dbcolumns.go
+1 -1
View File
@@ -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
apis/tools/dbtables.go
+1 -1
View File
@@ -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
apis/tools/gen.go
+36
View File
@@ -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())
}
apis/tools/systables.go
+20 -6
View File
@@ -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"