refactor🎨 部分功能重写

This commit is contained in:
wenjianzhang committed 2021-05-21 18:25:51 +08:00
1 parent 765775c54d
commit 408dcc5057
28 files changed
+649 -982

No files matched your search

+79 -123
View File
@@ -1,6 +1,7 @@
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"
@@ -18,6 +19,7 @@ type SysDept struct {
api.Api
}
// GetSysDeptList
// @Summary 分页部门列表数据
// @Description 分页列表
// @Tags 部门
@@ -28,27 +30,21 @@ type SysDept struct {
// @Router /api/v1/dept [get]
// @Security Bearer
func (e SysDept) GetSysDeptList(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := new(service.SysDept)
d := new(dto.SysDeptSearch)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(d, binding.Form).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
//查询列表
err = d.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
list := make([]models.SysDept, 0)
serviceStudent := service.SysDept{}
serviceStudent.Log = log
serviceStudent.Orm = db
list, err = serviceStudent.SetDeptPage(d)
list, err = s.SetDeptPage(d)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -57,6 +53,7 @@ func (e SysDept) GetSysDeptList(c *gin.Context) {
e.OK(list, "查询成功")
}
// GetSysDept
// @Summary 部门列表数据
// @Description 获取JSON
// @Tags 部门
@@ -66,27 +63,21 @@ func (e SysDept) GetSysDeptList(c *gin.Context) {
// @Router /api/v1/dept/{deptId} [get]
// @Security Bearer
func (e SysDept) GetSysDept(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := new(service.SysDept)
control := new(dto.SysDeptById)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
return
}
//查看详情
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
var object models.SysDept
serviceSysOperlog := service.SysDept{}
serviceSysOperlog.Log = log
serviceSysOperlog.Orm = db
err = serviceSysOperlog.GetSysDept(control, &object)
err = s.GetSysDept(control, &object)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -95,6 +86,7 @@ func (e SysDept) GetSysDept(c *gin.Context) {
e.OK(object, "查看成功")
}
// InsertSysDept 添加部门
// @Summary 添加部门
// @Description 获取JSON
// @Tags 部门
@@ -106,42 +98,33 @@ func (e SysDept) GetSysDept(c *gin.Context) {
// @Router /api/v1/dept [post]
// @Security Bearer
func (e SysDept) InsertSysDept(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := new(service.SysDept)
control := new(dto.SysDeptControl)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
//新增操作
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, err := control.Generate()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return
}
// 设置创建人
object.SetCreateBy(user.GetUserId(c))
control.SetCreateBy(user.GetUserId(c))
serviceSysDept := service.SysDept{}
serviceSysDept.Orm = db
serviceSysDept.Log = log
err = serviceSysDept.InsertSysDept(object)
err = s.InsertSysDept(control)
if err != nil {
log.Error(err)
e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败")
return
}
e.OK(object.GetId(), "创建成功")
e.OK(control.GetId(), "创建成功")
}
// UpdateSysDept
// @Summary 修改部门
// @Description 获取JSON
// @Tags 部门
@@ -154,39 +137,30 @@ func (e SysDept) InsertSysDept(c *gin.Context) {
// @Router /api/v1/dept/{deptId} [put]
// @Security Bearer
func (e SysDept) UpdateSysDept(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := new(service.SysDept)
control := new(dto.SysDeptControl)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
//更新操作
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, err := control.Generate()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(user.GetUserId(c))
control.SetUpdateBy(user.GetUserId(c))
serviceSysDept := service.SysDept{}
serviceSysDept.Orm = db
serviceSysDept.Log = log
err = serviceSysDept.UpdateSysDept(object)
err = s.UpdateSysDept(control)
if err != nil {
log.Error(err)
e.Logger.Error(err)
return
}
e.OK(object.GetId(), "更新成功")
e.OK(control.GetId(), "更新成功")
}
// DeleteSysDept
// @Summary 删除部门
// @Description 删除数据
// @Tags 部门
@@ -195,29 +169,22 @@ func (e SysDept) UpdateSysDept(c *gin.Context) {
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
// @Router /api/v1/dept [delete]
func (e SysDept) DeleteSysDept(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := service.SysDept{}
control := new(dto.SysDeptById)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
//删除操作
err = control.Bind(c)
err = s.RemoveSysDept(control)
if err != nil {
log.Errorf("Bind error: %s", err)
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
serviceSysDept := service.SysDept{}
serviceSysDept.Orm = db
serviceSysDept.Log = log
err = serviceSysDept.RemoveSysDept(control)
if err != nil {
log.Errorf("RemoveSysDept error, %s", err.Error())
e.Logger.Errorf("RemoveSysDept error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "删除失败")
return
}
@@ -226,64 +193,53 @@ func (e SysDept) DeleteSysDept(c *gin.Context) {
// GetDeptTree 用户管理 左侧部门树
func (e SysDept) GetDeptTree(c *gin.Context) {
e.Context = c
log := e.GetLogger()
s := service.SysDept{}
d := new(dto.SysDeptSearch)
db, err := e.GetOrm()
err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
return
}
//查询列表
err = d.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
list := make([]dto.DeptLabel, 0)
serviceStudent := service.SysDept{}
serviceStudent.Log = log
serviceStudent.Orm = db
list, err = serviceStudent.SetDeptTree(d)
list, err = s.SetDeptTree(d)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
}
//var Dept models.SysDepts
//Dept.DeptName = c.Request.FormValue("deptName")
//Dept.Status = c.Request.FormValue("status")
//Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId"))
//result, err := Dept.SetDept(false)
//tools.HasError(err, "抱歉未找到相关信息", -1)
e.OK(list, "")
}
// GetDeptTreeRoleSelect TODO: 此接口需要调整不应该将list和选中放在一起
func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
s := service.SysDept{}
err := e.MakeContext(c).
MakeOrm().
MakeService(&s.Service).
Errors
if err != nil {
log.Error(err)
e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
s := service.SysDept{}
s.Orm = db
s.Log = log
id, err := pkg.StringToInt(c.Param("roleId"))
result, err := s.SetDeptLabel()
if err != nil {
log.Errorf("SetDeptLabel error, %s", err.Error())
e.Logger.Errorf("SetDeptLabel error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "")
}
menuIds := make([]int, 0)
if id != 0 {
menuIds, err = s.GetRoleDeptId(id)
if err != nil {
log.Errorf("抱歉未找到相关信息, %s", err.Error())
e.Logger.Errorf("抱歉未找到相关信息, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "")
}
}