fix pageSize

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

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

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())
+}

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"