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

refactor🎨 ：统一格式

Browse Source
This commit is contained in:
wenjianzhang
2021-06-03 19:39:19 +08:00
parent 9a49700d09
commit 4dfd4e4647
14 changed files with 324 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/apis/sys_dept.go
+23 -33
View File
@@ -1,15 +1,13 @@
package apis
import (
"github.com/gin-gonic/gin/binding"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"go-admin/app/admin/models"
"net/http"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/admin/models"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
@@ -23,8 +21,8 @@ type SysDept struct {
// @Summary 分页部门列表数据
// @Description 分页列表
// @Tags 部门
// @Param name query string false "name"
// @Param id query string false "id"
// @Param deptName query string false "deptName"
// @Param deptId query string false "deptId"
// @Param position query string false "position"
// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
// @Router /api/v1/dept [get]
@@ -38,18 +36,16 @@ func (e SysDept) GetSysDeptList(c *gin.Context) {
MakeService(&s.Service).
Errors
if err != nil {
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
list := make([]models.SysDept, 0)
list, err = s.SetDeptPage(&req)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
e.Error(500, err, "查询失败")
return
}
e.OK(list, "查询成功")
}
@@ -71,15 +67,15 @@ func (e SysDept) GetSysDept(c *gin.Context) {
MakeService(&s.Service).
Errors
if err != nil {
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
var object models.SysDept
err = s.GetSysDept(&req, &object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
e.Error(500, err, "查询失败")
return
}
@@ -106,21 +102,18 @@ func (e SysDept) InsertSysDept(c *gin.Context) {
MakeService(&s.Service).
Errors
if err != nil {
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
// 设置创建人
req.SetCreateBy(user.GetUserId(c))
err = s.InsertSysDept(&req)
if err != nil {
e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败")
e.Error(500, err, "创建失败")
return
}
e.OK(req.GetId(), "创建成功")
}
@@ -145,16 +138,14 @@ func (e SysDept) UpdateSysDept(c *gin.Context) {
MakeService(&s.Service).
Errors
if err != nil {
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
req.SetUpdateBy(user.GetUserId(c))
err = s.UpdateSysDept(&req)
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
e.OK(req.GetId(), "更新成功")
@@ -177,15 +168,14 @@ func (e SysDept) DeleteSysDept(c *gin.Context) {
MakeService(&s.Service).
Errors
if err != nil {
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
err = s.RemoveSysDept(&req)
if err != nil {
e.Logger.Errorf("RemoveSysDept error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "删除失败")
e.Error(500, err, "删除失败")
return
}
e.OK(req.GetId(), "删除成功")
@@ -201,8 +191,8 @@ func (e SysDept) GetDeptTree(c *gin.Context) {
MakeService(&s.Service).
Errors
if err != nil {
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
@@ -210,7 +200,7 @@ func (e SysDept) GetDeptTree(c *gin.Context) {
list, err = s.SetDeptTree(&req)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
e.Error(500, err, "查询失败")
return
}
e.OK(list, "")
@@ -224,27 +214,27 @@ func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
MakeService(&s.Service).
Errors
if err != nil {
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
id, err := pkg.StringToInt(c.Param("roleId"))
result, err := s.SetDeptLabel()
if err != nil {
e.Logger.Errorf("SetDeptLabel error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "")
e.Error(500, err, err.Error())
return
}
menuIds := make([]int, 0)
if id != 0 {
menuIds, err = s.GetRoleDeptId(id)
if err != nil {
e.Logger.Errorf("抱歉未找到相关信息, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "")
e.Error(500, err, err.Error())
return
}
}
e.OK(gin.H{
"depts": result,
"checkedKeys": menuIds,
}, "")
}
}