public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-20 17:57:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat ✨ 排序字段接受参数名调整

Browse Source
This commit is contained in:
wenjianzhang
2021-05-25 19:36:57 +08:00
parent dd7b50e0fa
commit 8d272e8862
7 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/service/dto/sys_api.go
+3 -3
View File
@@ -16,9 +16,9 @@ type SysApiSearch struct {
}
type SysApiOrder struct {
TitleOrder string `search:"type:order;column:title;table:sys_api" form:"title_order"`
PathOrder string `search:"type:order;column:path;table:sys_api" form:"path_order"`
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAt_order"`
TitleOrder string `search:"type:order;column:title;table:sys_api" form:"titleOrder"`
PathOrder string `search:"type:order;column:path;table:sys_api" form:"pathOrder"`
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAtOrder"`
}
func (m *SysApiSearch) GetNeedSearch() interface{} {
app/admin/service/dto/sys_config.go
+18
View File
@@ -13,6 +13,15 @@ type SysConfigSearch struct {
ConfigKey string `form:"configKey" search:"type:contains;column:config_key;table:sys_config"`
ConfigType string `form:"configType" search:"type:exact;column:config_type;table:sys_config"`
IsFrontend int `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"`
SysConfigOrder
}
type SysConfigOrder struct {
IdOrder string `search:"type:order;column:id;table:sys_config" form:"idOrder"`
ConfigNameOrder string `search:"type:order;column:config_name;table:sys_config" form:"configNameOrder"`
ConfigKeyOrder string `search:"type:order;column:config_key;table:sys_config" form:"configKeyOrder"`
ConfigTypeOrder string `search:"type:order;column:config_type;table:sys_config" form:"configTypeOrder"`
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_config" form:"createdAtOrder"`
}
func (m *SysConfigSearch) GetNeedSearch() interface{} {
@@ -50,6 +59,15 @@ func (s *SysConfigControl) GetId() interface{} {
return s.Id
}
// SysConfigByKeyReq 根据Key获取配置
type SysConfigByKeyReq struct {
ConfigKey string `uri:"configKey" search:"type:contains;column:config_key;table:sys_config"`
}
func (m *SysConfigByKeyReq) GetNeedSearch() interface{} {
return *m
}
// SysConfigById 获取单个或者删除的结构体
type SysConfigById struct {
Id int `uri:"id"`
app/admin/service/dto/sys_dict_type.go
+1 -1
View File
@@ -18,7 +18,7 @@ type SysDictTypeSearch struct {
}
type SysDictTypeOrder struct {
DictIdOrder string `search:"type:order;column:dict_id;table:sys_dict_type" form:"dict_id_order"`
DictIdOrder string `search:"type:order;column:dict_id;table:sys_dict_type" form:"dictIdOrder"`
}
func (m *SysDictTypeSearch) GetNeedSearch() interface{} {
app/admin/service/dto/sys_login_log.go
+2 -2
View File
@@ -20,7 +20,7 @@ type SysLoginLogSearch struct {
}
type SysLoginLogOrder struct {
HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"created_at_order"`
HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"`
}
func (m *SysLoginLogSearch) GetNeedSearch() interface{} {
@@ -115,4 +115,4 @@ func (s *SysLoginLogById) Generate() *SysLoginLogById {
func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) {
return &models.SysLoginLog{}, nil
}
}
app/admin/service/dto/sys_role.go
+5 -5
View File
@@ -28,11 +28,11 @@ type SysRoleSearch struct {
}
type SysRoleOrder struct {
RoleIdOrder string `search:"type:order;column:role_id;table:sys_role" form:"roleId_order"`
RoleNameOrder string `search:"type:order;column:role_name;table:sys_role" form:"roleName_order"`
RoleSortOrder string `search:"type:order;column:role_sort;table:sys_role" form:"username_order"`
StatusOrder string `search:"type:order;column:status;table:sys_role" form:"status_order"`
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAt_order"`
RoleIdOrder string `search:"type:order;column:role_id;table:sys_role" form:"roleIdOrder"`
RoleNameOrder string `search:"type:order;column:role_name;table:sys_role" form:"roleNameOrder"`
RoleSortOrder string `search:"type:order;column:role_sort;table:sys_role" form:"usernameOrder"`
StatusOrder string `search:"type:order;column:status;table:sys_role" form:"statusOrder"`
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAtOrder"`
}
func (m *SysRoleSearch) GetNeedSearch() interface{} {
app/admin/service/dto/sys_user.go
+4 -4
View File
@@ -23,10 +23,10 @@ type SysUserSearch struct {
}
type SysUserOrder struct {
UserIdOrder string `search:"type:order;column:user_id;table:sys_user" form:"userId_order"`
UsernameOrder string `search:"type:order;column:username;table:sys_user" form:"username_order"`
StatusOrder string `search:"type:order;column:status;table:sys_user" form:"status_order"`
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAt_order"`
UserIdOrder string `search:"type:order;column:user_id;table:sys_user" form:"userIdOrder"`
UsernameOrder string `search:"type:order;column:username;table:sys_user" form:"usernameOrder"`
StatusOrder string `search:"type:order;column:status;table:sys_user" form:"statusOrder"`
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAtOrder"`
}
func (m *SysUserSearch) GetNeedSearch() interface{} {
app/admin/service/sys_config.go
+2 -2
View File
@@ -71,7 +71,7 @@ func (e *SysConfig) InsertSysConfig(c *dto.SysConfigControl) error {
var err error
var data models.SysConfig
c.Generate(&data)
err = e.Orm.Create(data).Error
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("Service InsertSysConfig error:%s", err)
return err
@@ -117,7 +117,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById) error {
}
// GetSysConfigByKEY 根据Key获取SysConfig
func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigByKeyReq) error {
var err error
var data models.SysConfig
data.ConfigKey = c.ConfigKey