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

refactor🎨: 调整对象定义方式

Browse Source
This commit is contained in:
zhangwenjian
2021-06-03 09:31:10 +08:00
parent 107a8d8f90
commit 9a49700d09
8 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/apis/sys_dept.go
+27 -27
View File
@@ -30,11 +30,11 @@ type SysDept struct {
// @Router /api/v1/dept [get]
// @Security Bearer
func (e SysDept) GetSysDeptList(c *gin.Context) {
s := new(service.SysDept)
d := new(dto.SysDeptSearch)
s := service.SysDept{}
req := dto.SysDeptSearch{}
err := e.MakeContext(c).
MakeOrm().
Bind(d, binding.Form).
Bind(&req, binding.Form).
MakeService(&s.Service).
Errors
if err != nil {
@@ -44,7 +44,7 @@ func (e SysDept) GetSysDeptList(c *gin.Context) {
}
list := make([]models.SysDept, 0)
list, err = s.SetDeptPage(d)
list, err = s.SetDeptPage(&req)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -63,11 +63,11 @@ func (e SysDept) GetSysDeptList(c *gin.Context) {
// @Router /api/v1/dept/{deptId} [get]
// @Security Bearer
func (e SysDept) GetSysDept(c *gin.Context) {
s := new(service.SysDept)
control := new(dto.SysDeptById)
s :=service.SysDept{}
req := dto.SysDeptById{}
err := e.MakeContext(c).
MakeOrm().
Bind(control).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -77,7 +77,7 @@ func (e SysDept) GetSysDept(c *gin.Context) {
}
var object models.SysDept
err = s.GetSysDept(control, &object)
err = s.GetSysDept(&req, &object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -98,11 +98,11 @@ func (e SysDept) GetSysDept(c *gin.Context) {
// @Router /api/v1/dept [post]
// @Security Bearer
func (e SysDept) InsertSysDept(c *gin.Context) {
s := new(service.SysDept)
control := new(dto.SysDeptControl)
s := service.SysDept{}
req := dto.SysDeptControl{}
err := e.MakeContext(c).
MakeOrm().
Bind(control).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -112,16 +112,16 @@ func (e SysDept) InsertSysDept(c *gin.Context) {
}
// 设置创建人
control.SetCreateBy(user.GetUserId(c))
req.SetCreateBy(user.GetUserId(c))
err = s.InsertSysDept(control)
err = s.InsertSysDept(&req)
if err != nil {
e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败")
return
}
e.OK(control.GetId(), "创建成功")
e.OK(req.GetId(), "创建成功")
}
// UpdateSysDept
@@ -137,11 +137,11 @@ func (e SysDept) InsertSysDept(c *gin.Context) {
// @Router /api/v1/dept/{deptId} [put]
// @Security Bearer
func (e SysDept) UpdateSysDept(c *gin.Context) {
s := new(service.SysDept)
control := new(dto.SysDeptControl)
s := service.SysDept{}
req := dto.SysDeptControl{}
err := e.MakeContext(c).
MakeOrm().
Bind(control).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -150,14 +150,14 @@ func (e SysDept) UpdateSysDept(c *gin.Context) {
return
}
control.SetUpdateBy(user.GetUserId(c))
req.SetUpdateBy(user.GetUserId(c))
err = s.UpdateSysDept(control)
err = s.UpdateSysDept(&req)
if err != nil {
e.Logger.Error(err)
return
}
e.OK(control.GetId(), "更新成功")
e.OK(req.GetId(), "更新成功")
}
// DeleteSysDept
@@ -170,10 +170,10 @@ func (e SysDept) UpdateSysDept(c *gin.Context) {
// @Router /api/v1/dept [delete]
func (e SysDept) DeleteSysDept(c *gin.Context) {
s := service.SysDept{}
control := new(dto.SysDeptById)
req := dto.SysDeptById{}
err := e.MakeContext(c).
MakeOrm().
Bind(control).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -182,22 +182,22 @@ func (e SysDept) DeleteSysDept(c *gin.Context) {
return
}
err = s.RemoveSysDept(control)
err = s.RemoveSysDept(&req)
if err != nil {
e.Logger.Errorf("RemoveSysDept error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "删除失败")
return
}
e.OK(control.GetId(), "删除成功")
e.OK(req.GetId(), "删除成功")
}
// GetDeptTree 用户管理 左侧部门树
func (e SysDept) GetDeptTree(c *gin.Context) {
s := service.SysDept{}
d := new(dto.SysDeptSearch)
req := dto.SysDeptSearch{}
err := e.MakeContext(c).
MakeOrm().
Bind(d).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -208,7 +208,7 @@ func (e SysDept) GetDeptTree(c *gin.Context) {
list := make([]dto.DeptLabel, 0)
list, err = s.SetDeptTree(d)
list, err = s.SetDeptTree(&req)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
app/admin/apis/sys_dict_data.go
+1 -1
View File
@@ -35,7 +35,7 @@ func (e SysDictData) GetSysDictDataList(c *gin.Context) {
d := &dto.SysDictDataSearch{}
err := e.MakeContext(c).
MakeOrm().
Bind(d).
Bind(d, binding.Form).
MakeService(&s.Service).
Errors
if err != nil {
app/admin/apis/sys_dict_type.go
+2 -1
View File
@@ -1,6 +1,7 @@
package apis
import (
"github.com/gin-gonic/gin/binding"
"go-admin/app/admin/models"
"net/http"
@@ -34,7 +35,7 @@ func (e SysDictType) GetSysDictTypeList(c *gin.Context) {
d := &dto.SysDictTypeSearch{}
err := e.MakeContext(c).
MakeOrm().
Bind(d).
Bind(d, binding.Form).
MakeService(&s.Service).
Errors
if err != nil {
app/admin/apis/sys_login_log.go
+2 -1
View File
@@ -1,6 +1,7 @@
package apis
import (
"github.com/gin-gonic/gin/binding"
"go-admin/app/admin/models"
"net/http"
@@ -21,7 +22,7 @@ func (e SysLoginLog) GetSysLoginLogList(c *gin.Context) {
d := new(dto.SysLoginLogSearch)
err := e.MakeContext(c).
MakeOrm().
Bind(d).
Bind(d, binding.Form).
MakeService(&s.Service).
Errors
if err != nil {
app/admin/apis/sys_post.go
+21 -20
View File
@@ -1,6 +1,7 @@
package apis
import (
"github.com/gin-gonic/gin/binding"
"net/http"
"github.com/gin-gonic/gin"
@@ -29,11 +30,11 @@ type SysPost struct {
// @Router /api/v1/post [get]
// @Security Bearer
func (e SysPost) GetSysPostList(c *gin.Context) {
s := new(service.SysPost)
req := new(dto.SysPostSearch)
s := service.SysPost{}
req := dto.SysPostSearch{}
err := e.MakeContext(c).
MakeOrm().
Bind(req).
Bind(&req, binding.Form).
MakeService(&s.Service).
Errors
if err != nil {
@@ -45,7 +46,7 @@ func (e SysPost) GetSysPostList(c *gin.Context) {
list := make([]models.SysPost, 0)
var count int64
err = s.GetSysPostPage(req, &list, &count)
err = s.GetSysPostPage(&req, &list, &count)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -63,11 +64,11 @@ func (e SysPost) GetSysPostList(c *gin.Context) {
// @Router /api/v1/post/{postId} [get]
// @Security Bearer
func (e SysPost) GetSysPost(c *gin.Context) {
s := new(service.SysPost)
req := new(dto.SysPostById)
s := service.SysPost{}
req := dto.SysPostById{}
err := e.MakeContext(c).
MakeOrm().
Bind(req).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -77,7 +78,7 @@ func (e SysPost) GetSysPost(c *gin.Context) {
}
var object models.SysPost
err = s.GetSysPost(req, &object)
err = s.GetSysPost(&req, &object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -98,11 +99,11 @@ func (e SysPost) GetSysPost(c *gin.Context) {
// @Router /api/v1/post [post]
// @Security Bearer
func (e SysPost) InsertSysPost(c *gin.Context) {
s := new(service.SysPost)
req := new(dto.SysPostControl)
s := service.SysPost{}
req := dto.SysPostControl{}
err := e.MakeContext(c).
MakeOrm().
Bind(req).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -114,7 +115,7 @@ func (e SysPost) InsertSysPost(c *gin.Context) {
// 设置创建人
req.SetCreateBy(user.GetUserId(c))
err = s.InsertSysPost(req)
err = s.InsertSysPost(&req)
if err != nil {
e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败")
@@ -136,11 +137,11 @@ func (e SysPost) InsertSysPost(c *gin.Context) {
// @Router /api/v1/post/ [put]
// @Security Bearer
func (e SysPost) UpdateSysPost(c *gin.Context) {
s := new(service.SysPost)
req := new(dto.SysPostControl)
s := service.SysPost{}
req := dto.SysPostControl{}
err := e.MakeContext(c).
MakeOrm().
Bind(req).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -151,7 +152,7 @@ func (e SysPost) UpdateSysPost(c *gin.Context) {
req.SetUpdateBy(user.GetUserId(c))
err = s.UpdateSysPost(req)
err = s.UpdateSysPost(&req)
if err != nil {
e.Logger.Error(err)
return
@@ -168,11 +169,11 @@ func (e SysPost) UpdateSysPost(c *gin.Context) {
// @Success 500 {string} string "{"code": 500, "message": "删除失败"}"
// @Router /api/v1/post/{postId} [delete]
func (e SysPost) DeleteSysPost(c *gin.Context) {
s := new(service.SysPost)
req := new(dto.SysPostById)
s := service.SysPost{}
req := dto.SysPostById{}
err := e.MakeContext(c).
MakeOrm().
Bind(req).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -182,7 +183,7 @@ func (e SysPost) DeleteSysPost(c *gin.Context) {
}
req.SetUpdateBy(user.GetUserId(c))
err = s.RemoveSysPost(req)
err = s.RemoveSysPost(&req)
if err != nil {
e.Logger.Error(err)
return
app/admin/apis/sys_role.go
+11 -10
View File
@@ -1,6 +1,7 @@
package apis
import (
"github.com/gin-gonic/gin/binding"
"github.com/go-admin-team/go-admin-core/sdk"
"go-admin/app/admin/models"
"net/http"
@@ -32,11 +33,11 @@ type SysRole struct {
// @Router /api/v1/role [get]
// @Security Bearer
func (e SysRole) GetSysRoleList(c *gin.Context) {
s := new(service.SysRole)
req := new(dto.SysRoleSearch)
s := service.SysRole{}
req := dto.SysRoleSearch{}
err := e.MakeContext(c).
MakeOrm().
Bind(req).
Bind(&req, binding.Form).
MakeService(&s.Service).
Errors
if err != nil {
@@ -48,7 +49,7 @@ func (e SysRole) GetSysRoleList(c *gin.Context) {
list := make([]models.SysRole, 0)
var count int64
err = s.GetSysRolePage(req, &list, &count)
err = s.GetSysRolePage(&req, &list, &count)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -68,10 +69,10 @@ func (e SysRole) GetSysRoleList(c *gin.Context) {
// @Security Bearer
func (e SysRole) GetSysRole(c *gin.Context) {
s := service.SysRole{}
req := new(dto.SysRoleById)
req := dto.SysRoleById{}
err := e.MakeContext(c).
MakeOrm().
Bind(req).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -82,7 +83,7 @@ func (e SysRole) GetSysRole(c *gin.Context) {
var object models.SysRole
err = s.GetSysRole(req, &object)
err = s.GetSysRole(&req, &object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -104,10 +105,10 @@ func (e SysRole) GetSysRole(c *gin.Context) {
// @Security Bearer
func (e SysRole) InsertSysRole(c *gin.Context) {
s := service.SysRole{}
req := new(dto.SysRoleControl)
req := dto.SysRoleControl{}
err := e.MakeContext(c).
MakeOrm().
Bind(req).
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
@@ -122,7 +123,7 @@ func (e SysRole) InsertSysRole(c *gin.Context) {
req.Status = "2"
}
err = s.InsertSysRole(req)
err = s.InsertSysRole(&req)
if err != nil {
e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败")
app/admin/service/dto/sys_config.go
+5
View File
@@ -81,6 +81,11 @@ func (m *SysConfigByKeyReq) GetNeedSearch() interface{} {
return *m
}
type GetSysConfigByKEYForServiceResp struct {
ConfigKey string `json:"configKey" comment:""`
ConfigValue string `json:"configValue" comment:""`
}
// SysConfigById 获取单个或者删除的结构体
type SysConfigById struct {
Id int `uri:"id"`
app/admin/service/sys_config.go
+6 -15
View File
@@ -15,10 +15,7 @@ type SysConfig struct {
// GetSysConfigPage 获取SysConfig列表
func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]models.SysConfig, count *int64) error {
var err error
var data models.SysConfig
err = e.Orm.Model(&data).
err := e.Orm.
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
@@ -34,9 +31,7 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]models.SysC
func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]models.SysConfig) error {
var err error
var data models.SysConfig
err = e.Orm.Model(&data).
err = e.Orm.
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
).
@@ -50,10 +45,7 @@ func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]models.Sys
// GetSysConfig 获取SysConfig对象
func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *models.SysConfig) error {
var data models.SysConfig
err := e.Orm.Model(&data).
First(model, d.GetId()).Error
err := e.Orm.First(model, d.GetId()).Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
e.Log.Errorf("Service GetSysConfigPage error:%s", err)
@@ -175,13 +167,12 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById) error {
}
// GetSysConfigByKEY 根据Key获取SysConfig
func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigByKeyReq) error {
func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigByKeyReq, resp *dto.GetSysConfigByKEYForServiceResp) error {
var err error
var data models.SysConfig
data.ConfigKey = c.ConfigKey
err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error
err = e.Orm.Table(data.TableName()).Where("config_key = ?", c.ConfigKey).First(resp).Error
if err != nil {
e.Log.Errorf("Service GetSysConfigByKEY error:%s", err)
e.Log.Errorf("At Service GetSysConfigByKEY Error:%s", err)
return err
}