feat ✨ 排序字段接受参数名调整
This commit is contained in:
1 parent
dd7b50e0fa
commit
8d272e8862
7 files changed
+34
-16
No files matched your search
@@ -16,9 +16,9 @@ type SysApiSearch struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SysApiOrder struct {
|
type SysApiOrder struct {
|
||||||
TitleOrder string `search:"type:order;column:title;table:sys_api" form:"title_order"`
|
TitleOrder string `search:"type:order;column:title;table:sys_api" form:"titleOrder"`
|
||||||
PathOrder string `search:"type:order;column:path;table:sys_api" form:"path_order"`
|
PathOrder string `search:"type:order;column:path;table:sys_api" form:"pathOrder"`
|
||||||
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAt_order"`
|
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAtOrder"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *SysApiSearch) GetNeedSearch() interface{} {
|
func (m *SysApiSearch) GetNeedSearch() interface{} {
|
||||||
|
|||||||
@@ -13,6 +13,15 @@ type SysConfigSearch struct {
|
|||||||
ConfigKey string `form:"configKey" search:"type:contains;column:config_key;table:sys_config"`
|
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"`
|
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"`
|
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{} {
|
func (m *SysConfigSearch) GetNeedSearch() interface{} {
|
||||||
@@ -50,6 +59,15 @@ func (s *SysConfigControl) GetId() interface{} {
|
|||||||
return s.Id
|
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 获取单个或者删除的结构体
|
// SysConfigById 获取单个或者删除的结构体
|
||||||
type SysConfigById struct {
|
type SysConfigById struct {
|
||||||
Id int `uri:"id"`
|
Id int `uri:"id"`
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ type SysDictTypeSearch struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SysDictTypeOrder 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{} {
|
func (m *SysDictTypeSearch) GetNeedSearch() interface{} {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ type SysLoginLogSearch struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SysLoginLogOrder 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{} {
|
func (m *SysLoginLogSearch) GetNeedSearch() interface{} {
|
||||||
|
|||||||
@@ -28,11 +28,11 @@ type SysRoleSearch struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SysRoleOrder struct {
|
type SysRoleOrder struct {
|
||||||
RoleIdOrder string `search:"type:order;column:role_id;table:sys_role" form:"roleId_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:"roleName_order"`
|
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:"username_order"`
|
RoleSortOrder string `search:"type:order;column:role_sort;table:sys_role" form:"usernameOrder"`
|
||||||
StatusOrder string `search:"type:order;column:status;table:sys_role" form:"status_order"`
|
StatusOrder string `search:"type:order;column:status;table:sys_role" form:"statusOrder"`
|
||||||
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAt_order"`
|
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAtOrder"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *SysRoleSearch) GetNeedSearch() interface{} {
|
func (m *SysRoleSearch) GetNeedSearch() interface{} {
|
||||||
|
|||||||
@@ -23,10 +23,10 @@ type SysUserSearch struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SysUserOrder struct {
|
type SysUserOrder struct {
|
||||||
UserIdOrder string `search:"type:order;column:user_id;table:sys_user" form:"userId_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:"username_order"`
|
UsernameOrder string `search:"type:order;column:username;table:sys_user" form:"usernameOrder"`
|
||||||
StatusOrder string `search:"type:order;column:status;table:sys_user" form:"status_order"`
|
StatusOrder string `search:"type:order;column:status;table:sys_user" form:"statusOrder"`
|
||||||
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAt_order"`
|
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAtOrder"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *SysUserSearch) GetNeedSearch() interface{} {
|
func (m *SysUserSearch) GetNeedSearch() interface{} {
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ func (e *SysConfig) InsertSysConfig(c *dto.SysConfigControl) error {
|
|||||||
var err error
|
var err error
|
||||||
var data models.SysConfig
|
var data models.SysConfig
|
||||||
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("Service InsertSysConfig error:%s", err)
|
e.Log.Errorf("Service InsertSysConfig error:%s", err)
|
||||||
return err
|
return err
|
||||||
@@ -117,7 +117,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// GetSysConfigByKEY 根据Key获取SysConfig
|
// GetSysConfigByKEY 根据Key获取SysConfig
|
||||||
func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
|
func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigByKeyReq) error {
|
||||||
var err error
|
var err error
|
||||||
var data models.SysConfig
|
var data models.SysConfig
|
||||||
data.ConfigKey = c.ConfigKey
|
data.ConfigKey = c.ConfigKey
|
||||||
|
|||||||
Reference in new issue
Block a user