From 8f540732140b6f918b8f9986bb79355607509e65 Mon Sep 17 00:00:00 2001 From: "y389200311@163.com" Date: Tue, 12 Oct 2021 00:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=A0=E5=96=9C=E4=BA=AE20211011--=E5=B0=86?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=AE=A1=E7=90=86=201=E3=80=81=E5=B0=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E4=B8=ADdept=E6=9B=B4?= =?UTF-8?q?=E5=90=8D=E4=B8=BAclasses=202=E3=80=81=E5=B0=86=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=B8=AD=E6=89=80=E6=9C=89dept=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BAclasses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...troller.java => SysClassesController.java} | 136 +++++------ .../src/main/resources/application-druid.yml | 1 + .../ruoyi/common/annotation/DataScope.java | 4 +- .../ruoyi/common/constant/UserConstants.java | 4 +- .../core/controller/BaseController.java | 6 +- .../ruoyi/common/core/domain/TreeEntity.java | 2 +- .../ruoyi/common/core/domain/TreeSelect.java | 10 +- .../entity/{SysDept.java => SysClasses.java} | 50 ++-- .../common/core/domain/entity/SysRole.java | 30 +-- .../common/core/domain/entity/SysUser.java | 34 +-- .../common/core/domain/model/LoginUser.java | 16 +- .../com/ruoyi/common/utils/SecurityUtils.java | 8 +- .../framework/aspectj/DataScopeAspect.java | 16 +- .../web/service/UserDetailsServiceImpl.java | 2 +- .../com/ruoyi/system/domain/SysOperLog.java | 14 +- .../{SysRoleDept.java => SysRoleClasses.java} | 18 +- .../ruoyi/system/domain/SysUserOnline.java | 12 +- .../ruoyi/system/mapper/SysClassesMapper.java | 118 ++++++++++ .../ruoyi/system/mapper/SysDeptMapper.java | 118 ---------- ...tMapper.java => SysRoleClassesMapper.java} | 26 +-- ...ptService.java => ISysClassesService.java} | 86 +++---- ...ceImpl.java => SysClassesServiceImpl.java} | 216 +++++++++--------- .../service/impl/SysMenuServiceImpl.java | 4 +- .../service/impl/SysRoleServiceImpl.java | 40 ++-- .../impl/SysUserOnlineServiceImpl.java | 4 +- .../service/impl/SysUserServiceImpl.java | 6 +- ...SysDeptMapper.xml => SysClassesMapper.xml} | 116 +++++----- .../mapper/system/SysOperLogMapper.xml | 8 +- ...eptMapper.xml => SysRoleClassesMapper.xml} | 24 +- .../resources/mapper/system/SysRoleMapper.xml | 12 +- .../resources/mapper/system/SysUserMapper.xml | 40 ++-- .../src/api/system/{dept.js => classes.js} | 48 ++-- ruoyi-ui/src/views/index.vue | 16 +- ruoyi-ui/src/views/monitor/online/index.vue | 2 +- .../views/system/{dept => classes}/index.vue | 94 ++++---- ruoyi-ui/src/views/system/role/index.vue | 88 +++---- ruoyi-ui/src/views/system/user/index.vue | 42 ++-- .../src/views/system/user/profile/index.vue | 4 +- ruoyi-ui/src/views/tool/gen/genInfoForm.vue | 4 +- sql/ry_20210908.sql | 80 +++---- 40 files changed, 780 insertions(+), 779 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/{SysDeptController.java => SysClassesController.java} (31%) rename ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/{SysDept.java => SysClasses.java} (78%) rename ruoyi-system/src/main/java/com/ruoyi/system/domain/{SysRoleDept.java => SysRoleClasses.java} (66%) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysClassesMapper.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename ruoyi-system/src/main/java/com/ruoyi/system/mapper/{SysRoleDeptMapper.java => SysRoleClassesMapper.java} (36%) rename ruoyi-system/src/main/java/com/ruoyi/system/service/{ISysDeptService.java => ISysClassesService.java} (30%) rename ruoyi-system/src/main/java/com/ruoyi/system/service/impl/{SysDeptServiceImpl.java => SysClassesServiceImpl.java} (37%) rename ruoyi-system/src/main/resources/mapper/system/{SysDeptMapper.xml => SysClassesMapper.xml} (47%) rename ruoyi-system/src/main/resources/mapper/system/{SysRoleDeptMapper.xml => SysRoleClassesMapper.xml} (41%) rename ruoyi-ui/src/api/system/{dept.js => classes.js} (37%) rename ruoyi-ui/src/views/system/{dept => classes}/index.vue (76%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysClassesController.java similarity index 31% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysClassesController.java index a6030ea..10d8066 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysClassesController.java @@ -18,146 +18,146 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysClasses; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.ISysClassesService; /** - * 部门信息 + * 班级信息 * * @author ruoyi */ @RestController -@RequestMapping("/system/dept") -public class SysDeptController extends BaseController +@RequestMapping("/system/classes") +public class SysClassesController extends BaseController { @Autowired - private ISysDeptService deptService; + private ISysClassesService classesService; /** - * 获取部门列表 + * 获取班级列表 */ - @PreAuthorize("@ss.hasPermi('system:dept:list')") + @PreAuthorize("@ss.hasPermi('system:classes:list')") @GetMapping("/list") - public AjaxResult list(SysDept dept) + public AjaxResult list(SysClasses classes) { - List depts = deptService.selectDeptList(dept); - return AjaxResult.success(depts); + List classess = classesService.selectClassesList(classes); + return AjaxResult.success(classess); } /** - * 查询部门列表（排除节点） + * 查询班级列表（排除节点） */ - @PreAuthorize("@ss.hasPermi('system:dept:list')") - @GetMapping("/list/exclude/{deptId}") - public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) + @PreAuthorize("@ss.hasPermi('system:classes:list')") + @GetMapping("/list/exclude/{classesId}") + public AjaxResult excludeChild(@PathVariable(value = "classesId", required = false) Long classesId) { - List depts = deptService.selectDeptList(new SysDept()); - Iterator it = depts.iterator(); + List classess = classesService.selectClassesList(new SysClasses()); + Iterator it = classess.iterator(); while (it.hasNext()) { - SysDept d = (SysDept) it.next(); - if (d.getDeptId().intValue() == deptId - || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) + SysClasses d = (SysClasses) it.next(); + if (d.getClassesId().intValue() == classesId + || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), classesId + "")) { it.remove(); } } - return AjaxResult.success(depts); + return AjaxResult.success(classess); } /** - * 根据部门编号获取详细信息 + * 根据班级编号获取详细信息 */ - @PreAuthorize("@ss.hasPermi('system:dept:query')") - @GetMapping(value = "/{deptId}") - public AjaxResult getInfo(@PathVariable Long deptId) + @PreAuthorize("@ss.hasPermi('system:classes:query')") + @GetMapping(value = "/{classesId}") + public AjaxResult getInfo(@PathVariable Long classesId) { - deptService.checkDeptDataScope(deptId); - return AjaxResult.success(deptService.selectDeptById(deptId)); + classesService.checkClassesDataScope(classesId); + return AjaxResult.success(classesService.selectClassesById(classesId)); } /** - * 获取部门下拉树列表 + * 获取班级下拉树列表 */ @GetMapping("/treeselect") - public AjaxResult treeselect(SysDept dept) + public AjaxResult treeselect(SysClasses classes) { - List depts = deptService.selectDeptList(dept); - return AjaxResult.success(deptService.buildDeptTreeSelect(depts)); + List classess = classesService.selectClassesList(classes); + return AjaxResult.success(classesService.buildClassesTreeSelect(classess)); } /** - * 加载对应角色部门列表树 + * 加载对应角色班级列表树 */ - @GetMapping(value = "/roleDeptTreeselect/{roleId}") - public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) + @GetMapping(value = "/roleClassesTreeselect/{roleId}") + public AjaxResult roleClassesTreeselect(@PathVariable("roleId") Long roleId) { - List depts = deptService.selectDeptList(new SysDept()); + List classess = classesService.selectClassesList(new SysClasses()); AjaxResult ajax = AjaxResult.success(); - ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); - ajax.put("depts", deptService.buildDeptTreeSelect(depts)); + ajax.put("checkedKeys", classesService.selectClassesListByRoleId(roleId)); + ajax.put("classess", classesService.buildClassesTreeSelect(classess)); return ajax; } /** - * 新增部门 + * 新增班级 */ - @PreAuthorize("@ss.hasPermi('system:dept:add')") - @Log(title = "部门管理", businessType = BusinessType.INSERT) + @PreAuthorize("@ss.hasPermi('system:classes:add')") + @Log(title = "班级管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysDept dept) + public AjaxResult add(@Validated @RequestBody SysClasses classes) { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) + if (UserConstants.NOT_UNIQUE.equals(classesService.checkClassesNameUnique(classes))) { - return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); + return AjaxResult.error("新增班级'" + classes.getClassesName() + "'失败，班级名称已存在"); } - dept.setCreateBy(getUsername()); - return toAjax(deptService.insertDept(dept)); + classes.setCreateBy(getUsername()); + return toAjax(classesService.insertClasses(classes)); } /** - * 修改部门 + * 修改班级 */ - @PreAuthorize("@ss.hasPermi('system:dept:edit')") - @Log(title = "部门管理", businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('system:classes:edit')") + @Log(title = "班级管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDept dept) + public AjaxResult edit(@Validated @RequestBody SysClasses classes) { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) + if (UserConstants.NOT_UNIQUE.equals(classesService.checkClassesNameUnique(classes))) { - return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); + return AjaxResult.error("修改班级'" + classes.getClassesName() + "'失败，班级名称已存在"); } - else if (dept.getParentId().equals(dept.getDeptId())) + else if (classes.getParentId().equals(classes.getClassesId())) { - return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); + return AjaxResult.error("修改班级'" + classes.getClassesName() + "'失败，上级班级不能是自己"); } - else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) - && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) + else if (StringUtils.equals(UserConstants.DEPT_DISABLE, classes.getStatus()) + && classesService.selectNormalChildrenClassesById(classes.getClassesId()) > 0) { - return AjaxResult.error("该部门包含未停用的子部门！"); + return AjaxResult.error("该班级包含未停用的子班级！"); } - dept.setUpdateBy(getUsername()); - return toAjax(deptService.updateDept(dept)); + classes.setUpdateBy(getUsername()); + return toAjax(classesService.updateClasses(classes)); } /** - * 删除部门 + * 删除班级 */ - @PreAuthorize("@ss.hasPermi('system:dept:remove')") - @Log(title = "部门管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{deptId}") - public AjaxResult remove(@PathVariable Long deptId) + @PreAuthorize("@ss.hasPermi('system:classes:remove')") + @Log(title = "班级管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{classesId}") + public AjaxResult remove(@PathVariable Long classesId) { - if (deptService.hasChildByDeptId(deptId)) + if (classesService.hasChildByClassesId(classesId)) { - return AjaxResult.error("存在下级部门,不允许删除"); + return AjaxResult.error("存在下级班级,不允许删除"); } - if (deptService.checkDeptExistUser(deptId)) + if (classesService.checkClassesExistUser(classesId)) { - return AjaxResult.error("部门存在用户,不允许删除"); + return AjaxResult.error("班级存在用户,不允许删除"); } - return toAjax(deptService.deleteDeptById(deptId)); + return toAjax(classesService.deleteClassesById(classesId)); } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 2cc1a4c..d52955e 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -9,6 +9,7 @@ spring: url: jdbc:mysql://182.254.197.139:3306/ry_communication?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: wxnmytkj + # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java index 176878e..91c1586 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java @@ -17,9 +17,9 @@ import java.lang.annotation.Target; public @interface DataScope { /** - * 部门表的别名 + * 班级表的别名 */ - public String deptAlias() default ""; + public String classesAlias() default ""; /** * 用户表的别名 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java index 4ed6009..4094714 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java @@ -24,10 +24,10 @@ public class UserConstants /** 角色封禁状态 */ public static final String ROLE_DISABLE = "1"; - /** 部门正常状态 */ + /** 班级正常状态 */ public static final String DEPT_NORMAL = "0"; - /** 部门停用状态 */ + /** 班级停用状态 */ public static final String DEPT_DISABLE = "1"; /** 字典正常状态 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index 9b3d9c7..fbabb4f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -168,11 +168,11 @@ public class BaseController } /** - * 获取登录部门id + * 获取登录班级id */ - public Long getDeptId() + public Long getClassesId() { - return getLoginUser().getDeptId(); + return getLoginUser().getClassesId(); } /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java index a180a18..433e216 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java @@ -24,7 +24,7 @@ public class TreeEntity extends BaseEntity /** 祖级列表 */ private String ancestors; - /** 子部门 */ + /** 子班级 */ private List children = new ArrayList<>(); public String getParentName() diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java index bd835db..0839d29 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysClasses; import com.ruoyi.common.core.domain.entity.SysMenu; /** @@ -31,11 +31,11 @@ public class TreeSelect implements Serializable } - public TreeSelect(SysDept dept) + public TreeSelect(SysClasses classes) { - this.id = dept.getDeptId(); - this.label = dept.getDeptName(); - this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); + this.id = classes.getClassesId(); + this.label = classes.getClassesName(); + this.children = classes.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } public TreeSelect(SysMenu menu) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysClasses.java similarity index 78% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysClasses.java index c9238e2..e02122c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysClasses.java @@ -10,25 +10,25 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.domain.BaseEntity; /** - * 部门表 sys_dept + * 班级表 sys_classes * * @author ruoyi */ -public class SysDept extends BaseEntity +public class SysClasses extends BaseEntity { private static final long serialVersionUID = 1L; - /** 部门ID */ - private Long deptId; + /** 班级ID */ + private Long classesId; - /** 父部门ID */ + /** 父班级ID */ private Long parentId; /** 祖级列表 */ private String ancestors; - /** 部门名称 */ - private String deptName; + /** 班级名称 */ + private String classesName; /** 显示顺序 */ private String orderNum; @@ -42,26 +42,26 @@ public class SysDept extends BaseEntity /** 邮箱 */ private String email; - /** 部门状态:0正常,1停用 */ + /** 班级状态:0正常,1停用 */ private String status; /** 删除标志（0代表存在 2代表删除） */ private String delFlag; - /** 父部门名称 */ + /** 父班级名称 */ private String parentName; - /** 子部门 */ - private List children = new ArrayList(); + /** 子班级 */ + private List children = new ArrayList(); - public Long getDeptId() + public Long getClassesId() { - return deptId; + return classesId; } - public void setDeptId(Long deptId) + public void setClassesId(Long classesId) { - this.deptId = deptId; + this.classesId = classesId; } public Long getParentId() @@ -84,16 +84,16 @@ public class SysDept extends BaseEntity this.ancestors = ancestors; } - @NotBlank(message = "部门名称不能为空") - @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") - public String getDeptName() + @NotBlank(message = "班级名称不能为空") + @Size(min = 0, max = 30, message = "班级名称长度不能超过30个字符") + public String getClassesName() { - return deptName; + return classesName; } - public void setDeptName(String deptName) + public void setClassesName(String classesName) { - this.deptName = deptName; + this.classesName = classesName; } @NotBlank(message = "显示顺序不能为空") @@ -170,12 +170,12 @@ public class SysDept extends BaseEntity this.parentName = parentName; } - public List getChildren() + public List getChildren() { return children; } - public void setChildren(List children) + public void setChildren(List children) { this.children = children; } @@ -183,10 +183,10 @@ public class SysDept extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("deptId", getDeptId()) + .append("classesId", getClassesId()) .append("parentId", getParentId()) .append("ancestors", getAncestors()) - .append("deptName", getDeptName()) + .append("classesName", getClassesName()) .append("orderNum", getOrderNum()) .append("leader", getLeader()) .append("phone", getPhone()) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 36629eb..153241e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -33,15 +33,15 @@ public class SysRole extends BaseEntity @Excel(name = "角色排序") private String roleSort; - /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */ - @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限") + /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本班级数据权限；4：本班级及以下数据权限；5：仅本人数据权限） */ + @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本班级数据权限,4=本班级及以下数据权限,5=仅本人数据权限") private String dataScope; /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */ private boolean menuCheckStrictly; - /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */ - private boolean deptCheckStrictly; + /** 班级树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */ + private boolean classesCheckStrictly; /** 角色状态（0正常 1停用） */ @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用") @@ -56,8 +56,8 @@ public class SysRole extends BaseEntity /** 菜单组 */ private Long[] menuIds; - /** 部门组（数据权限） */ - private Long[] deptIds; + /** 班级组（数据权限） */ + private Long[] classesIds; public SysRole() { @@ -144,14 +144,14 @@ public class SysRole extends BaseEntity this.menuCheckStrictly = menuCheckStrictly; } - public boolean isDeptCheckStrictly() + public boolean isClassesCheckStrictly() { - return deptCheckStrictly; + return classesCheckStrictly; } - public void setDeptCheckStrictly(boolean deptCheckStrictly) + public void setClassesCheckStrictly(boolean classesCheckStrictly) { - this.deptCheckStrictly = deptCheckStrictly; + this.classesCheckStrictly = classesCheckStrictly; } public String getStatus() @@ -194,14 +194,14 @@ public class SysRole extends BaseEntity this.menuIds = menuIds; } - public Long[] getDeptIds() + public Long[] getClassesIds() { - return deptIds; + return classesIds; } - public void setDeptIds(Long[] deptIds) + public void setClassesIds(Long[] classesIds) { - this.deptIds = deptIds; + this.classesIds = classesIds; } @Override @@ -213,7 +213,7 @@ public class SysRole extends BaseEntity .append("roleSort", getRoleSort()) .append("dataScope", getDataScope()) .append("menuCheckStrictly", isMenuCheckStrictly()) - .append("deptCheckStrictly", isDeptCheckStrictly()) + .append("classesCheckStrictly", isClassesCheckStrictly()) .append("status", getStatus()) .append("delFlag", getDelFlag()) .append("createBy", getCreateBy()) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index f6968c0..e08d61a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -28,9 +28,9 @@ public class SysUser extends BaseEntity @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") private Long userId; - /** 部门ID */ - @Excel(name = "部门编号", type = Type.IMPORT) - private Long deptId; + /** 班级ID */ + @Excel(name = "班级编号", type = Type.IMPORT) + private Long classesId; /** 用户账号 */ @Excel(name = "登录名称") @@ -76,12 +76,12 @@ public class SysUser extends BaseEntity @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; - /** 部门对象 */ + /** 班级对象 */ @Excels({ - @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), - @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) + @Excel(name = "班级名称", targetAttr = "classesName", type = Type.EXPORT), + @Excel(name = "班级负责人", targetAttr = "leader", type = Type.EXPORT) }) - private SysDept dept; + private SysClasses classes; /** 角色对象 */ private List roles; @@ -125,14 +125,14 @@ public class SysUser extends BaseEntity return userId != null && 1L == userId; } - public Long getDeptId() + public Long getClassesId() { - return deptId; + return classesId; } - public void setDeptId(Long deptId) + public void setClassesId(Long classesId) { - this.deptId = deptId; + this.classesId = classesId; } @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") @@ -263,14 +263,14 @@ public class SysUser extends BaseEntity this.loginDate = loginDate; } - public SysDept getDept() + public SysClasses getClasses() { - return dept; + return classes; } - public void setDept(SysDept dept) + public void setClasses(SysClasses classes) { - this.dept = dept; + this.classes = classes; } public List getRoles() @@ -317,7 +317,7 @@ public class SysUser extends BaseEntity public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("userId", getUserId()) - .append("deptId", getDeptId()) + .append("classesId", getClassesId()) .append("userName", getUserName()) .append("nickName", getNickName()) .append("email", getEmail()) @@ -335,7 +335,7 @@ public class SysUser extends BaseEntity .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) - .append("dept", getDept()) + .append("classes", getClasses()) .toString(); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java index a8a0d0f..f92ff66 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -22,9 +22,9 @@ public class LoginUser implements UserDetails private Long userId; /** - * 部门ID + * 班级ID */ - private Long deptId; + private Long classesId; /** * 用户唯一标识 @@ -81,14 +81,14 @@ public class LoginUser implements UserDetails this.userId = userId; } - public Long getDeptId() + public Long getClassesId() { - return deptId; + return classesId; } - public void setDeptId(Long deptId) + public void setClassesId(Long classesId) { - this.deptId = deptId; + this.classesId = classesId; } public String getToken() @@ -111,10 +111,10 @@ public class LoginUser implements UserDetails this.permissions = permissions; } - public LoginUser(Long userId, Long deptId, SysUser user, Set permissions) + public LoginUser(Long userId, Long classesId, SysUser user, Set permissions) { this.userId = userId; - this.deptId = deptId; + this.classesId = classesId; this.user = user; this.permissions = permissions; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java index a6f3d53..c234b6f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java @@ -30,17 +30,17 @@ public class SecurityUtils } /** - * 获取部门ID + * 获取班级ID **/ - public static Long getDeptId() + public static Long getClassesId() { try { - return getLoginUser().getDeptId(); + return getLoginUser().getClassesId(); } catch (Exception e) { - throw new ServiceException("获取部门ID异常", HttpStatus.UNAUTHORIZED); + throw new ServiceException("获取班级ID异常", HttpStatus.UNAUTHORIZED); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index 48f8d72..163e1d9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -32,12 +32,12 @@ public class DataScopeAspect public static final String DATA_SCOPE_CUSTOM = "2"; /** - * 部门数据权限 + * 班级数据权限 */ public static final String DATA_SCOPE_DEPT = "3"; /** - * 部门及以下数据权限 + * 班级及以下数据权限 */ public static final String DATA_SCOPE_DEPT_AND_CHILD = "4"; @@ -68,7 +68,7 @@ public class DataScopeAspect // 如果是超级管理员，则不过滤数据 if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) { - dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), + dataScopeFilter(joinPoint, currentUser, controllerDataScope.classesAlias(), controllerDataScope.userAlias()); } } @@ -81,7 +81,7 @@ public class DataScopeAspect * @param user 用户 * @param userAlias 别名 */ - public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) + public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String classesAlias, String userAlias) { StringBuilder sqlString = new StringBuilder(); @@ -96,18 +96,18 @@ public class DataScopeAspect else if (DATA_SCOPE_CUSTOM.equals(dataScope)) { sqlString.append(StringUtils.format( - " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, + " OR {}.classes_id IN ( SELECT classes_id FROM sys_role_classes WHERE role_id = {} ) ", classesAlias, role.getRoleId())); } else if (DATA_SCOPE_DEPT.equals(dataScope)) { - sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId())); + sqlString.append(StringUtils.format(" OR {}.classes_id = {} ", classesAlias, user.getClassesId())); } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) { sqlString.append(StringUtils.format( - " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", - deptAlias, user.getDeptId(), user.getDeptId())); + " OR {}.classes_id IN ( SELECT classes_id FROM sys_classes WHERE classes_id = {} or find_in_set( {} , ancestors ) )", + classesAlias, user.getClassesId(), user.getClassesId())); } else if (DATA_SCOPE_SELF.equals(dataScope)) { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java index c8b1c7b..7c85999 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -55,6 +55,6 @@ public class UserDetailsServiceImpl implements UserDetailsService public UserDetails createLoginUser(SysUser user) { - return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); + return new LoginUser(user.getUserId(), user.getClassesId(), user, permissionService.getMenuPermission(user)); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index 175ee03..1570432 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -46,9 +46,9 @@ public class SysOperLog extends BaseEntity @Excel(name = "操作人员") private String operName; - /** 部门名称 */ - @Excel(name = "部门名称") - private String deptName; + /** 班级名称 */ + @Excel(name = "班级名称") + private String classesName; /** 请求url */ @Excel(name = "请求地址") @@ -163,14 +163,14 @@ public class SysOperLog extends BaseEntity this.operName = operName; } - public String getDeptName() + public String getClassesName() { - return deptName; + return classesName; } - public void setDeptName(String deptName) + public void setClassesName(String classesName) { - this.deptName = deptName; + this.classesName = classesName; } public String getOperUrl() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleClasses.java similarity index 66% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleClasses.java index 47b21bf..acc31d9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleClasses.java @@ -4,17 +4,17 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; /** - * 角色和部门关联 sys_role_dept + * 角色和班级关联 sys_role_classes * * @author ruoyi */ -public class SysRoleDept +public class SysRoleClasses { /** 角色ID */ private Long roleId; - /** 部门ID */ - private Long deptId; + /** 班级ID */ + private Long classesId; public Long getRoleId() { @@ -26,21 +26,21 @@ public class SysRoleDept this.roleId = roleId; } - public Long getDeptId() + public Long getClassesId() { - return deptId; + return classesId; } - public void setDeptId(Long deptId) + public void setClassesId(Long classesId) { - this.deptId = deptId; + this.classesId = classesId; } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("roleId", getRoleId()) - .append("deptId", getDeptId()) + .append("classesId", getClassesId()) .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java index 2bbd318..0a24b35 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java @@ -10,8 +10,8 @@ public class SysUserOnline /** 会话编号 */ private String tokenId; - /** 部门名称 */ - private String deptName; + /** 班级名称 */ + private String classesName; /** 用户名称 */ private String userName; @@ -41,14 +41,14 @@ public class SysUserOnline this.tokenId = tokenId; } - public String getDeptName() + public String getClassesName() { - return deptName; + return classesName; } - public void setDeptName(String deptName) + public void setClassesName(String classesName) { - this.deptName = deptName; + this.classesName = classesName; } public String getUserName() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysClassesMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysClassesMapper.java new file mode 100644 index 0000000..1f8ce8f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysClassesMapper.java @@ -0,0 +1,118 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.common.core.domain.entity.SysClasses; + +/** + * 班级管理 数据层 + * + * @author ruoyi + */ +public interface SysClassesMapper +{ + /** + * 查询班级管理数据 + * + * @param classes 班级信息 + * @return 班级信息集合 + */ + public List selectClassesList(SysClasses classes); + + /** + * 根据角色ID查询班级树信息 + * + * @param roleId 角色ID + * @param classesCheckStrictly 班级树选择项是否关联显示 + * @return 选中班级列表 + */ + public List selectClassesListByRoleId(@Param("roleId") Long roleId, @Param("classesCheckStrictly") boolean classesCheckStrictly); + + /** + * 根据班级ID查询信息 + * + * @param classesId 班级ID + * @return 班级信息 + */ + public SysClasses selectClassesById(Long classesId); + + /** + * 根据ID查询所有子班级 + * + * @param classesId 班级ID + * @return 班级列表 + */ + public List selectChildrenClassesById(Long classesId); + + /** + * 根据ID查询所有子班级（正常状态） + * + * @param classesId 班级ID + * @return 子班级数 + */ + public int selectNormalChildrenClassesById(Long classesId); + + /** + * 是否存在子节点 + * + * @param classesId 班级ID + * @return 结果 + */ + public int hasChildByClassesId(Long classesId); + + /** + * 查询班级是否存在用户 + * + * @param classesId 班级ID + * @return 结果 + */ + public int checkClassesExistUser(Long classesId); + + /** + * 校验班级名称是否唯一 + * + * @param classesName 班级名称 + * @param parentId 父班级ID + * @return 结果 + */ + public SysClasses checkClassesNameUnique(@Param("classesName") String classesName, @Param("parentId") Long parentId); + + /** + * 新增班级信息 + * + * @param classes 班级信息 + * @return 结果 + */ + public int insertClasses(SysClasses classes); + + /** + * 修改班级信息 + * + * @param classes 班级信息 + * @return 结果 + */ + public int updateClasses(SysClasses classes); + + /** + * 修改所在班级正常状态 + * + * @param classesIds 班级ID组 + */ + public void updateClassesStatusNormal(Long[] classesIds); + + /** + * 修改子元素关系 + * + * @param classess 子元素 + * @return 结果 + */ + public int updateClassesChildren(@Param("classess") List classess); + + /** + * 删除班级管理信息 + * + * @param classesId 班级ID + * @return 结果 + */ + public int deleteClassesById(Long classesId); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java deleted file mode 100644 index 415599c..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDept; - -/** - * 部门管理 数据层 - * - * @author ruoyi - */ -public interface SysDeptMapper -{ - /** - * 查询部门管理数据 - * - * @param dept 部门信息 - * @return 部门信息集合 - */ - public List selectDeptList(SysDept dept); - - /** - * 根据角色ID查询部门树信息 - * - * @param roleId 角色ID - * @param deptCheckStrictly 部门树选择项是否关联显示 - * @return 选中部门列表 - */ - public List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); - - /** - * 根据部门ID查询信息 - * - * @param deptId 部门ID - * @return 部门信息 - */ - public SysDept selectDeptById(Long deptId); - - /** - * 根据ID查询所有子部门 - * - * @param deptId 部门ID - * @return 部门列表 - */ - public List selectChildrenDeptById(Long deptId); - - /** - * 根据ID查询所有子部门（正常状态） - * - * @param deptId 部门ID - * @return 子部门数 - */ - public int selectNormalChildrenDeptById(Long deptId); - - /** - * 是否存在子节点 - * - * @param deptId 部门ID - * @return 结果 - */ - public int hasChildByDeptId(Long deptId); - - /** - * 查询部门是否存在用户 - * - * @param deptId 部门ID - * @return 结果 - */ - public int checkDeptExistUser(Long deptId); - - /** - * 校验部门名称是否唯一 - * - * @param deptName 部门名称 - * @param parentId 父部门ID - * @return 结果 - */ - public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); - - /** - * 新增部门信息 - * - * @param dept 部门信息 - * @return 结果 - */ - public int insertDept(SysDept dept); - - /** - * 修改部门信息 - * - * @param dept 部门信息 - * @return 结果 - */ - public int updateDept(SysDept dept); - - /** - * 修改所在部门正常状态 - * - * @param deptIds 部门ID组 - */ - public void updateDeptStatusNormal(Long[] deptIds); - - /** - * 修改子元素关系 - * - * @param depts 子元素 - * @return 结果 - */ - public int updateDeptChildren(@Param("depts") List depts); - - /** - * 删除部门管理信息 - * - * @param deptId 部门ID - * @return 结果 - */ - public int deleteDeptById(Long deptId); -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleClassesMapper.java similarity index 36% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleClassesMapper.java index f9d3a2f..3f3e86e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleClassesMapper.java @@ -1,44 +1,44 @@ package com.ruoyi.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleDept; +import com.ruoyi.system.domain.SysRoleClasses; /** - * 角色与部门关联表 数据层 + * 角色与班级关联表 数据层 * * @author ruoyi */ -public interface SysRoleDeptMapper +public interface SysRoleClassesMapper { /** - * 通过角色ID删除角色和部门关联 + * 通过角色ID删除角色和班级关联 * * @param roleId 角色ID * @return 结果 */ - public int deleteRoleDeptByRoleId(Long roleId); + public int deleteRoleClassesByRoleId(Long roleId); /** - * 批量删除角色部门关联信息 + * 批量删除角色班级关联信息 * * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteRoleDept(Long[] ids); + public int deleteRoleClasses(Long[] ids); /** - * 查询部门使用数量 + * 查询班级使用数量 * - * @param deptId 部门ID + * @param classesId 班级ID * @return 结果 */ - public int selectCountRoleDeptByDeptId(Long deptId); + public int selectCountRoleClassesByClassesId(Long classesId); /** - * 批量新增角色部门信息 + * 批量新增角色班级信息 * - * @param roleDeptList 角色部门列表 + * @param roleClassesList 角色班级列表 * @return 结果 */ - public int batchRoleDept(List roleDeptList); + public int batchRoleClasses(List roleClassesList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysClassesService.java similarity index 30% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/ISysClassesService.java index 1bdd472..7219e1b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysClassesService.java @@ -2,115 +2,115 @@ package com.ruoyi.system.service; import java.util.List; import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysClasses; /** - * 部门管理 服务层 + * 班级管理 服务层 * * @author ruoyi */ -public interface ISysDeptService +public interface ISysClassesService { /** - * 查询部门管理数据 + * 查询班级管理数据 * - * @param dept 部门信息 - * @return 部门信息集合 + * @param classes 班级信息 + * @return 班级信息集合 */ - public List selectDeptList(SysDept dept); + public List selectClassesList(SysClasses classes); /** * 构建前端所需要树结构 * - * @param depts 部门列表 + * @param classess 班级列表 * @return 树结构列表 */ - public List buildDeptTree(List depts); + public List buildClassesTree(List classess); /** * 构建前端所需要下拉树结构 * - * @param depts 部门列表 + * @param classess 班级列表 * @return 下拉树结构列表 */ - public List buildDeptTreeSelect(List depts); + public List buildClassesTreeSelect(List classess); /** - * 根据角色ID查询部门树信息 + * 根据角色ID查询班级树信息 * * @param roleId 角色ID - * @return 选中部门列表 + * @return 选中班级列表 */ - public List selectDeptListByRoleId(Long roleId); + public List selectClassesListByRoleId(Long roleId); /** - * 根据部门ID查询信息 + * 根据班级ID查询信息 * - * @param deptId 部门ID - * @return 部门信息 + * @param classesId 班级ID + * @return 班级信息 */ - public SysDept selectDeptById(Long deptId); + public SysClasses selectClassesById(Long classesId); /** - * 根据ID查询所有子部门（正常状态） + * 根据ID查询所有子班级（正常状态） * - * @param deptId 部门ID - * @return 子部门数 + * @param classesId 班级ID + * @return 子班级数 */ - public int selectNormalChildrenDeptById(Long deptId); + public int selectNormalChildrenClassesById(Long classesId); /** - * 是否存在部门子节点 + * 是否存在班级子节点 * - * @param deptId 部门ID + * @param classesId 班级ID * @return 结果 */ - public boolean hasChildByDeptId(Long deptId); + public boolean hasChildByClassesId(Long classesId); /** - * 查询部门是否存在用户 + * 查询班级是否存在用户 * - * @param deptId 部门ID + * @param classesId 班级ID * @return 结果 true 存在 false 不存在 */ - public boolean checkDeptExistUser(Long deptId); + public boolean checkClassesExistUser(Long classesId); /** - * 校验部门名称是否唯一 + * 校验班级名称是否唯一 * - * @param dept 部门信息 + * @param classes 班级信息 * @return 结果 */ - public String checkDeptNameUnique(SysDept dept); + public String checkClassesNameUnique(SysClasses classes); /** - * 校验部门是否有数据权限 + * 校验班级是否有数据权限 * - * @param deptId 部门id + * @param classesId 班级id */ - public void checkDeptDataScope(Long deptId); + public void checkClassesDataScope(Long classesId); /** - * 新增保存部门信息 + * 新增保存班级信息 * - * @param dept 部门信息 + * @param classes 班级信息 * @return 结果 */ - public int insertDept(SysDept dept); + public int insertClasses(SysClasses classes); /** - * 修改保存部门信息 + * 修改保存班级信息 * - * @param dept 部门信息 + * @param classes 班级信息 * @return 结果 */ - public int updateDept(SysDept dept); + public int updateClasses(SysClasses classes); /** - * 删除部门管理信息 + * 删除班级管理信息 * - * @param deptId 部门ID + * @param classesId 班级ID * @return 结果 */ - public int deleteDeptById(Long deptId); + public int deleteClassesById(Long classesId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysClassesServiceImpl.java similarity index 37% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysClassesServiceImpl.java index 46f75a3..c852956 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysClassesServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysClasses; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.text.Convert; @@ -17,65 +17,65 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.mapper.SysDeptMapper; +import com.ruoyi.system.mapper.SysClassesMapper; import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.ISysClassesService; /** - * 部门管理 服务实现 + * 班级管理 服务实现 * * @author ruoyi */ @Service -public class SysDeptServiceImpl implements ISysDeptService +public class SysClassesServiceImpl implements ISysClassesService { @Autowired - private SysDeptMapper deptMapper; + private SysClassesMapper classesMapper; @Autowired private SysRoleMapper roleMapper; /** - * 查询部门管理数据 + * 查询班级管理数据 * - * @param dept 部门信息 - * @return 部门信息集合 + * @param classes 班级信息 + * @return 班级信息集合 */ @Override - @DataScope(deptAlias = "d") - public List selectDeptList(SysDept dept) + @DataScope(classesAlias = "d") + public List selectClassesList(SysClasses classes) { - return deptMapper.selectDeptList(dept); + return classesMapper.selectClassesList(classes); } /** * 构建前端所需要树结构 * - * @param depts 部门列表 + * @param classess 班级列表 * @return 树结构列表 */ @Override - public List buildDeptTree(List depts) + public List buildClassesTree(List classess) { - List returnList = new ArrayList(); + List returnList = new ArrayList(); List tempList = new ArrayList(); - for (SysDept dept : depts) + for (SysClasses classes : classess) { - tempList.add(dept.getDeptId()); + tempList.add(classes.getClassesId()); } - for (Iterator iterator = depts.iterator(); iterator.hasNext();) + for (Iterator iterator = classess.iterator(); iterator.hasNext();) { - SysDept dept = (SysDept) iterator.next(); + SysClasses classes = (SysClasses) iterator.next(); // 如果是顶级节点, 遍历该父节点的所有子节点 - if (!tempList.contains(dept.getParentId())) + if (!tempList.contains(classes.getParentId())) { - recursionFn(depts, dept); - returnList.add(dept); + recursionFn(classess, classes); + returnList.add(classes); } } if (returnList.isEmpty()) { - returnList = depts; + returnList = classess; } return returnList; } @@ -83,91 +83,91 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 构建前端所需要下拉树结构 * - * @param depts 部门列表 + * @param classess 班级列表 * @return 下拉树结构列表 */ @Override - public List buildDeptTreeSelect(List depts) + public List buildClassesTreeSelect(List classess) { - List deptTrees = buildDeptTree(depts); - return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); + List classesTrees = buildClassesTree(classess); + return classesTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); } /** - * 根据角色ID查询部门树信息 + * 根据角色ID查询班级树信息 * * @param roleId 角色ID - * @return 选中部门列表 + * @return 选中班级列表 */ @Override - public List selectDeptListByRoleId(Long roleId) + public List selectClassesListByRoleId(Long roleId) { SysRole role = roleMapper.selectRoleById(roleId); - return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); + return classesMapper.selectClassesListByRoleId(roleId, role.isClassesCheckStrictly()); } /** - * 根据部门ID查询信息 + * 根据班级ID查询信息 * - * @param deptId 部门ID - * @return 部门信息 + * @param classesId 班级ID + * @return 班级信息 */ @Override - public SysDept selectDeptById(Long deptId) + public SysClasses selectClassesById(Long classesId) { - return deptMapper.selectDeptById(deptId); + return classesMapper.selectClassesById(classesId); } /** - * 根据ID查询所有子部门（正常状态） + * 根据ID查询所有子班级（正常状态） * - * @param deptId 部门ID - * @return 子部门数 + * @param classesId 班级ID + * @return 子班级数 */ @Override - public int selectNormalChildrenDeptById(Long deptId) + public int selectNormalChildrenClassesById(Long classesId) { - return deptMapper.selectNormalChildrenDeptById(deptId); + return classesMapper.selectNormalChildrenClassesById(classesId); } /** * 是否存在子节点 * - * @param deptId 部门ID + * @param classesId 班级ID * @return 结果 */ @Override - public boolean hasChildByDeptId(Long deptId) + public boolean hasChildByClassesId(Long classesId) { - int result = deptMapper.hasChildByDeptId(deptId); + int result = classesMapper.hasChildByClassesId(classesId); return result > 0 ? true : false; } /** - * 查询部门是否存在用户 + * 查询班级是否存在用户 * - * @param deptId 部门ID + * @param classesId 班级ID * @return 结果 true 存在 false 不存在 */ @Override - public boolean checkDeptExistUser(Long deptId) + public boolean checkClassesExistUser(Long classesId) { - int result = deptMapper.checkDeptExistUser(deptId); + int result = classesMapper.checkClassesExistUser(classesId); return result > 0 ? true : false; } /** - * 校验部门名称是否唯一 + * 校验班级名称是否唯一 * - * @param dept 部门信息 + * @param classes 班级信息 * @return 结果 */ @Override - public String checkDeptNameUnique(SysDept dept) + public String checkClassesNameUnique(SysClasses classes) { - Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId(); - SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId()); - if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) + Long classesId = StringUtils.isNull(classes.getClassesId()) ? -1L : classes.getClassesId(); + SysClasses info = classesMapper.checkClassesNameUnique(classes.getClassesName(), classes.getParentId()); + if (StringUtils.isNotNull(info) && info.getClassesId().longValue() != classesId.longValue()) { return UserConstants.NOT_UNIQUE; } @@ -175,125 +175,125 @@ public class SysDeptServiceImpl implements ISysDeptService } /** - * 校验部门是否有数据权限 + * 校验班级是否有数据权限 * - * @param deptId 部门id + * @param classesId 班级id */ @Override - public void checkDeptDataScope(Long deptId) + public void checkClassesDataScope(Long classesId) { if (!SysUser.isAdmin(SecurityUtils.getUserId())) { - SysDept dept = new SysDept(); - dept.setDeptId(deptId); - List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); - if (StringUtils.isEmpty(depts)) + SysClasses classes = new SysClasses(); + classes.setClassesId(classesId); + List classess = SpringUtils.getAopProxy(this).selectClassesList(classes); + if (StringUtils.isEmpty(classess)) { - throw new ServiceException("没有权限访问部门数据！"); + throw new ServiceException("没有权限访问班级数据！"); } } } /** - * 新增保存部门信息 + * 新增保存班级信息 * - * @param dept 部门信息 + * @param classes 班级信息 * @return 结果 */ @Override - public int insertDept(SysDept dept) + public int insertClasses(SysClasses classes) { - SysDept info = deptMapper.selectDeptById(dept.getParentId()); + SysClasses info = classesMapper.selectClassesById(classes.getParentId()); // 如果父节点不为正常状态,则不允许新增子节点 if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) { - throw new ServiceException("部门停用，不允许新增"); + throw new ServiceException("班级停用，不允许新增"); } - dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); - return deptMapper.insertDept(dept); + classes.setAncestors(info.getAncestors() + "," + classes.getParentId()); + return classesMapper.insertClasses(classes); } /** - * 修改保存部门信息 + * 修改保存班级信息 * - * @param dept 部门信息 + * @param classes 班级信息 * @return 结果 */ @Override - public int updateDept(SysDept dept) + public int updateClasses(SysClasses classes) { - SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId()); - SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId()); - if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) + SysClasses newParentClasses = classesMapper.selectClassesById(classes.getParentId()); + SysClasses oldClasses = classesMapper.selectClassesById(classes.getClassesId()); + if (StringUtils.isNotNull(newParentClasses) && StringUtils.isNotNull(oldClasses)) { - String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId(); - String oldAncestors = oldDept.getAncestors(); - dept.setAncestors(newAncestors); - updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); + String newAncestors = newParentClasses.getAncestors() + "," + newParentClasses.getClassesId(); + String oldAncestors = oldClasses.getAncestors(); + classes.setAncestors(newAncestors); + updateClassesChildren(classes.getClassesId(), newAncestors, oldAncestors); } - int result = deptMapper.updateDept(dept); - if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors()) - && !StringUtils.equals("0", dept.getAncestors())) + int result = classesMapper.updateClasses(classes); + if (UserConstants.DEPT_NORMAL.equals(classes.getStatus()) && StringUtils.isNotEmpty(classes.getAncestors()) + && !StringUtils.equals("0", classes.getAncestors())) { - // 如果该部门是启用状态，则启用该部门的所有上级部门 - updateParentDeptStatusNormal(dept); + // 如果该班级是启用状态，则启用该班级的所有上级班级 + updateParentClassesStatusNormal(classes); } return result; } /** - * 修改该部门的父级部门状态 + * 修改该班级的父级班级状态 * - * @param dept 当前部门 + * @param classes 当前班级 */ - private void updateParentDeptStatusNormal(SysDept dept) + private void updateParentClassesStatusNormal(SysClasses classes) { - String ancestors = dept.getAncestors(); - Long[] deptIds = Convert.toLongArray(ancestors); - deptMapper.updateDeptStatusNormal(deptIds); + String ancestors = classes.getAncestors(); + Long[] classesIds = Convert.toLongArray(ancestors); + classesMapper.updateClassesStatusNormal(classesIds); } /** * 修改子元素关系 * - * @param deptId 被修改的部门ID + * @param classesId 被修改的班级ID * @param newAncestors 新的父ID集合 * @param oldAncestors 旧的父ID集合 */ - public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) + public void updateClassesChildren(Long classesId, String newAncestors, String oldAncestors) { - List children = deptMapper.selectChildrenDeptById(deptId); - for (SysDept child : children) + List children = classesMapper.selectChildrenClassesById(classesId); + for (SysClasses child : children) { child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); } if (children.size() > 0) { - deptMapper.updateDeptChildren(children); + classesMapper.updateClassesChildren(children); } } /** - * 删除部门管理信息 + * 删除班级管理信息 * - * @param deptId 部门ID + * @param classesId 班级ID * @return 结果 */ @Override - public int deleteDeptById(Long deptId) + public int deleteClassesById(Long classesId) { - return deptMapper.deleteDeptById(deptId); + return classesMapper.deleteClassesById(classesId); } /** * 递归列表 */ - private void recursionFn(List list, SysDept t) + private void recursionFn(List list, SysClasses t) { // 得到子节点列表 - List childList = getChildList(list, t); + List childList = getChildList(list, t); t.setChildren(childList); - for (SysDept tChild : childList) + for (SysClasses tChild : childList) { if (hasChild(list, tChild)) { @@ -305,14 +305,14 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 得到子节点列表 */ - private List getChildList(List list, SysDept t) + private List getChildList(List list, SysClasses t) { - List tlist = new ArrayList(); - Iterator it = list.iterator(); + List tlist = new ArrayList(); + Iterator it = list.iterator(); while (it.hasNext()) { - SysDept n = (SysDept) it.next(); - if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) + SysClasses n = (SysClasses) it.next(); + if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getClassesId().longValue()) { tlist.add(n); } @@ -323,7 +323,7 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 判断是否有子节点 */ - private boolean hasChild(List list, SysDept t) + private boolean hasChild(List list, SysClasses t) { return getChildList(list, t).size() > 0 ? true : false; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index f450caa..35d5469 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -202,9 +202,9 @@ public class SysMenuServiceImpl implements ISysMenuService { List returnList = new ArrayList(); List tempList = new ArrayList(); - for (SysMenu dept : menus) + for (SysMenu classes : menus) { - tempList.add(dept.getMenuId()); + tempList.add(classes.getMenuId()); } for (Iterator iterator = menus.iterator(); iterator.hasNext();) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 4c5bbd7..77bcff6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -16,10 +16,10 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysRoleDept; +import com.ruoyi.system.domain.SysRoleClasses; import com.ruoyi.system.domain.SysRoleMenu; import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysRoleDeptMapper; +import com.ruoyi.system.mapper.SysRoleClassesMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper; import com.ruoyi.system.mapper.SysUserRoleMapper; @@ -43,7 +43,7 @@ public class SysRoleServiceImpl implements ISysRoleService private SysUserRoleMapper userRoleMapper; @Autowired - private SysRoleDeptMapper roleDeptMapper; + private SysRoleClassesMapper roleClassesMapper; /** * 根据条件分页查询角色数据 @@ -52,7 +52,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @return 角色数据集合信息 */ @Override - @DataScope(deptAlias = "d") + @DataScope(classesAlias = "d") public List selectRoleList(SysRole role) { return roleMapper.selectRoleList(role); @@ -277,10 +277,10 @@ public class SysRoleServiceImpl implements ISysRoleService { // 修改角色信息 roleMapper.updateRole(role); - // 删除角色与部门关联 - roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId()); - // 新增角色和部门信息（数据权限） - return insertRoleDept(role); + // 删除角色与班级关联 + roleClassesMapper.deleteRoleClassesByRoleId(role.getRoleId()); + // 新增角色和班级信息（数据权限） + return insertRoleClasses(role); } /** @@ -308,25 +308,25 @@ public class SysRoleServiceImpl implements ISysRoleService } /** - * 新增角色部门信息(数据权限) + * 新增角色班级信息(数据权限) * * @param role 角色对象 */ - public int insertRoleDept(SysRole role) + public int insertRoleClasses(SysRole role) { int rows = 1; - // 新增角色与部门（数据权限）管理 - List list = new ArrayList(); - for (Long deptId : role.getDeptIds()) + // 新增角色与班级（数据权限）管理 + List list = new ArrayList(); + for (Long classesId : role.getClassesIds()) { - SysRoleDept rd = new SysRoleDept(); + SysRoleClasses rd = new SysRoleClasses(); rd.setRoleId(role.getRoleId()); - rd.setDeptId(deptId); + rd.setClassesId(classesId); list.add(rd); } if (list.size() > 0) { - rows = roleDeptMapper.batchRoleDept(list); + rows = roleClassesMapper.batchRoleClasses(list); } return rows; } @@ -343,8 +343,8 @@ public class SysRoleServiceImpl implements ISysRoleService { // 删除角色与菜单关联 roleMenuMapper.deleteRoleMenuByRoleId(roleId); - // 删除角色与部门关联 - roleDeptMapper.deleteRoleDeptByRoleId(roleId); + // 删除角色与班级关联 + roleClassesMapper.deleteRoleClassesByRoleId(roleId); return roleMapper.deleteRoleById(roleId); } @@ -369,8 +369,8 @@ public class SysRoleServiceImpl implements ISysRoleService } // 删除角色与菜单关联 roleMenuMapper.deleteRoleMenu(roleIds); - // 删除角色与部门关联 - roleDeptMapper.deleteRoleDept(roleIds); + // 删除角色与班级关联 + roleClassesMapper.deleteRoleClasses(roleIds); return roleMapper.deleteRoleByIds(roleIds); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java index f80a877..a7dc8f1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java @@ -87,9 +87,9 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService sysUserOnline.setBrowser(user.getBrowser()); sysUserOnline.setOs(user.getOs()); sysUserOnline.setLoginTime(user.getLoginTime()); - if (StringUtils.isNotNull(user.getUser().getDept())) + if (StringUtils.isNotNull(user.getUser().getClasses())) { - sysUserOnline.setDeptName(user.getUser().getDept().getDeptName()); + sysUserOnline.setClassesName(user.getUser().getClasses().getClassesName()); } return sysUserOnline; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 3a25fba..e20b048 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -61,7 +61,7 @@ public class SysUserServiceImpl implements ISysUserService * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") + @DataScope(classesAlias = "d", userAlias = "u") public List selectUserList(SysUser user) { return userMapper.selectUserList(user); @@ -74,7 +74,7 @@ public class SysUserServiceImpl implements ISysUserService * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") + @DataScope(classesAlias = "d", userAlias = "u") public List selectAllocatedList(SysUser user) { return userMapper.selectAllocatedList(user); @@ -87,7 +87,7 @@ public class SysUserServiceImpl implements ISysUserService * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") + @DataScope(classesAlias = "d", userAlias = "u") public List selectUnallocatedList(SysUser user) { return userMapper.selectUnallocatedList(user); diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysClassesMapper.xml similarity index 47% rename from ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to ruoyi-system/src/main/resources/mapper/system/SysClassesMapper.xml index 17dd59b..3e5450e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysClassesMapper.xml @@ -2,13 +2,13 @@ - + - - + + - + @@ -22,22 +22,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time - from sys_dept d + + select d.classes_id, d.parent_id, d.ancestors, d.classes_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + from sys_classes d - + where d.del_flag = '0' - - AND dept_id = #{deptId} + + AND classes_id = #{classesId} AND parent_id = #{parentId} - - AND dept_name like concat('%', #{deptName}, '%') + + AND classes_name like concat('%', #{classesName}, '%') AND status = #{status} @@ -47,49 +47,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by d.parent_id, d.order_num - + select d.classes_id + from sys_classes d + left join sys_role_classes rd on d.classes_id = rd.classes_id where rd.role_id = #{roleId} - - and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId}) + + and d.classes_id not in (select d.parent_id from sys_classes d inner join sys_role_classes rd on d.classes_id = rd.classes_id and rd.role_id = #{roleId}) order by d.parent_id, d.order_num - + + where classes_id = #{classesId} - + select count(1) from sys_user where classes_id = #{classesId} and del_flag = '0' - + select count(1) from sys_classes + where del_flag = '0' and parent_id = #{classesId} limit 1 - + select * from sys_classes where find_in_set(#{classesId}, ancestors) - + select count(*) from sys_classes where status = 0 and del_flag = '0' and find_in_set(#{classesId}, ancestors) - + + where classes_name=#{classesName} and parent_id = #{parentId} limit 1 - - insert into sys_dept( - dept_id, + + insert into sys_classes( + classes_id, parent_id, - dept_name, + classes_name, ancestors, order_num, leader, @@ -99,9 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by, create_time )values( - #{deptId}, + #{classesId}, #{parentId}, - #{deptName}, + #{classesName}, #{ancestors}, #{orderNum}, #{leader}, @@ -113,11 +113,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - - update sys_dept + + update sys_classes parent_id = #{parentId}, - dept_name = #{deptName}, + classes_name = #{classesName}, ancestors = #{ancestors}, order_num = #{orderNum}, leader = #{leader}, @@ -127,31 +127,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = sysdate() - where dept_id = #{deptId} + where classes_id = #{classesId} - - update sys_dept set ancestors = - - when #{item.deptId} then #{item.ancestors} + + update sys_classes set ancestors = + + when #{item.classesId} then #{item.ancestors} - where dept_id in - - #{item.deptId} + #{item.classesId} - - update sys_dept set status = '0' where dept_id in - - #{deptId} + + update sys_classes set status = '0' where classes_id in + + #{classesId} - - update sys_dept set del_flag = '2' where dept_id = #{deptId} + + update sys_classes set del_flag = '2' where classes_id = #{classesId} \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index f017ef8..8701179 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -24,13 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time + select oper_id, title, business_type, method, request_method, operator_type, oper_name, classes_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time from sys_oper_log - insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) - values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate()) + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, classes_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{classesName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate()) - select count(1) from sys_role_dept where dept_id=#{deptId} + - - delete from sys_role_dept where role_id in + + delete from sys_role_classes where role_id in #{roleId} - - insert into sys_role_dept(role_id, dept_id) values + + insert into sys_role_classes(role_id, classes_id) values - (#{item.roleId},#{item.deptId}) + (#{item.roleId},#{item.classesId}) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 7ef6c1b..d657df4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -22,12 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.classes_check_strictly, r.status, r.del_flag, r.create_time, r.remark from sys_role r left join sys_user_role ur on ur.role_id = r.role_id left join sys_user u on u.user_id = ur.user_id - left join sys_dept d on u.dept_id = d.dept_id + left join sys_classes d on u.classes_id = d.classes_id - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u - left join sys_dept d on u.dept_id = d.dept_id + select u.user_id, u.classes_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.classes_name, d.leader from sys_user u + left join sys_classes d on u.classes_id = d.classes_id where u.del_flag = '0' AND u.user_id = #{userId} @@ -77,17 +77,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') - - AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) + + AND (u.classes_id = #{classesId} OR u.classes_id IN ( SELECT t.classes_id FROM sys_classes t WHERE find_in_set(#{classesId}, ancestors) )) ${params.dataScope}