public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 10:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor🎨 api数据初始化调整

Browse Source
This commit is contained in:
wenjianzhang
2021-05-17 23:09:35 +08:00
parent b2345039e4
commit 6b1c3d9226
10 changed files with 171 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/apis/sys_api.go
+10 -19
View File
@@ -26,7 +26,6 @@ type SysApi struct {
// @Param title query string false "标题"
// @Param path query string false "地址"
// @Param action query string false "类型"
// @Param parentId query string false "按钮id"
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Success 200 {object} response.Response{data=response.Page{list=[]models.SysApi}} "{"code": 200, "data": [...]}"
@@ -77,34 +76,26 @@ func (e SysApi) GetSysApiList(c *gin.Context) {
// @Router /api/v1/sys_api/{id} [get]
// @Security Bearer
func (e SysApi) GetSysApi(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
control := new(dto.SysApiById)
//查看详情
err = e.Bind(control)
s := new(service.SysApi)
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Warnf("request body bind error, %s", err.Error())
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
e.Logger.Error(err)
return
}
var object models.SysApi
//数据权限检查
p := actions.GetPermissionFromContext(c)
serviceSysApi := service.SysApi{}
serviceSysApi.Log = log
serviceSysApi.Orm = db
err = serviceSysApi.GetSysApi(control, p, &object)
err = s.GetSysApi(control, p, &object).Error
if err != nil {
log.Errorf("Get SysApi error, %s", err.Error())
e.Logger.Errorf("Get SysApi error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "查询失败")
return
}
app/admin/apis/sys_config.go
+56 -109
View File
@@ -18,31 +18,24 @@ type SysConfig struct {
}
func (e SysConfig) GetSysConfigList(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
s := service.SysConfig{}
d := new(dto.SysConfigSearch)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(d, binding.Query).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
return
}
err = e.Bind(d, binding.Query)
//查询列表
//err = d.Bind(c)
if err != nil {
log.Errorf("参数验证失败, error:%s", err)
e.Error(500, err, "参数验证失败")
e.Logger.Error(err)
return
}
list := make([]models.SysConfig, 0)
var count int64
s := service.SysConfig{}
s.Log = log
s.Orm = db
err = s.GetSysConfigPage(d, &list, &count)
if err != nil {
log.Errorf("GetSysConfigPage 查询失败, error:%s", err)
e.Logger.Errorf("GetSysConfigPage 查询失败, error:%s", err)
e.Error(500, err, "查询失败")
return
}
@@ -51,31 +44,24 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) {
// GetSysConfigBySysApp 获取系统配置信息，主要注意这里不在验证数据权限
func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
e.Context = c
log := e.GetLogger()
d := new(dto.SysConfigSearch)
db, err := e.GetOrm()
s := service.SysConfig{}
err := e.MakeContext(c).
MakeOrm().
Bind(d, nil).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
return
}
err = e.Bind(d, binding.Query)
if err != nil {
log.Errorf("参数验证失败, error:%s", err)
e.Error(500, err, "参数验证失败")
e.Logger.Error(err)
return
}
// 控制只读前台的数据
d.IsFrontend = 1
list := make([]models.SysConfig, 0)
s := service.SysConfig{}
s.Log = log
s.Orm = db
err = s.GetSysConfigByKey(d, &list)
if err != nil {
log.Errorf("GetSysConfigPage 查询失败, error:%s", err)
e.Logger.Errorf("GetSysConfigPage 查询失败, error:%s", err)
e.Error(500, err, "查询失败")
return
}
@@ -90,32 +76,23 @@ func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
}
func (e SysConfig) GetSysConfig(c *gin.Context) {
e.Context = c
log := e.GetLogger()
control := new(dto.SysConfigById)
db, err := e.GetOrm()
s := service.SysConfig{}
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
return
}
//查看详情
err = e.Bind(control)
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
e.Logger.Error(err)
return
}
var object models.SysConfig
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Log = log
serviceSysLoginLog.Orm = db
err = serviceSysLoginLog.GetSysConfig(control, &object)
err = s.GetSysConfig(control, &object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Logger.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
return
}
@@ -124,123 +101,93 @@ func (e SysConfig) GetSysConfig(c *gin.Context) {
}
func (e SysConfig) InsertSysConfig(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := service.SysConfig{}
control := new(dto.SysConfigControl)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Logger.Error(err)
return
}
//新增操作
err = e.Bind(control, binding.JSON)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
return
}
object, err := control.Generate()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
e.Logger.Errorf("Orm获取失败, error:%s", err)
return
}
// 设置创建人
object.SetCreateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Orm = db
serviceSysLoginLog.Log = log
err = serviceSysLoginLog.InsertSysConfig(object)
err = s.InsertSysConfig(object)
if err != nil {
log.Error(err)
e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
return
}
e.OK(object.GetId(), "创建成功")
}
func (e SysConfig) UpdateSysConfig(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := service.SysConfig{}
control := new(dto.SysConfigControl)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Logger.Error(err)
return
}
//更新操作
err = e.Bind(control, binding.JSON)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
return
}
object, err := control.Generate()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
e.Logger.Errorf("Orm获取失败, error:%s", err)
return
}
object.SetUpdateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Orm = db
serviceSysLoginLog.Log = log
err = serviceSysLoginLog.UpdateSysConfig(object)
err = s.UpdateSysConfig(object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "更新失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
e.Logger.Errorf("Orm获取失败, error:%s", err)
return
}
e.OK(object.GetId(), "更新成功")
}
func (e SysConfig) DeleteSysConfig(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := service.SysConfig{}
control := new(dto.SysConfigById)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Logger.Error(err)
return
}
//删除操作
err = e.Bind(control, binding.JSON)
if err != nil {
log.Errorf("Bind error: %s", err)
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, err := control.GenerateM()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Logger.Errorf("Orm获取失败, error:%s", err)
return
}
// 设置编辑人
object.SetUpdateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Orm = db
serviceSysLoginLog.Log = log
err = serviceSysLoginLog.RemoveSysConfig(control, object)
err = s.RemoveSysConfig(control, object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "删除失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Logger.Errorf("Orm获取失败, error:%s", err)
return
}
e.OK(object.GetId(), "删除成功")
app/admin/apis/sys_menu.go
+8 -24
View File
@@ -113,27 +113,20 @@ func (e SysMenu) GetSysMenu(c *gin.Context) {
// @Security Bearer
func (e SysMenu) InsertSysMenu(c *gin.Context) {
control := new(dto.SysMenuControl)
s := new(service.SysMenu)
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
// 绑定数据
err = e.Bind(control)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
// 设置创建人
control.SetCreateBy(user.GetUserId(c))
serviceSysMenu := service.SysMenu{}
err = serviceSysMenu.MakeLog(e.Logger).MakeOrm(e.Orm).InsertSysMenu(control).Error
err = s.InsertSysMenu(control).Error
if err != nil {
e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败")
@@ -156,28 +149,19 @@ func (e SysMenu) InsertSysMenu(c *gin.Context) {
// @Security Bearer
func (e SysMenu) UpdateSysMenu(c *gin.Context) {
control := new(dto.SysMenuControl)
s := new(service.SysMenu)
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
return
}
// 绑定数据
err = e.Bind(control)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
control.SetUpdateBy(user.GetUserId(c))
serviceSysMenu := service.SysMenu{}
err = serviceSysMenu.
MakeOrm(e.Orm).
MakeLog(e.Logger).
UpdateSysMenu(control).Error
err = s.UpdateSysMenu(control).Error
if err != nil {
e.Logger.Error(err)
return