mirror of
https://github.com/go-admin-team/go-admin.git
synced 2026-10-02 21:39:38 +00:00
zhangwenjian
d53c8abc6c
The model and DTO templates assumed every table's key is an int column named
id. For any other key the generated backend did not compile - the model
embedded models.Model, which supplies Id, skipped the real key column, and
GetId then returned a field that did not exist ("e.Code undefined"). Past the
compile error there was more of the same assumption:
- GetReq and UpdateReq bound the key with uri:"<json field>", while every
generated router registers it as :id, so any other name bound nothing;
- InsertReq tagged the key json:"-", so a key the database does not assign,
such as a string, could never be supplied;
- DeleteReq took Ids []int, so a string key could not be deleted.
models.Model now stands in for the key only when the key is exactly an int
named Id; anything else is declared as its own primaryKey field. The key is
bound from :id, accepted from the request body when it is not an int, and
deleted by a list of its own type. A table keyed on an int id renders
byte-for-byte as before.
165 lines
5.1 KiB
Plaintext
165 lines
5.1 KiB
Plaintext
package dto
|
|
|
|
import (
|
|
{{- /*
|
|
$embed: the key is models.Model's own Id, so the model embeds it.
|
|
$pkType: the key's Go type, for the delete request's id list.
|
|
*/ -}}
|
|
{{- $embed := false -}}
|
|
{{- $pkType := "int" -}}
|
|
{{- range .Columns -}}{{- if .Pk -}}{{- $pkType = .GoType -}}{{- if and (eq .GoField "Id") (eq .GoType "int") -}}{{- $embed = true -}}{{- end -}}{{- end -}}{{- end -}}
|
|
{{- $bb := false -}}
|
|
{{- range .Columns -}}
|
|
{{- $z := .IsQuery -}}
|
|
{{- if ($z) -}}
|
|
{{- if eq .GoType "time.Time" -}}{{- $bb = true -}}{{- end -}}
|
|
{{- end -}}
|
|
{{- end -}}
|
|
{{- range .Columns -}}
|
|
{{- if eq .GoField "CreatedAt" -}}
|
|
{{- else if eq .GoField "UpdatedAt" -}}
|
|
{{- else if eq .GoField "DeletedAt" -}}
|
|
{{- else -}}
|
|
{{- if eq .GoType "time.Time" -}}{{- $bb = true -}}{{- end -}}
|
|
{{- end -}}
|
|
{{- end -}}
|
|
{{- if eq $bb true }}
|
|
"time"
|
|
{{- end }}
|
|
|
|
"go-admin/app/{{.PackageName}}/models"
|
|
"go-admin/common/dto"
|
|
common "go-admin/common/models"
|
|
)
|
|
|
|
type {{.ClassName}}GetPageReq struct {
|
|
dto.Pagination `search:"-"`
|
|
{{- $tablename := .TBName -}}
|
|
{{- range .Columns -}}
|
|
{{$z := .IsQuery}}
|
|
{{- 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}}"`
|
|
{{- end }}
|
|
{{- end }}
|
|
{{.ClassName}}Order
|
|
}
|
|
|
|
type {{.ClassName}}Order struct {
|
|
{{ $tablename := .TBName }}
|
|
{{- range .Columns -}}
|
|
{{.GoField}} string `form:"{{.JsonField}}Order" search:"type:order;column:{{.ColumnName}};table:{{$tablename}}"`
|
|
{{ end }}
|
|
}
|
|
|
|
func (m *{{.ClassName}}GetPageReq) GetNeedSearch() interface{} {
|
|
return *m
|
|
}
|
|
|
|
type {{.ClassName}}InsertReq struct {
|
|
{{- range .Columns -}}
|
|
{{$x := .Pk}}
|
|
{{- if ($x) }}
|
|
{{.GoField}} {{.GoType}} `json:"{{if eq .GoType "int"}}-{{else}}{{.JsonField}}{{end}}" comment:"{{.ColumnComment}}"` // {{.ColumnComment}}
|
|
{{- else if eq .GoField "CreatedAt" -}}
|
|
{{- else if eq .GoField "UpdatedAt" -}}
|
|
{{- else if eq .GoField "DeletedAt" -}}
|
|
{{- else if eq .GoField "CreateBy" -}}
|
|
{{- else if eq .GoField "UpdateBy" -}}
|
|
{{- else }}
|
|
{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"`
|
|
{{- end -}}
|
|
{{- end }}
|
|
common.ControlBy
|
|
}
|
|
|
|
func (s *{{.ClassName}}InsertReq) Generate(model *models.{{.ClassName}}) {
|
|
{{- range .Columns -}}
|
|
{{$x := .Pk}}
|
|
{{- if ($x) }}
|
|
{{- if $embed }}
|
|
if s.{{.GoField}} == 0 {
|
|
model.Model = common.Model{ {{.GoField}}: s.{{.GoField}} }
|
|
}
|
|
{{- else }}
|
|
model.{{.GoField}} = s.{{.GoField}}
|
|
{{- end }}
|
|
{{- else if eq .GoField "CreatedAt" -}}
|
|
{{- else if eq .GoField "UpdatedAt" -}}
|
|
{{- else if eq .GoField "DeletedAt" -}}
|
|
{{- else if eq .GoField "CreateBy"}}
|
|
model.{{.GoField}} = s.{{.GoField}} // 添加这而，需要记录是被谁创建的
|
|
{{- else if eq .GoField "UpdateBy" -}}
|
|
{{- else }}
|
|
model.{{.GoField}} = s.{{.GoField}}
|
|
{{- end -}}
|
|
{{- end }}
|
|
}
|
|
|
|
func (s *{{.ClassName}}InsertReq) GetId() interface{} {
|
|
return s.{{.PkGoField}}
|
|
}
|
|
|
|
type {{.ClassName}}UpdateReq struct {
|
|
{{- range .Columns -}}
|
|
{{$x := .Pk}}
|
|
{{- if ($x) }}
|
|
{{.GoField}} {{.GoType}} `uri:"id" comment:"{{.ColumnComment}}"` // {{.ColumnComment}}
|
|
{{- else if eq .GoField "CreatedAt" -}}
|
|
{{- else if eq .GoField "UpdatedAt" -}}
|
|
{{- else if eq .GoField "DeletedAt" -}}
|
|
{{- else if eq .GoField "CreateBy" -}}
|
|
{{- else if eq .GoField "UpdateBy" -}}
|
|
{{- else }}
|
|
{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"`
|
|
{{- end -}}
|
|
{{- end }}
|
|
common.ControlBy
|
|
}
|
|
|
|
func (s *{{.ClassName}}UpdateReq) Generate(model *models.{{.ClassName}}) {
|
|
{{- range .Columns -}}
|
|
{{$x := .Pk}}
|
|
{{- if ($x) }}
|
|
{{- if $embed }}
|
|
if s.{{.GoField}} == 0 {
|
|
model.Model = common.Model{ {{.GoField}}: s.{{.GoField}} }
|
|
}
|
|
{{- end }}
|
|
{{- else if eq .GoField "CreatedAt" -}}
|
|
{{- else if eq .GoField "UpdatedAt" -}}
|
|
{{- else if eq .GoField "DeletedAt" -}}
|
|
{{- else if eq .GoField "CreateBy" -}}
|
|
{{- else if eq .GoField "UpdateBy"}}
|
|
model.{{.GoField}} = s.{{.GoField}} // 添加这而，需要记录是被谁更新的
|
|
{{- else }}
|
|
model.{{.GoField}} = s.{{.GoField}}
|
|
{{- end -}}
|
|
{{- end }}
|
|
}
|
|
|
|
func (s *{{.ClassName}}UpdateReq) GetId() interface{} {
|
|
return s.{{.PkGoField}}
|
|
}
|
|
|
|
// {{.ClassName}}GetReq 功能获取请求参数
|
|
type {{.ClassName}}GetReq struct {
|
|
{{- range .Columns -}}
|
|
{{$x := .Pk}}
|
|
{{- if ($x) }}
|
|
{{.GoField}} {{.GoType}} `uri:"id"`
|
|
{{- end }}
|
|
{{- end }}
|
|
}
|
|
func (s *{{.ClassName}}GetReq) GetId() interface{} {
|
|
return s.{{.PkGoField}}
|
|
}
|
|
|
|
// {{.ClassName}}DeleteReq 功能删除请求参数
|
|
type {{.ClassName}}DeleteReq struct {
|
|
Ids []{{$pkType}} `json:"ids"`
|
|
}
|
|
|
|
func (s *{{.ClassName}}DeleteReq) GetId() interface{} {
|
|
return s.Ids
|
|
}
|