修改新代码兼容

This commit is contained in:
linwenxiang committed 2021-03-04 23:52:00 +08:00
1 parent c294bb1585
commit 1105d98f27
1 file changed
+41 -54
+41 -54
View File
@@ -1,22 +1,20 @@
package dto package dto
import ( import (
"time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go-admin/app/admin/models" "go-admin/app/admin/models"
"go-admin/common/dto" "go-admin/common/dto"
"go-admin/common/log"
common "go-admin/common/models" common "go-admin/common/models"
"go-admin/tools" "go-admin/pkg/logger"
"time"
) )
type SysChinaAreaDataSearch struct { type SysChinaAreaDataSearch struct {
dto.Pagination `search:"-"` dto.Pagination `search:"-"`
PId string `form:"pId" search:"type:exact;column:p_id;table:sys_china_area_data" comment:"上级编码"` PId string `form:"pId" search:"type:exact;column:p_id;table:sys_china_area_data" comment:"上级编码"`
Name string `form:"name" search:"type:exact;column:name;table:sys_china_area_data" comment:"名称"`
Name string `form:"name" search:"type:exact;column:name;table:sys_china_area_data" comment:"名称"`
} }
func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} { func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
@@ -24,57 +22,46 @@ func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
} }
func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error { func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx) log := logger.GetRequestLogger(ctx)
err := ctx.ShouldBind(m) err := ctx.ShouldBind(m)
if err != nil { if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error()) log.Debugf("ShouldBind error: %s", err.Error())
} }
return err return err
} }
type SysChinaAreaDataControl struct { type SysChinaAreaDataControl struct {
Id int `uri:"id" comment:"编码"` // 编码
Id int `uri:"id" comment:"编码"` // 编码 PId string `json:"pId" comment:"上级编码"`
Name string `json:"name" comment:"名称"`
PId string `json:"pId" comment:"上级编码"` CreateTime time.Time `json:"createTime" comment:""`
UpdateTime time.Time `json:"updateTime" comment:""`
DeleteTime time.Time `json:"deleteTime" comment:""`
Name string `json:"name" comment:"名称"`
CreateTime time.Time `json:"createTime" comment:""`
UpdateTime time.Time `json:"updateTime" comment:""`
DeleteTime time.Time `json:"deleteTime" comment:""`
} }
func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error { func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx) log := logger.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s) err := ctx.ShouldBindUri(s)
if err != nil { if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) log.Debugf("ShouldBindUri error: %s", err.Error())
return err return err
} }
err = ctx.ShouldBind(s) err = ctx.ShouldBind(s)
if err != nil { if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) log.Debugf("ShouldBind error: %s", err.Error())
} }
return err return err
} }
func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) { func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) {
return &models.SysChinaAreaData{ return &models.SysChinaAreaData{
Model: common.Model{ Id: s.Id }, Model: common.Model{Id: s.Id},
PId: s.PId, PId: s.PId,
Name: s.Name, Name: s.Name,
CreateTime: s.CreateTime, CreateTime: s.CreateTime,
UpdateTime: s.UpdateTime, UpdateTime: s.UpdateTime,
DeleteTime: s.DeleteTime, DeleteTime: s.DeleteTime,
}, nil }, nil
} }
@@ -96,19 +83,19 @@ func (s *SysChinaAreaDataById) GetId() interface{} {
} }
func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error { func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx) log := logger.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s) err := ctx.ShouldBindUri(s)
if err != nil { if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) log.Debugf("ShouldBindUri error: %s", err.Error())
return err return err
} }
err = ctx.ShouldBind(s) err = ctx.ShouldBind(s)
if err != nil { if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) log.Debugf("ShouldBind error: %s", err.Error())
} }
return err return err
} }
func (s *SysChinaAreaDataById) SetUpdateBy(id int) { func (s *SysChinaAreaDataById) SetUpdateBy(id int) {
} }