diff --git a/app/controller/admin/gen_table.go b/app/controller/admin/gen_table.go index be73fd1..519f636 100644 --- a/app/controller/admin/gen_table.go +++ b/app/controller/admin/gen_table.go @@ -303,7 +303,7 @@ func (c *Gen) genData(tableId int64) (data g.MapStrStr, entity *gen_table.Entity }) view.SetConfigWithMap(g.Map{ "Paths": []string{"template"}, - "Delimiters": []string{"{{", "}}"}, + "Delimiters": []string{"${", "}"}, }) //树形菜单选项 var options g.Map diff --git a/template/vm/go/crud/controller.template b/template/vm/go/crud/controller.template index bf1adab..592e5f3 100644 --- a/template/vm/go/crud/controller.template +++ b/template/vm/go/crud/controller.template @@ -1,31 +1,37 @@ // ========================================================================== -// 生成日期:{{.table.CreateTime}} -// 生成人:{{.table.FunctionAuthor}} +// 生成日期:${.table.CreateTime} +// 生成人:${.table.FunctionAuthor} // ========================================================================== -package {{.table.ModuleName}} +package ${.table.ModuleName} import ( + ${.table.BusinessName}Model "${.table.PackageName}/app/model/${.table.ModuleName}/${.table.BusinessName}" + ${.table.BusinessName}Service "${.table.PackageName}/app/service/${.table.ModuleName}/${.table.BusinessName}_service" + "${.table.PackageName}/library/response" + "github.com/gogf/gf/frame/g" "github.com/gogf/gf/net/ghttp" - {{.table.BusinessName}}Model "{{.table.PackageName}}/app/model/{{.table.ModuleName}}/{{.table.BusinessName}}" - {{.table.BusinessName}}Service "{{.table.PackageName}}/app/service/{{.table.ModuleName}}/{{.table.BusinessName}}_service" - "{{.table.PackageName}}/library/response" + "github.com/gogf/gf/util/gvalid" ) //控制器 -type {{.table.BusinessName|UcFirst}} struct{} +type ${.table.BusinessName|UcFirst} struct{} -//列表页 -func (c *{{.table.BusinessName|UcFirst}}) List(r *ghttp.Request) { +// List 列表页 +func (c *${.table.BusinessName|UcFirst}) List(r *ghttp.Request) { // 定义一个结构体存储请求参数 - var req *{{.table.BusinessName}}Model.SelectPageReq + var req *${.table.BusinessName}Model.SelectPageReq // 获取参数 err := r.Parse(&req) if err != nil { - response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + if _,ok := err.(*gvalid.Error); ok { + response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + } else { + response.FailJson(true, r, err.Error()) + } } - total, page, list, err := {{.table.BusinessName}}Service.SelectListByPage(req) + total, page, list, err := ${.table.BusinessName}Service.SelectListByPage(req) if err != nil { response.FailJson(true, r, err.Error()) } @@ -38,17 +44,21 @@ func (c *{{.table.BusinessName|UcFirst}}) List(r *ghttp.Request) { } -// 新增 -func (c *{{.table.BusinessName|UcFirst}}) Add(r *ghttp.Request) { +// Add 新增 +func (c *${.table.BusinessName|UcFirst}) Add(r *ghttp.Request) { if r.Method == "POST" { - var req *{{.table.BusinessName}}Model.AddReq + var req *${.table.BusinessName}Model.AddReq // 通过Parse方法解析获取参数 err := r.Parse(&req) if err != nil { - response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + if _,ok := err.(*gvalid.Error); ok { + response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + } else { + response.FailJson(true, r, err.Error()) + } } // 调用service中的添加函数添加 - err = {{.table.BusinessName}}Service.AddSave(req) + err = ${.table.BusinessName}Service.AddSave(req) if err != nil { response.FailJson(true, r, err.Error()) } @@ -57,25 +67,30 @@ func (c *{{.table.BusinessName|UcFirst}}) Add(r *ghttp.Request) { } -// 修改 -func (c *{{.table.BusinessName|UcFirst}}) Edit(r *ghttp.Request) { +// Edit 修改 +func (c *${.table.BusinessName|UcFirst}) Edit(r *ghttp.Request) { // 如果是post提交的请求就执行修改操作 if r.Method == "POST" { - var editReq *{{.table.BusinessName}}Model.EditReq + var editReq *${.table.BusinessName}Model.EditReq // 通过Parse方法解析获取参数 err := r.Parse(&editReq) if err != nil { - response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + if _,ok := err.(*gvalid.Error); ok { + response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + } else { + response.FailJson(true, r, err.Error()) + } } - err = {{.table.BusinessName}}Service.EditSave(editReq) + err = ${.table.BusinessName}Service.EditSave(editReq) if err != nil { response.FailJson(true, r, err.Error()) } response.SusJson(true, r, "修改参数成功") } // 不是post提交的请求就到修改页面后查询出要修改的记录 - id := r.GetInt("id") - params, err := {{.table.BusinessName}}Service.GetByID(int64(id)) + id := r.Get${.table.PkColumn.GoType|UcFirst}("id") + params, err := ${.table.BusinessName}Service.GetByID(id) + if err != nil { response.FailJson(true, r, err.Error()) } @@ -83,16 +98,20 @@ func (c *{{.table.BusinessName|UcFirst}}) Edit(r *ghttp.Request) { } -// 删除 -func (c *{{.table.BusinessName|UcFirst}}) Delete(r *ghttp.Request) { - var req *{{.table.BusinessName}}Model.RemoveReq +// Delete 删除 +func (c *${.table.BusinessName|UcFirst}) Delete(r *ghttp.Request) { + var req *${.table.BusinessName}Model.RemoveReq //获取参数 if err := r.Parse(&req); err != nil { - response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + if _,ok := err.(*gvalid.Error); ok { + response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + } else { + response.FailJson(true, r, err.Error()) + } } - err := {{.table.BusinessName}}Service.DeleteByIds(req.Ids) + err := ${.table.BusinessName}Service.DeleteByIds(req.Ids) if err != nil { response.FailJson(true, r, "删除失败") } response.SusJson(true, r, "删除成功") -} \ No newline at end of file +} diff --git a/template/vm/go/crud/model.template b/template/vm/go/crud/model.template index f746eac..6194ee9 100644 --- a/template/vm/go/crud/model.template +++ b/template/vm/go/crud/model.template @@ -1,42 +1,43 @@ // ========================================================================== -// 生成日期:{{.table.CreateTime}} -// 生成人:{{.table.FunctionAuthor}} +// 生成日期:${.table.CreateTime} +// 生成人:${.table.FunctionAuthor} // ========================================================================== -package {{.table.BusinessName}} +package ${.table.BusinessName} import ( "github.com/gogf/gf/errors/gerror" "github.com/gogf/gf/frame/g" + "github.com/gogf/gf/os/gtime" ) -{{$pk:=""}} -{{$pkGoField:=""}} -{{range $index, $column := .table.Columns}} {{if eq $column.IsPk "1"}} - {{$pk = $column.ColumnName}} - {{$pkGoField = $column.GoField}} -{{end}}{{end}} +${$pk:=""} +${$pkGoField:=""} +${range $index, $column := .table.Columns} ${if eq $column.IsPk "1"} + ${$pk = $column.ColumnName} + ${$pkGoField = $column.GoField} +${end}${end} // AddReq 用于存储新增请求的请求参数 type AddReq struct { - {{range $index, $column := .table.Columns}} - {{if and (eq $column.IsInsert "1") (ne $column.IsPk "1")}} {{$column.GoField}} {{if eq $column.GoType "Time"}}*gtime.Time{{else}}{{$column.GoType}}{{end}} `p:"{{$column.HtmlField}}" {{if eq $column.IsRequired "1"}}v:"required#{{$column.ColumnComment}}不能为空"{{end}}` {{end}} {{end}} + ${range $index, $column := .table.Columns} + ${if and (eq $column.IsInsert "1") (ne $column.IsPk "1")} ${$column.GoField} ${if eq $column.GoType "Time"}*gtime.Time${else}${$column.GoType}${end} `p:"${$column.HtmlField}" ${if eq $column.IsRequired "1"}v:"required#${$column.ColumnComment}不能为空"${end}` ${end} ${end} } // EditReq 用于存储修改请求参数 type EditReq struct { - {{.table.PkColumn.GoField}} {{.table.PkColumn.GoType}} `p:"{{.table.PkColumn.HtmlField}}" v:"required#主键ID不能为空"` {{range $index, $column := .table.Columns}} {{if eq $column.IsEdit "1"}} - {{$column.GoField}} {{if eq $column.GoType "Time"}}*gtime.Time{{else}}{{$column.GoType}}{{end}} `p:"{{$column.HtmlField}}" {{if eq $column.IsRequired "1"}}v:"required#{{$column.ColumnComment}}不能为空"{{end}}` {{end}} {{end}} + ${.table.PkColumn.GoField} ${.table.PkColumn.GoType} `p:"${.table.PkColumn.HtmlField}" v:"required#主键ID不能为空"` ${range $index, $column := .table.Columns} ${if eq $column.IsEdit "1"} + ${$column.GoField} ${if eq $column.GoType "Time"}*gtime.Time${else}${$column.GoType}${end} `p:"${$column.HtmlField}" ${if eq $column.IsRequired "1"}v:"required#${$column.ColumnComment}不能为空"${end}` ${end} ${end} } // RemoveReq 用于存储删除请求参数 type RemoveReq struct { - Ids []int `p:"ids"` //删除id + Ids [] ${.table.PkColumn.GoType} `p:"ids"` //删除id } // SelectPageReq 用于存储分页查询的请求参数 -type SelectPageReq struct { {{range $index, $column := .table.Columns}} {{if eq $column.IsQuery "1"}} - {{$column.GoField}} {{if eq $column.GoType "Time"}}*gtime.Time{{else}}{{$column.GoType}}{{end}} `p:"{{$column.HtmlField}}"` //{{$column.ColumnComment}} {{end}} {{end}} +type SelectPageReq struct { ${range $index, $column := .table.Columns} ${if eq $column.IsQuery "1"} + ${$column.GoField} ${if eq $column.GoType "Time"}*gtime.Time${else}${$column.GoType}${end} `p:"${$column.HtmlField}"` //${$column.ColumnComment} ${end} ${end} BeginTime string `p:"beginTime"` //开始时间 EndTime string `p:"endTime"` //结束时间 PageNum int `p:"pageNum"` //当前页码 @@ -44,7 +45,7 @@ type SelectPageReq struct { {{range $index, $column := .table.Columns}} {{if eq } // GetByID 根据ID查询记录 -func GetByID(id int64) (*Entity, error) { +func GetByID(id ${.table.PkColumn.GoType}) (*Entity, error) { entity, err := Model.FindOne(id) if err != nil { g.Log().Error(err) @@ -59,8 +60,8 @@ func GetByID(id int64) (*Entity, error) { // AddSave 添加 func AddSave(req *AddReq) error { entity:= new(Entity) - {{range $index, $column := .table.Columns}} {{if eq $column.IsInsert "1"}} - entity.{{$column.GoField}} = req.{{$column.GoField}}{{end}} {{end}} + ${range $index, $column := .table.Columns} ${if and (eq $column.IsInsert "1") (ne $column.IsPk "1")} + entity.${$column.GoField} = req.${$column.GoField}${end} ${end} result, err := Model.Save(entity) if err != nil { @@ -74,8 +75,8 @@ func AddSave(req *AddReq) error { } // DeleteByIds 删除 -func DeleteByIds(Ids []int) error { - _, err := Model.Delete("{{.table.PkColumn.ColumnName}} in(?)", Ids) +func DeleteByIds(Ids [] ${.table.PkColumn.GoType}) error { + _, err := Model.Delete("${.table.PkColumn.ColumnName} in(?)", Ids) if err != nil { g.Log().Error(err) return gerror.New("删除失败") @@ -86,14 +87,14 @@ func DeleteByIds(Ids []int) error { // EditSave 根据ID来修改信息 func EditSave(req *EditReq) error { // 先根据ID来查询要修改的记录 - entity, err := GetByID(req.{{$pkGoField}}) + entity, err := GetByID(req.${$pkGoField}) if err != nil { return err } // 修改实体 - {{range $index, $column := .table.Columns}} {{if eq $column.IsEdit "1"}} - entity.{{$column.GoField}} = req.{{$column.GoField}}{{end}} {{end}} + ${range $index, $column := .table.Columns} ${if eq $column.IsEdit "1"} + entity.${$column.GoField} = req.${$column.GoField}${end} ${end} _, err = Model.Save(entity) if err != nil { g.Log().Error(err) @@ -103,21 +104,21 @@ func EditSave(req *EditReq) error { } // SelectListByPage 分页查询,返回值total总记录数,page当前页 -func SelectListByPage(req *SelectPageReq) (total int, page int64, list []*Entity, err error) { +func SelectListByPage(req *SelectPageReq) (total int, page int, list []*Entity, err error) { model := Model if req != nil { - {{range $index, $column := .table.Columns}} {{if eq $column.IsQuery "1"}} - {{if eq $column.QueryType "LIKE"}} - if req.{{$column.GoField}} != "" { - model = model.Where("{{$column.ColumnName}} like ?", "%"+req.{{$column.GoField}}+"%") - } {{else if eq $column.QueryType "EQ"}} {{if eq $column.GoType "string"}} - if req.{{$column.GoField}} != "" { - model = model.Where("{{$column.ColumnName}} = ?", req.{{$column.GoField}}) - } {{else if eq $column.GoType "int" "int64"}} - if req.{{$column.GoField}} != 0 { - model = model.Where("{{$column.ColumnName}} = ?", req.{{$column.GoField}}) + ${range $index, $column := .table.Columns} ${if eq $column.IsQuery "1"} + ${if eq $column.QueryType "LIKE"} + if req.${$column.GoField} != "" { + model = model.Where("${$column.ColumnName} like ?", "%"+req.${$column.GoField}+"%") + } ${else if eq $column.QueryType "EQ"} ${if eq $column.GoType "string"} + if req.${$column.GoField} != "" { + model = model.Where("${$column.ColumnName} = ?", req.${$column.GoField}) + } ${else if eq $column.GoType "int" "int64"} + if req.${$column.GoField} != 0 { + model = model.Where("${$column.ColumnName} = ?", req.${$column.GoField}) } - {{end}} {{end}} {{end}} {{end}} + ${end} ${end} ${end} ${end} } // 查询总记录数(总行数) total, err = model.Count() @@ -134,7 +135,7 @@ func SelectListByPage(req *SelectPageReq) (total int, page int64, list []*Entity req.PageSize = 10 } // 分页排序查询 - list, err = model.Page(int(page), int(req.PageSize)).Order("{{$pk}} asc").All() + list, err = model.Page(int(page), int(req.PageSize)).Order("${$pk} desc").All() if err != nil { g.Log().Error(err) err = gerror.New("分页查询失败") @@ -149,21 +150,21 @@ func SelectListByPage(req *SelectPageReq) (total int, page int64, list []*Entity func SelectListAll(req *SelectPageReq) (list []*Entity, err error) { model := Model if req != nil { - {{range $index, $column := .table.Columns}} {{if eq $column.IsQuery "1"}} - {{if eq $column.QueryType "LIKE"}} - if req.{{$column.GoField}} != "" { - model.Where("{{$column.ColumnName}} like ?", "%"+req.{{$column.GoField}}+"%") - } {{else if eq $column.QueryType "EQ"}} {{if eq $column.GoType "string"}} - if req.{{$column.GoField}} != "" { - model.Where("{{$column.ColumnName}} = ?", req.{{$column.GoField}}) - } {{else if eq $column.GoType "int" "int64"}} - if req.{{$column.GoField}} != 0 { - model.Where("{{$column.ColumnName}} = ?", req.{{$column.GoField}}) + ${range $index, $column := .table.Columns} ${if eq $column.IsQuery "1"} + ${if eq $column.QueryType "LIKE"} + if req.${$column.GoField} != "" { + model.Where("${$column.ColumnName} like ?", "%"+req.${$column.GoField}+"%") + } ${else if eq $column.QueryType "EQ"} ${if eq $column.GoType "string"} + if req.${$column.GoField} != "" { + model.Where("${$column.ColumnName} = ?", req.${$column.GoField}) + } ${else if eq $column.GoType "int" "int64"} + if req.${$column.GoField} != 0 { + model.Where("${$column.ColumnName} = ?", req.${$column.GoField}) } - {{end}} {{end}} {{end}} {{end}} + ${end} ${end} ${end} ${end} } // 查询 - list, err = model.Order("{{$pk}} asc").All() + list, err = model.Order("${$pk} desc").All() if err != nil { g.Log().Error(err) err = gerror.New("查询失败") diff --git a/template/vm/go/crud/service.template b/template/vm/go/crud/service.template index a31f66f..f0e13db 100644 --- a/template/vm/go/crud/service.template +++ b/template/vm/go/crud/service.template @@ -1,35 +1,35 @@ // ========================================================================== -// 生成日期:{{.table.CreateTime}} -// 生成人:{{.table.FunctionAuthor}} +// 生成日期:${.table.CreateTime} +// 生成人:${.table.FunctionAuthor} // ========================================================================== -package {{.table.BusinessName}}_service +package ${.table.BusinessName}_service import ( - {{.table.BusinessName}}Model "{{.table.PackageName}}/app/model/{{.table.ModuleName}}/{{.table.BusinessName}}" + ${.table.BusinessName}Model "${.table.PackageName}/app/model/${.table.ModuleName}/${.table.BusinessName}" ) -// 添加 -func AddSave(req *{{.table.BusinessName}}Model.AddReq) error { - return {{.table.BusinessName}}Model.AddSave(req) +// AddSave 添加 +func AddSave(req *${.table.BusinessName}Model.AddReq) error { + return ${.table.BusinessName}Model.AddSave(req) } -// 删除 -func DeleteByIds(Ids []int) error { - return {{.table.BusinessName}}Model.DeleteByIds(Ids) +// DeleteByIds 删除 +func DeleteByIds(Ids [] ${.table.PkColumn.GoType}) error { + return ${.table.BusinessName}Model.DeleteByIds(Ids) } -//修改 -func EditSave(editReq *{{.table.BusinessName}}Model.EditReq) error { - return {{.table.BusinessName}}Model.EditSave(editReq) +// EditSave 修改 +func EditSave(editReq *${.table.BusinessName}Model.EditReq) error { + return ${.table.BusinessName}Model.EditSave(editReq) } -// 根据ID查询 -func GetByID(id int64) (*{{.table.BusinessName}}Model.Entity, error) { - return {{.table.BusinessName}}Model.GetByID(id) +// GetByID 根据ID查询 +func GetByID(id ${.table.PkColumn.GoType}) (*${.table.BusinessName}Model.Entity, error) { + return ${.table.BusinessName}Model.GetByID(id) } -// 分页查询 -func SelectListByPage(req *{{.table.BusinessName}}Model.SelectPageReq) (total int, page int64, list []*{{.table.BusinessName}}Model.Entity, err error) { - return {{.table.BusinessName}}Model.SelectListByPage(req) +// SelectListByPage 分页查询 +func SelectListByPage(req *${.table.BusinessName}Model.SelectPageReq) (total int, page int, list []*${.table.BusinessName}Model.Entity, err error) { + return ${.table.BusinessName}Model.SelectListByPage(req) } diff --git a/template/vm/go/tree/controller.template b/template/vm/go/tree/controller.template index 1e62efd..1804e76 100644 --- a/template/vm/go/tree/controller.template +++ b/template/vm/go/tree/controller.template @@ -1,33 +1,37 @@ // ========================================================================== -// 生成日期:{{.table.CreateTime}} -// 生成人:{{.table.FunctionAuthor}} +// 生成日期:${.table.CreateTime} +// 生成人:${.table.FunctionAuthor} // ========================================================================== -package {{.table.ModuleName}} +package ${.table.ModuleName} import ( - "{{.table.PackageName}}/app/service/cache_service" + "${.table.PackageName}/app/service/cache_service" "github.com/gogf/gf/frame/g" "github.com/gogf/gf/net/ghttp" - {{.table.BusinessName}}Model "{{.table.PackageName}}/app/model/{{.table.ModuleName}}/{{.table.BusinessName}}" - {{.table.BusinessName}}Service "{{.table.PackageName}}/app/service/{{.table.ModuleName}}/{{.table.BusinessName}}_service" - "{{.table.PackageName}}/library/response" + ${.table.BusinessName}Model "${.table.PackageName}/app/model/${.table.ModuleName}/${.table.BusinessName}" + ${.table.BusinessName}Service "${.table.PackageName}/app/service/${.table.ModuleName}/${.table.BusinessName}_service" + "${.table.PackageName}/library/response" "github.com/gogf/gf/util/gvalid" ) //控制器 -type {{.table.BusinessName|UcFirst}} struct{} +type ${.table.BusinessName|UcFirst} struct{} -//列表页 -func (c *{{.table.BusinessName|UcFirst}}) List(r *ghttp.Request) { +// List 列表页 +func (c *${.table.BusinessName|UcFirst}) List(r *ghttp.Request) { // 定义一个结构体存储请求参数 - var req *{{.table.BusinessName}}Model.ReqSearchList + var req *${.table.BusinessName}Model.ReqSearchList // 获取参数 err := r.Parse(&req) if err != nil { - response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + if _,ok := err.(*gvalid.Error); ok { + response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + } else { + response.FailJson(true, r, err.Error()) + } } - list, err := {{.table.BusinessName}}Service.GetListSearch(req) + list, err := ${.table.BusinessName}Service.GetListSearch(req) if err != nil { response.FailJson(true, r, err.Error()) } @@ -38,25 +42,29 @@ func (c *{{.table.BusinessName|UcFirst}}) List(r *ghttp.Request) { } -// 新增 -func (c *{{.table.BusinessName|UcFirst}}) Add(r *ghttp.Request) { +// Add 新增 +func (c *${.table.BusinessName|UcFirst}) Add(r *ghttp.Request) { if r.Method == "POST" { - var req *{{.table.BusinessName}}Model.ReqAdd + var req *${.table.BusinessName}Model.ReqAdd // 通过Parse方法解析获取参数 err := r.Parse(&req) if err != nil { - response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + if _,ok := err.(*gvalid.Error); ok { + response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + } else { + response.FailJson(true, r, err.Error()) + } } // 调用service中的添加函数添加 - err = {{.table.BusinessName}}Service.AddSave(req) + err = ${.table.BusinessName}Service.AddSave(req) if err != nil { response.FailJson(true, r, err.Error()) } - cache_service.New().RemoveByTag("{{.table.ModuleName}}_{{.table.BusinessName}}_tag") + cache_service.New().RemoveByTag("${.table.ModuleName}_${.table.BusinessName}_tag") response.SusJson(true, r, "添加成功") } //获取上级分类 - cates, err := {{.table.BusinessName}}Service.GetList() + cates, err := ${.table.BusinessName}Service.GetList() if err != nil { response.FailJson(true, r, err.Error()) } @@ -66,32 +74,36 @@ func (c *{{.table.BusinessName|UcFirst}}) Add(r *ghttp.Request) { } -// 修改 -func (c *{{.table.BusinessName|UcFirst}}) Edit(r *ghttp.Request) { +// Edit 修改 +func (c *${.table.BusinessName|UcFirst}) Edit(r *ghttp.Request) { // 如果是post提交的请求就执行修改操作 if r.Method == "POST" { - var editReq *{{.table.BusinessName}}Model.ReqEdit + var editReq *${.table.BusinessName}Model.ReqEdit // 通过Parse方法解析获取参数 err := r.Parse(&editReq) if err != nil { - response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + if _,ok := err.(*gvalid.Error); ok { + response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + } else { + response.FailJson(true, r, err.Error()) + } } - err = {{.table.BusinessName}}Service.EditSave(editReq) + err = ${.table.BusinessName}Service.EditSave(editReq) if err != nil { response.FailJson(true, r, err.Error()) } - cache_service.New().RemoveByTag("{{.table.ModuleName}}_{{.table.BusinessName}}_tag") + cache_service.New().RemoveByTag("${.table.ModuleName}_${.table.BusinessName}_tag") response.SusJson(true, r, "修改成功") } // 不是post提交的请求就到修改页面后查询出要修改的记录 //获取上级 - cates, err := {{.table.BusinessName}}Service.GetList() + cates, err := ${.table.BusinessName}Service.GetList() if err != nil { response.FailJson(true, r, err.Error()) } //获取信息 id := r.GetUint("id") - menuInfo, err := {{.table.BusinessName}}Service.GetInfoById(id) + menuInfo, err := ${.table.BusinessName}Service.GetInfoById(id) if err != nil { response.FailJson(true, r, err.Error()) } @@ -105,17 +117,21 @@ func (c *{{.table.BusinessName|UcFirst}}) Edit(r *ghttp.Request) { } -// 删除 -func (c *{{.table.BusinessName|UcFirst}}) Delete(r *ghttp.Request) { - var req *{{.table.BusinessName}}Model.RemoveReq +// Delete 删除 +func (c *${.table.BusinessName|UcFirst}) Delete(r *ghttp.Request) { + var req *${.table.BusinessName}Model.RemoveReq //获取参数 if err := r.Parse(&req); err != nil { - response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + if _,ok := err.(*gvalid.Error); ok { + response.FailJson(true, r, err.(*gvalid.Error).FirstString()) + } else { + response.FailJson(true, r, err.Error()) + } } - err := {{.table.BusinessName}}Service.DeleteByIds(req.Ids) + err := ${.table.BusinessName}Service.DeleteByIds(req.Ids) if err != nil { response.FailJson(true, r, "删除失败") } - cache_service.New().RemoveByTag("{{.table.ModuleName}}_{{.table.BusinessName}}_tag") + cache_service.New().RemoveByTag("${.table.ModuleName}_${.table.BusinessName}_tag") response.SusJson(true, r, "删除成功") -} \ No newline at end of file +} diff --git a/template/vm/go/tree/model.template b/template/vm/go/tree/model.template index 3043f5f..ccd3c0d 100644 --- a/template/vm/go/tree/model.template +++ b/template/vm/go/tree/model.template @@ -1,35 +1,35 @@ // ========================================================================== -// 生成日期:{{.table.CreateTime}} -// 生成人:{{.table.FunctionAuthor}} +// 生成日期:${.table.CreateTime} +// 生成人:${.table.FunctionAuthor} // ========================================================================== -package {{.table.BusinessName}} +package ${.table.BusinessName} import ( - "{{.table.PackageName}}/app/service/cache_service" + "${.table.PackageName}/app/service/cache_service" "github.com/gogf/gf/container/gset" "github.com/gogf/gf/errors/gerror" "github.com/gogf/gf/frame/g" "github.com/gogf/gf/util/gconv" ) -{{$pk:=""}} -{{$pkGoField:=""}} -{{range $index, $column := .table.Columns}} {{if eq $column.IsPk "1"}} - {{$pk = $column.ColumnName}} - {{$pkGoField = $column.GoField}} -{{end}}{{end}} +${$pk:=""} +${$pkGoField:=""} +${range $index, $column := .table.Columns} ${if eq $column.IsPk "1"} + ${$pk = $column.ColumnName} + ${$pkGoField = $column.GoField} +${end}${end} // ReqAdd 用于存储新增请求的请求参数 type ReqAdd struct { - {{range $index, $column := .table.Columns}} - {{if and (eq $column.IsInsert "1") (ne $column.IsPk "1")}} {{$column.GoField}} {{if eq $column.GoType "Time"}} *gtime.Time {{else}} {{$column.GoType}} {{end}} `p:"{{$column.HtmlField}}" {{if eq $column.IsRequired "1"}}v:"required#{{$column.ColumnComment}}不能为空"{{end}}` {{end}} {{end}} + ${range $index, $column := .table.Columns} + ${if and (eq $column.IsInsert "1") (ne $column.IsPk "1")} ${$column.GoField} ${if eq $column.GoType "Time"} *gtime.Time ${else} ${$column.GoType} ${end} `p:"${$column.HtmlField}" ${if eq $column.IsRequired "1"}v:"required#${$column.ColumnComment}不能为空"${end}` ${end} ${end} } // ReqEdit 用于存储修改请求参数 type ReqEdit struct { - {{.table.PkColumn.GoField}} {{.table.PkColumn.GoType}} `p:"{{.table.PkColumn.HtmlField}}" v:"required#主键ID不能为空"` {{range $index, $column := .table.Columns}} {{if eq $column.IsEdit "1"}} - {{$column.GoField}} {{if eq $column.GoType "Time"}}*gtime.Time{{else}}{{$column.GoType}}{{end}} `p:"{{$column.HtmlField}}" {{if eq $column.IsRequired "1"}}v:"required#{{$column.ColumnComment}}不能为空"{{end}}` {{end}} {{end}} + ${.table.PkColumn.GoField} ${.table.PkColumn.GoType} `p:"${.table.PkColumn.HtmlField}" v:"required#主键ID不能为空"` ${range $index, $column := .table.Columns} ${if eq $column.IsEdit "1"} + ${$column.GoField} ${if eq $column.GoType "Time"}*gtime.Time${else}${$column.GoType}${end} `p:"${$column.HtmlField}" ${if eq $column.IsRequired "1"}v:"required#${$column.ColumnComment}不能为空"${end}` ${end} ${end} } // RemoveReq 用于存储删除请求参数 @@ -38,8 +38,8 @@ type RemoveReq struct { } // ReqSearchList 用于存储查询的请求参数 -type ReqSearchList struct { {{range $index, $column := .table.Columns}} {{if eq $column.IsQuery "1"}} - {{$column.GoField}} {{if eq $column.GoType "Time"}}*gtime.Time{{else}}{{$column.GoType}}{{end}} `p:"{{$column.HtmlField}}"` //{{$column.ColumnComment}} {{end}} {{end}} +type ReqSearchList struct { ${range $index, $column := .table.Columns} ${if eq $column.IsQuery "1"} + ${$column.GoField} ${if eq $column.GoType "Time"}*gtime.Time${else}${$column.GoType}${end} `p:"${$column.HtmlField}"` //${$column.ColumnComment} ${end} ${end} } // GetByID 根据ID查询记录 @@ -58,11 +58,11 @@ func GetByID(id int64) (*Entity, error) { // AddSave 添加 func AddSave(req *ReqAdd) error { entity:= new(Entity) - {{range $index, $column := .table.Columns}} - {{if and (eq $column.IsInsert "1") (ne $column.IsPk "1")}} - entity.{{$column.GoField}} = req.{{$column.GoField}} - {{end}} - {{end}} + ${range $index, $column := .table.Columns} + ${if and (eq $column.IsInsert "1") (ne $column.IsPk "1")} + entity.${$column.GoField} = req.${$column.GoField} + ${end} + ${end} result, err := entity.Insert() if err != nil { @@ -77,7 +77,7 @@ func AddSave(req *ReqAdd) error { // DeleteByIds 删除 func DeleteByIds(Ids []int) error { - _, err := Model.Delete("{{.table.PkColumn.ColumnName}} in(?)", Ids) + _, err := Model.Delete("${.table.PkColumn.ColumnName} in(?)", Ids) if err != nil { g.Log().Error(err) return gerror.New("删除失败") @@ -88,14 +88,14 @@ func DeleteByIds(Ids []int) error { // EditSave 根据ID来修改信息 func EditSave(req *ReqEdit) error { // 先根据ID来查询要修改的记录 - entity, err := GetByID(req.{{$pkGoField}}) + entity, err := GetByID(req.${$pkGoField}) if err != nil { return err } // 修改实体 - {{range $index, $column := .table.Columns}} {{if eq $column.IsEdit "1"}} - entity.{{$column.GoField}} = req.{{$column.GoField}}{{end}} {{end}} + ${range $index, $column := .table.Columns} ${if eq $column.IsEdit "1"} + entity.${$column.GoField} = req.${$column.GoField}${end} ${end} _, err = entity.Update() if err != nil { g.Log().Error(err) @@ -111,15 +111,15 @@ func GetListSearch(req *ReqSearchList) (list []*Entity, err error) { filterKey := gset.New(false) tagWhere := true for key, entity := range list { - {{range $index, $column := .table.Columns}} - {{if eq $column.IsQuery "1" }} - if tagWhere && gconv.String(req.{{$column.GoField}}) != "" && entity.{{$column.GoField}}!= req.{{$column.GoField}} { + ${range $index, $column := .table.Columns} + ${if eq $column.IsQuery "1" } + if tagWhere && gconv.String(req.${$column.GoField}) != "" && entity.${$column.GoField}!= req.${$column.GoField} { tagWhere = true }else{ tagWhere = false } - {{end}} - {{end}} + ${end} + ${end} if tagWhere{ filterKey.Add(key) } @@ -139,18 +139,18 @@ func GetListSearch(req *ReqSearchList) (list []*Entity, err error) { func GetList() (list []*Entity, err error) { cache := cache_service.New() //从缓存获取数据 - iList := cache.Get("{{.table.ModuleName}}_{{.table.BusinessName}}_{{.table.TableId}}") + iList := cache.Get("${.table.ModuleName}_${.table.BusinessName}_${.table.TableId}") if iList != nil { list = iList.([]*Entity) return } - list, err = Model.Order(Columns.{{$pkGoField}}+" ASC").All() + list, err = Model.Order(Columns.${$pkGoField}+" ASC").All() if err != nil { g.Log().Error() err = gerror.New("获取数据失败") return } //缓存数据 - cache.Set("{{.table.ModuleName}}_{{.table.BusinessName}}_{{.table.TableId}}", list, 0, "{{.table.ModuleName}}_{{.table.BusinessName}}_tag") + cache.Set("${.table.ModuleName}_${.table.BusinessName}_${.table.TableId}", list, 0, "${.table.ModuleName}_${.table.BusinessName}_tag") return } \ No newline at end of file diff --git a/template/vm/go/tree/service.template b/template/vm/go/tree/service.template index aa6c1fd..507d82a 100644 --- a/template/vm/go/tree/service.template +++ b/template/vm/go/tree/service.template @@ -1,44 +1,46 @@ // ========================================================================== -// 生成日期:{{.table.CreateTime}} -// 生成人:{{.table.FunctionAuthor}} +// 生成日期:${.table.CreateTime} +// 生成人:${.table.FunctionAuthor} // ========================================================================== -package {{.table.BusinessName}}_service +package ${.table.BusinessName}_service import ( - {{.table.BusinessName}}Model "{{.table.PackageName}}/app/model/{{.table.ModuleName}}/{{.table.BusinessName}}" + ${.table.BusinessName}Model "${.table.PackageName}/app/model/${.table.ModuleName}/${.table.BusinessName}" ) -// 添加 -func AddSave(req *{{.table.BusinessName}}Model.ReqAdd) error { - return {{.table.BusinessName}}Model.AddSave(req) +// AddSave 添加 +func AddSave(req *${.table.BusinessName}Model.ReqAdd) error { + return ${.table.BusinessName}Model.AddSave(req) } -// 删除 +// DeleteByIds 删除 func DeleteByIds(ids []int) (err error) { ids, err = GetChildrenIds(ids) if err != nil { return } - return {{.table.BusinessName}}Model.DeleteByIds(ids) + return ${.table.BusinessName}Model.DeleteByIds(ids) } -//修改 -func EditSave(ReqEdit *{{.table.BusinessName}}Model.ReqEdit) error { - return {{.table.BusinessName}}Model.EditSave(ReqEdit) +// EditSave 修改 +func EditSave(ReqEdit *${.table.BusinessName}Model.ReqEdit) error { + return ${.table.BusinessName}Model.EditSave(ReqEdit) } -// 根据ID查询 -func GetInfoById(id int64) (*{{.table.BusinessName}}Model.Entity, error) { - return {{.table.BusinessName}}Model.GetByID(id) +// GetInfoById 根据ID查询 +func GetInfoById(id int64) (*${.table.BusinessName}Model.Entity, error) { + return ${.table.BusinessName}Model.GetByID(id) } -// 列表查询 -func GetListSearch(req *{{.table.BusinessName}}Model.ReqSearchList) (list []*{{.table.BusinessName}}Model.Entity, err error) { - return {{.table.BusinessName}}Model.GetListSearch(req) +// GetListSearch 列表查询 +func GetListSearch(req *${.table.BusinessName}Model.ReqSearchList) (list []*${.table.BusinessName}Model.Entity, err error) { + return ${.table.BusinessName}Model.GetListSearch(req) } -//通过ID获取子级ID + + +// GetChildrenIds 通过ID获取子级ID func GetChildrenIds(ids []int) ([]int, error) { //获取所有 menus, err := GetList() @@ -50,15 +52,15 @@ func GetChildrenIds(ids []int) ([]int, error) { menuList[k] = gconv.Map(menu) } for _, id := range ids { - children := utils.FindSonByParentId(menuList, id, "{{index .options "tree_code"}}", "{{index .options "tree_parent_code"}}") + children := utils.FindSonByParentId(menuList, id, "${index .options "tree_code"}", "${index .options "tree_parent_code"}") for _, cid := range children { - ids = append(ids, gconv.Int(cid["{{index .options "tree_code"}}"])) + ids = append(ids, gconv.Int(cid["${index .options "tree_code"}"])) } } return ids, nil } -//获取所有数据列表 -func GetList() (list []*{{.table.BusinessName}}Model.Entity, err error) { - return {{.table.BusinessName}}Model.GetList() -} \ No newline at end of file +// GetList 获取所有数据列表 +func GetList() (list []*${.table.BusinessName}Model.Entity, err error) { + return ${.table.BusinessName}Model.GetList() +} diff --git a/template/vm/html/js.template b/template/vm/html/js.template index 8008845..e098a76 100644 --- a/template/vm/html/js.template +++ b/template/vm/html/js.template @@ -1,45 +1,45 @@ import request from '@/utils/request' -// 查询{{.table.BusinessName}}列表 -export function list{{.table.BusinessName|UcFirst}}(query) { +// 查询${.table.BusinessName}列表 +export function list${.table.BusinessName|UcFirst}(query) { return request({ - url: '/{{.table.ModuleName}}/{{.table.BusinessName}}/list', + url: '/${.table.ModuleName}/${.table.BusinessName}/list', method: 'get', params: query }) } -// 查询{{.table.BusinessName}}详细 -export function get{{.table.BusinessName|UcFirst}} (id) { +// 查询${.table.BusinessName}详细 +export function get${.table.BusinessName|UcFirst} (id) { return request({ - url: '/{{.table.ModuleName}}/{{.table.BusinessName}}/edit?id='+id, + url: '/${.table.ModuleName}/${.table.BusinessName}/edit?id='+id, method: 'get' }) } -// 新增{{.table.BusinessName}} -export function add{{.table.BusinessName|UcFirst}}(data) { +// 新增${.table.BusinessName} +export function add${.table.BusinessName|UcFirst}(data) { return request({ - url: '/{{.table.ModuleName}}/{{.table.BusinessName}}/add', + url: '/${.table.ModuleName}/${.table.BusinessName}/add', method: 'post', data: data }) } -// 修改{{.table.BusinessName}} -export function update{{.table.BusinessName|UcFirst}}(data) { +// 修改${.table.BusinessName} +export function update${.table.BusinessName|UcFirst}(data) { return request({ - url: '/{{.table.ModuleName}}/{{.table.BusinessName}}/edit', + url: '/${.table.ModuleName}/${.table.BusinessName}/edit', method: 'post', data: data }) } -// 删除{{.table.BusinessName}} -export function del{{.table.BusinessName|UcFirst}}(ids) { +// 删除${.table.BusinessName} +export function del${.table.BusinessName|UcFirst}(ids) { return request({ - url: '/{{.table.ModuleName}}/{{.table.BusinessName}}/delete', + url: '/${.table.ModuleName}/${.table.BusinessName}/delete', method: 'delete', data:{ids:ids} }) diff --git a/template/vm/html/vue_crud.template b/template/vm/html/vue_crud.template index 16b0b4c..14e0e44 100644 --- a/template/vm/html/vue_crud.template +++ b/template/vm/html/vue_crud.template @@ -1,57 +1,57 @@ -{{$columns:=.table.Columns}} -{{$pk:=""}} -{{$pkColumnName:=""}} -{{range $index, $column := .table.Columns}} {{if eq $column.IsPk "1"}} - {{$pk = $column.ColumnName}} - {{$pkColumnName = $column.ColumnName}} -{{end}}{{end}} +${$columns:=.table.Columns} +${$pk:=""} +${$pkColumnName:=""} +${range $index, $column := .table.Columns} ${if eq $column.IsPk "1"} + ${$pk = $column.ColumnName} + ${$pkColumnName = $column.ColumnName} +${end}${end}