public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-24 03:18:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

项目目录优化，任务模块后端代码

Browse Source
This commit is contained in:
PandaGoAdmin
2021-12-23 17:32:41 +08:00
parent 21ff92a93c
commit d71b0154f6
18 changed files with 162 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/system/api/dept.go
View File

@@ -3,8 +3,8 @@ package api
import (
"errors"
"fmt"
entity2 "pandax/apps/system/entity"
services2 "pandax/apps/system/services"
entity "pandax/apps/system/entity"
services "pandax/apps/system/services"
"pandax/base/biz"
"pandax/base/ctx"
"pandax/base/ginx"
@@ -13,9 +13,9 @@ import (
)
type DeptApi struct {
DeptApp services2.SysDeptModel
UserApp services2.SysUserModel
RoleApp services2.SysRoleModel
DeptApp services.SysDeptModel
UserApp services.SysUserModel
RoleApp services.SysRoleModel
}
// @Summary 获取角色的部门树
@@ -29,11 +29,11 @@ type DeptApi struct {
func (m *DeptApi) GetDeptTreeRoleSelect(rc *ctx.ReqCtx) {
roleId := ginx.PathParamInt(rc.GinCtx, "roleId")
result := m.DeptApp.SelectDeptLable(entity2.SysDept{})
result := m.DeptApp.SelectDeptLable(entity.SysDept{})
deptIds := make([]int64, 0)
if roleId != 0 {
deptIds = m.RoleApp.GetRoleDeptId(entity2.SysRole{RoleId: int64(roleId)})
deptIds = m.RoleApp.GetRoleDeptId(entity.SysRole{RoleId: int64(roleId)})
}
rc.ResData = map[string]interface{}{
"depts": result,
@@ -56,7 +56,7 @@ func (a *DeptApi) GetDeptList(rc *ctx.ReqCtx) {
deptName := rc.GinCtx.Query("deptName")
status := rc.GinCtx.Query("status")
deptId := ginx.QueryInt(rc.GinCtx, "deptId", 0)
dept := entity2.SysDept{DeptName: deptName, Status: status, DeptId: int64(deptId)}
dept := entity.SysDept{DeptName: deptName, Status: status, DeptId: int64(deptId)}
if dept.DeptName == "" {
rc.ResData = a.DeptApp.SelectDept(dept)
@@ -72,7 +72,7 @@ func (a *DeptApi) GetDeptList(rc *ctx.ReqCtx) {
// @Router /system/dept/ordinaryDeptLis [get]
// @Security
func (a *DeptApi) GetOrdinaryDeptList(rc *ctx.ReqCtx) {
rc.ResData = a.DeptApp.FindList(entity2.SysDept{})
rc.ResData = a.DeptApp.FindList(entity.SysDept{})
}
// @Summary 所有部门树数据
@@ -88,7 +88,7 @@ func (a *DeptApi) GetDeptTree(rc *ctx.ReqCtx) {
deptName := rc.GinCtx.Query("deptName")
status := rc.GinCtx.Query("status")
deptId := ginx.QueryInt(rc.GinCtx, "deptId", 0)
dept := entity2.SysDept{DeptName: deptName, Status: status, DeptId: int64(deptId)}
dept := entity.SysDept{DeptName: deptName, Status: status, DeptId: int64(deptId)}
rc.ResData = a.DeptApp.SelectDept(dept)
}
@@ -116,7 +116,7 @@ func (a *DeptApi) GetDept(rc *ctx.ReqCtx) {
// @Router /system/dept [post]
// @Security Bearer
func (a *DeptApi) InsertDept(rc *ctx.ReqCtx) {
var dept entity2.SysDept
var dept entity.SysDept
g := rc.GinCtx
ginx.BindJsonAndValid(g, &dept)
@@ -135,7 +135,7 @@ func (a *DeptApi) InsertDept(rc *ctx.ReqCtx) {
// @Router /system/dept [put]
// @Security Bearer
func (a *DeptApi) UpdateDept(rc *ctx.ReqCtx) {
var dept entity2.SysDept
var dept entity.SysDept
g := rc.GinCtx
ginx.BindJsonAndValid(g, &dept)
@@ -156,7 +156,7 @@ func (a *DeptApi) DeleteDept(rc *ctx.ReqCtx) {
deList := make([]int64, 0)
for _, id := range deptIds {
user := entity2.SysUser{}
user := entity.SysUser{}
user.DeptId = id
list := a.UserApp.FindList(user)
if len(*list) == 0 {