修改模板

This commit is contained in:
Siyi Guo committed 2023-02-03 10:31:05 +08:00
1 parent 90eaf46478
commit 598d5549c8
4 files changed
+177 -176

No files matched your search

+91 -91
View File
@@ -2,19 +2,19 @@ package dto
import ( import (
{{- $bb := false -}} {{- $bb := false -}}
{{- range .Columns -}} {{- range .Columns -}}
{{$z := .IsQuery}} {{$z := .IsQuery}}
{{- if ($z) }} {{- if ($z) }}
{{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}} {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- range .Columns -}} {{- range .Columns -}}
{{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}} {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}}
{{- end -}} {{- end -}}
{{- if eq $bb true -}} {{- if eq $bb true -}}
"time" "time"
{{- end }} {{- end }}
"go-admin/app/{{.PackageName}}/models" "go-admin/app/{{.PackageName}}/models"
"go-admin/common/dto" "go-admin/common/dto"
@@ -22,22 +22,22 @@ import (
) )
type {{.ClassName}}GetPageReq struct { type {{.ClassName}}GetPageReq struct {
dto.Pagination `search:"-"` dto.Pagination `search:"-"`
{{- $tablename := .TBName -}} {{- $tablename := .TBName -}}
{{- range .Columns -}} {{- range .Columns -}}
{{$z := .IsQuery}} {{$z := .IsQuery}}
{{- if ($z) }} {{- if ($z) }}
{{.GoField}} {{.GoType}} `form:"{{.JsonField}}" search:"type:{{if eq .QueryType "EQ"}}exact{{ else if eq .QueryType "NE"}}iexact{{ else if eq .QueryType "LIKE"}}contains{{ else if eq .QueryType "GT"}}gt{{ else if eq .QueryType "GTE"}}gte{{ else if eq .QueryType "LT"}}lt{{ else if eq .QueryType "LTE"}}lte{{- end }};column:{{.ColumnName}};table:{{$tablename}}" comment:"{{.ColumnComment}}"` {{.GoField}} {{.GoType}} `form:"{{.JsonField}}" search:"type:{{if eq .QueryType "EQ"}}exact{{ else if eq .QueryType "NE"}}iexact{{ else if eq .QueryType "LIKE"}}contains{{ else if eq .QueryType "GT"}}gt{{ else if eq .QueryType "GTE"}}gte{{ else if eq .QueryType "LT"}}lt{{ else if eq .QueryType "LTE"}}lte{{- end }};column:{{.ColumnName}};table:{{$tablename}}" comment:"{{.ColumnComment}}"`
{{- end }} {{- end }}
{{- end }} {{- end }}
{{.ClassName}}Order {{.ClassName}}Order
} }
type {{.ClassName}}Order struct { type {{.ClassName}}Order struct {
{{ $tablename := .TBName }} {{ $tablename := .TBName }}
{{- range .Columns -}} {{- range .Columns -}}
{{.GoField}} string `form:"{{.JsonField}}Order" search:"type:order;column:{{.ColumnName}};table:{{$tablename}}"` {{.GoField}} string `form:"{{.JsonField}}Order" search:"type:order;column:{{.ColumnName}};table:{{$tablename}}"`
{{ end }} {{ end }}
} }
func (m *{{.ClassName}}GetPageReq) GetNeedSearch() interface{} { func (m *{{.ClassName}}GetPageReq) GetNeedSearch() interface{} {
@@ -45,39 +45,39 @@ func (m *{{.ClassName}}GetPageReq) GetNeedSearch() interface{} {
} }
type {{.ClassName}}InsertReq struct { type {{.ClassName}}InsertReq struct {
{{- range .Columns -}} {{- range .Columns -}}
{{$x := .Pk}} {{$x := .Pk}}
{{- if ($x) }} {{- if ($x) }}
{{.GoField}} {{.GoType}} `json:"-" comment:"{{.ColumnComment}}"` // {{.ColumnComment}} {{.GoField}} {{.GoType}} `json:"-" comment:"{{.ColumnComment}}"` // {{.ColumnComment}}
{{- else if eq .GoField "CreatedAt" -}} {{- else if eq .GoField "CreatedAt" -}}
{{- else if eq .GoField "UpdatedAt" -}} {{- else if eq .GoField "UpdatedAt" -}}
{{- else if eq .GoField "DeletedAt" -}} {{- else if eq .GoField "DeletedAt" -}}
{{- else if eq .GoField "CreateBy" -}} {{- else if eq .GoField "CreateBy" -}}
{{- else if eq .GoField "UpdateBy" -}} {{- else if eq .GoField "UpdateBy" -}}
{{- else }} {{- else }}
{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"` {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"`
{{- end -}} {{- end -}}
{{- end }} {{- end }}
common.ControlBy common.ControlBy
} }
func (s *{{.ClassName}}InsertReq) Generate(model *models.{{.ClassName}}) { func (s *{{.ClassName}}InsertReq) Generate(model *models.{{.ClassName}}) {
{{- range .Columns -}} {{- range .Columns -}}
{{$x := .Pk}} {{$x := .Pk}}
{{- if ($x) }} {{- if ($x) }}
if s.{{.GoField}} == 0 { if s.{{.GoField}} == 0 {
model.Model = common.Model{ {{.GoField}}: s.{{.GoField}} } model.Model = common.Model{ {{.GoField}}: s.{{.GoField}} }
} }
{{- else if eq .GoField "CreatedAt" -}} {{- else if eq .GoField "CreatedAt" -}}
{{- else if eq .GoField "UpdatedAt" -}} {{- else if eq .GoField "UpdatedAt" -}}
{{- else if eq .GoField "DeletedAt" -}} {{- else if eq .GoField "DeletedAt" -}}
{{- else if eq .GoField "CreateBy"}} {{- else if eq .GoField "CreateBy"}}
model.{{.GoField}} = s.{{.GoField}} // 添加这而,需要记录是被谁创建的 model.{{.GoField}} = s.{{.GoField}} // 添加这而,需要记录是被谁创建的
{{- else if eq .GoField "UpdateBy" -}} {{- else if eq .GoField "UpdateBy" -}}
{{- else }} {{- else }}
model.{{.GoField}} = s.{{.GoField}} model.{{.GoField}} = s.{{.GoField}}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
} }
func (s *{{.ClassName}}InsertReq) GetId() interface{} { func (s *{{.ClassName}}InsertReq) GetId() interface{} {
@@ -85,39 +85,39 @@ func (s *{{.ClassName}}InsertReq) GetId() interface{} {
} }
type {{.ClassName}}UpdateReq struct { type {{.ClassName}}UpdateReq struct {
{{- range .Columns -}} {{- range .Columns -}}
{{$x := .Pk}} {{$x := .Pk}}
{{- if ($x) }} {{- if ($x) }}
{{.GoField}} {{.GoType}} `uri:"{{.JsonField}}" comment:"{{.ColumnComment}}"` // {{.ColumnComment}} {{.GoField}} {{.GoType}} `uri:"{{.JsonField}}" comment:"{{.ColumnComment}}"` // {{.ColumnComment}}
{{- else if eq .GoField "CreatedAt" -}} {{- else if eq .GoField "CreatedAt" -}}
{{- else if eq .GoField "UpdatedAt" -}} {{- else if eq .GoField "UpdatedAt" -}}
{{- else if eq .GoField "DeletedAt" -}} {{- else if eq .GoField "DeletedAt" -}}
{{- else if eq .GoField "CreateBy" -}} {{- else if eq .GoField "CreateBy" -}}
{{- else if eq .GoField "UpdateBy" -}} {{- else if eq .GoField "UpdateBy" -}}
{{- else }} {{- else }}
{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"` {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"`
{{- end -}} {{- end -}}
{{- end }} {{- end }}
common.ControlBy common.ControlBy
} }
func (s *{{.ClassName}}UpdateReq) Generate(model *models.{{.ClassName}}) { func (s *{{.ClassName}}UpdateReq) Generate(model *models.{{.ClassName}}) {
{{- range .Columns -}} {{- range .Columns -}}
{{$x := .Pk}} {{$x := .Pk}}
{{- if ($x) }} {{- if ($x) }}
if s.{{.GoField}} == 0 { if s.{{.GoField}} == 0 {
model.Model = common.Model{ {{.GoField}}: s.{{.GoField}} } model.Model = common.Model{ {{.GoField}}: s.{{.GoField}} }
} }
{{- else if eq .GoField "CreatedAt" -}} {{- else if eq .GoField "CreatedAt" -}}
{{- else if eq .GoField "UpdatedAt" -}} {{- else if eq .GoField "UpdatedAt" -}}
{{- else if eq .GoField "DeletedAt" -}} {{- else if eq .GoField "DeletedAt" -}}
{{- else if eq .GoField "CreateBy" -}} {{- else if eq .GoField "CreateBy" -}}
{{- else if eq .GoField "UpdateBy"}} {{- else if eq .GoField "UpdateBy"}}
model.{{.GoField}} = s.{{.GoField}} // 添加这而,需要记录是被谁更新的 model.{{.GoField}} = s.{{.GoField}} // 添加这而,需要记录是被谁更新的
{{- else }} {{- else }}
model.{{.GoField}} = s.{{.GoField}} model.{{.GoField}} = s.{{.GoField}}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
} }
func (s *{{.ClassName}}UpdateReq) GetId() interface{} { func (s *{{.ClassName}}UpdateReq) GetId() interface{} {
@@ -127,11 +127,11 @@ func (s *{{.ClassName}}UpdateReq) GetId() interface{} {
// {{.ClassName}}GetReq 功能获取请求参数 // {{.ClassName}}GetReq 功能获取请求参数
type {{.ClassName}}GetReq struct { type {{.ClassName}}GetReq struct {
{{- range .Columns -}} {{- range .Columns -}}
{{$x := .Pk}} {{$x := .Pk}}
{{- if ($x) }} {{- if ($x) }}
{{.GoField}} {{.GoType}} `uri:"{{.JsonField}}"` {{.GoField}} {{.GoType}} `uri:"{{.JsonField}}"`
{{- end }} {{- end }}
{{- end }} {{- end }}
} }
func (s *{{.ClassName}}GetReq) GetId() interface{} { func (s *{{.ClassName}}GetReq) GetId() interface{} {
return s.{{.PkGoField}} return s.{{.PkGoField}}
+59 -58
View File
@@ -1,9 +1,10 @@
package apis package apis
import ( import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
@@ -35,18 +36,18 @@ type {{.ClassName}} struct {
// @Router /api/v1/{{.ModuleName}} [get] // @Router /api/v1/{{.ModuleName}} [get]
// @Security Bearer // @Security Bearer
func (e {{.ClassName}}) GetPage(c *gin.Context) { func (e {{.ClassName}}) GetPage(c *gin.Context) {
req := dto.{{.ClassName}}GetPageReq{} req := dto.{{.ClassName}}GetPageReq{}
s := service.{{.ClassName}}{} s := service.{{.ClassName}}{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req, binding.Form).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
list := make([]models.{{.ClassName}}, 0) list := make([]models.{{.ClassName}}, 0)
@@ -55,7 +56,7 @@ func (e {{.ClassName}}) GetPage(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("获取{{.TableComment}}失败,\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("获取{{.TableComment}}失败,\r\n失败信息 %s", err.Error()))
return return
} }
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
@@ -72,7 +73,7 @@ func (e {{.ClassName}}) GetPage(c *gin.Context) {
func (e {{.ClassName}}) Get(c *gin.Context) { func (e {{.ClassName}}) Get(c *gin.Context) {
req := dto.{{.ClassName}}GetReq{} req := dto.{{.ClassName}}GetReq{}
s := service.{{.ClassName}}{} s := service.{{.ClassName}}{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req).
MakeService(&s.Service). MakeService(&s.Service).
@@ -88,10 +89,10 @@ func (e {{.ClassName}}) Get(c *gin.Context) {
err = s.Get(&req, p, &object) err = s.Get(&req, p, &object)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("获取{{.TableComment}}失败,\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("获取{{.TableComment}}失败,\r\n失败信息 %s", err.Error()))
return return
} }
e.OK( object, "查询成功") e.OK(object, "查询成功")
} }
// Insert 创建{{.TableComment}} // Insert 创建{{.TableComment}}
@@ -105,25 +106,25 @@ func (e {{.ClassName}}) Get(c *gin.Context) {
// @Router /api/v1/{{.ModuleName}} [post] // @Router /api/v1/{{.ModuleName}} [post]
// @Security Bearer // @Security Bearer
func (e {{.ClassName}}) Insert(c *gin.Context) { func (e {{.ClassName}}) Insert(c *gin.Context) {
req := dto.{{.ClassName}}InsertReq{} req := dto.{{.ClassName}}InsertReq{}
s := service.{{.ClassName}}{} s := service.{{.ClassName}}{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
// 设置创建人 // 设置创建人
req.SetCreateBy(user.GetUserId(c)) req.SetCreateBy(user.GetUserId(c))
err = s.Insert(&req) err = s.Insert(&req)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("创建{{.TableComment}}失败,\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("创建{{.TableComment}}失败,\r\n失败信息 %s", err.Error()))
return return
} }
e.OK(req.GetId(), "创建成功") e.OK(req.GetId(), "创建成功")
@@ -141,27 +142,27 @@ func (e {{.ClassName}}) Insert(c *gin.Context) {
// @Router /api/v1/{{.ModuleName}}/{id} [put] // @Router /api/v1/{{.ModuleName}}/{id} [put]
// @Security Bearer // @Security Bearer
func (e {{.ClassName}}) Update(c *gin.Context) { func (e {{.ClassName}}) Update(c *gin.Context) {
req := dto.{{.ClassName}}UpdateReq{} req := dto.{{.ClassName}}UpdateReq{}
s := service.{{.ClassName}}{} s := service.{{.ClassName}}{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
req.SetUpdateBy(user.GetUserId(c)) req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
err = s.Update(&req, p) err = s.Update(&req, p)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("修改{{.TableComment}}失败,\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("修改{{.TableComment}}失败,\r\n失败信息 %s", err.Error()))
return return
} }
e.OK( req.GetId(), "修改成功") e.OK(req.GetId(), "修改成功")
} }
// Delete 删除{{.TableComment}} // Delete 删除{{.TableComment}}
@@ -173,18 +174,18 @@ func (e {{.ClassName}}) Update(c *gin.Context) {
// @Router /api/v1/{{.ModuleName}} [delete] // @Router /api/v1/{{.ModuleName}} [delete]
// @Security Bearer // @Security Bearer
func (e {{.ClassName}}) Delete(c *gin.Context) { func (e {{.ClassName}}) Delete(c *gin.Context) {
s := service.{{.ClassName}}{} s := service.{{.ClassName}}{}
req := dto.{{.ClassName}}DeleteReq{} req := dto.{{.ClassName}}DeleteReq{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(&req). Bind(&req).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
// req.SetUpdateBy(user.GetUserId(c)) // req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
@@ -192,7 +193,7 @@ func (e {{.ClassName}}) Delete(c *gin.Context) {
err = s.Remove(&req, p) err = s.Remove(&req, p)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("删除{{.TableComment}}失败,\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("删除{{.TableComment}}失败,\r\n失败信息 %s", err.Error()))
return return
} }
e.OK( req.GetId(), "删除成功") e.OK(req.GetId(), "删除成功")
} }
@@ -5,8 +5,8 @@ import (
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
"go-admin/app/{{.PackageName}}/apis" "go-admin/app/{{.PackageName}}/apis"
"go-admin/common/middleware"
"go-admin/common/actions" "go-admin/common/actions"
"go-admin/common/middleware"
) )
func init() { func init() {
@@ -24,4 +24,4 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJW
r.PUT("/:id", actions.PermissionAction(), api.Update) r.PUT("/:id", actions.PermissionAction(), api.Update)
r.DELETE("", api.Delete) r.DELETE("", api.Delete)
} }
} }
+25 -25
View File
@@ -3,7 +3,7 @@ package service
import ( import (
"errors" "errors"
"github.com/go-admin-team/go-admin-core/sdk/service" "github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm" "gorm.io/gorm"
"go-admin/app/{{.PackageName}}/models" "go-admin/app/{{.PackageName}}/models"
@@ -59,9 +59,9 @@ func (e *{{.ClassName}}) Get(d *dto.{{.ClassName}}GetReq, p *actions.DataPermiss
// Insert 创建{{.ClassName}}对象 // Insert 创建{{.ClassName}}对象
func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}InsertReq) error { func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}InsertReq) error {
var err error var err error
var data models.{{.ClassName}} var data models.{{.ClassName}}
c.Generate(&data) c.Generate(&data)
err = e.Orm.Create(&data).Error err = e.Orm.Create(&data).Error
if err != nil { if err != nil {
e.Log.Errorf("{{.ClassName}}Service Insert error:%s \r\n", err) e.Log.Errorf("{{.ClassName}}Service Insert error:%s \r\n", err)
@@ -72,22 +72,22 @@ func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}InsertReq) error {
// Update 修改{{.ClassName}}对象 // Update 修改{{.ClassName}}对象
func (e *{{.ClassName}}) Update(c *dto.{{.ClassName}}UpdateReq, p *actions.DataPermission) error { func (e *{{.ClassName}}) Update(c *dto.{{.ClassName}}UpdateReq, p *actions.DataPermission) error {
var err error var err error
var data = models.{{.ClassName}}{} var data = models.{{.ClassName}}{}
e.Orm.Scopes( e.Orm.Scopes(
actions.Permission(data.TableName(), p), actions.Permission(data.TableName(), p),
).First(&data, c.GetId()) ).First(&data, c.GetId())
c.Generate(&data) c.Generate(&data)
db := e.Orm.Save(&data) db := e.Orm.Save(&data)
if err = db.Error; err != nil { if err = db.Error; err != nil {
e.Log.Errorf("{{.ClassName}}Service Save error:%s \r\n", err) e.Log.Errorf("{{.ClassName}}Service Save error:%s \r\n", err)
return err return err
} }
if db.RowsAffected == 0 { if db.RowsAffected == 0 {
return errors.New("无权更新该数据") return errors.New("无权更新该数据")
} }
return nil return nil
} }
// Remove 删除{{.ClassName}} // Remove 删除{{.ClassName}}
@@ -99,11 +99,11 @@ func (e *{{.ClassName}}) Remove(d *dto.{{.ClassName}}DeleteReq, p *actions.DataP
actions.Permission(data.TableName(), p), actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId()) ).Delete(&data, d.GetId())
if err := db.Error; err != nil { if err := db.Error; err != nil {
e.Log.Errorf("Service Remove{{.ClassName}} error:%s \r\n", err) e.Log.Errorf("Service Remove{{.ClassName}} error:%s \r\n", err)
return err return err
} }
if db.RowsAffected == 0 { if db.RowsAffected == 0 {
return errors.New("无权删除该数据") return errors.New("无权删除该数据")
} }
return nil return nil
} }