From 925219ebfda2a480df99ca06a13033c78ae8d81f Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 30 五月 2025 18:08:16 +0800
Subject: [PATCH] 权限管理+用户管理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 107 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 88 insertions(+), 19 deletions(-)
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/SysDeptController.java
index 59e7588..9db8a61 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/SysDeptController.java
@@ -1,18 +1,18 @@
package com.ruoyi.web.controller.system;
import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.system.pojo.vo.SysDeptPageVO;
+import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -37,41 +37,41 @@
/**
* 获取部门列表
*/
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ /* @PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list")
public AjaxResult list(SysDept dept)
{
List<SysDept> depts = deptService.selectDeptList(dept);
return success(depts);
- }
+ }*/
/**
* 查询部门列表（排除节点）
*/
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ /* @PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list/exclude/{deptId}")
public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
{
List<SysDept> depts = deptService.selectDeptList(new SysDept());
depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
return success(depts);
- }
+ }*/
/**
* 根据部门编号获取详细信息
*/
- @PreAuthorize("@ss.hasPermi('system:dept:query')")
+ /* @PreAuthorize("@ss.hasPermi('system:dept:query')")
@GetMapping(value = "/{deptId}")
public AjaxResult getInfo(@PathVariable Long deptId)
{
deptService.checkDeptDataScope(deptId);
return success(deptService.selectDeptById(deptId));
- }
+ }*/
/**
* 新增部门
*/
- @PreAuthorize("@ss.hasPermi('system:dept:add')")
+ /* @PreAuthorize("@ss.hasPermi('system:dept:add')")
@Log(title = "部门管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDept dept)
@@ -82,12 +82,12 @@
}
dept.setCreateBy(getUsername());
return toAjax(deptService.insertDept(dept));
- }
+ }*/
/**
* 修改部门
*/
- @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+ /*@PreAuthorize("@ss.hasPermi('system:dept:edit')")
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDept dept)
@@ -108,12 +108,12 @@
}
dept.setUpdateBy(getUsername());
return toAjax(deptService.updateDept(dept));
- }
+ }*/
/**
* 删除部门
*/
- @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+ /* @PreAuthorize("@ss.hasPermi('system:dept:remove')")
@Log(title = "部门管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
public AjaxResult remove(@PathVariable Long deptId)
@@ -128,5 +128,74 @@
}
deptService.checkDeptDataScope(deptId);
return toAjax(deptService.deleteDeptById(deptId));
+ }*/
+
+ /**
+ * 部门分页
+ */
+
+ @GetMapping("/page")
+ @PreAuthorize("@ss.hasPermi('permission:dept')")
+ @ApiOperation(value = "部门管理-分页列表", tags = "系统后台-权限管理")
+ public R<IPage<SysDeptPageVO>> page(@RequestParam(value = "pageNum",defaultValue = "0")Integer pageNum,
+ @RequestParam(value = "pageSize",defaultValue="10")Integer pageSize,
+ @RequestParam(value = "name",required = false)String name) {
+ IPage<SysDeptPageVO> iPage = new Page<>(pageNum, pageSize);
+ return R.ok(deptService.page(iPage,name));
+ }
+ /**
+ * 回显
+ */
+ @PreAuthorize("@ss.hasPermi('permission:dept')")
+ @ApiOperation(value = "部门管理-查看部门（回显）", tags = "系统后台-权限管理")
+ @GetMapping("/{deptId}")
+ public AjaxResult detail(@PathVariable("deptId") Long deptId) {
+ SysDept sysDept = deptService.selectDeptById(deptId);
+ return success(sysDept);
+ }
+
+ /**
+ * 新增
+ */
+ /**
+ * 新增部门
+ */
+ @PreAuthorize("@ss.hasPermi('permission:dept')")
+ @Log(title = "部门管理", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "部门管理-新增部门", tags = "系统后台-权限管理")
+ @GetMapping("/add")
+ public AjaxResult add(@RequestParam("name")String name) {
+ deptService.add(name);
+ return success();
+ }
+
+ /**
+ * 编辑
+ */
+ @PreAuthorize("@ss.hasPermi('permission:dept')")
+ @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "部门管理-修改部门", tags = "系统后台-权限管理")
+ @PutMapping("/edit")
+ public AjaxResult edit(@RequestParam("id")Long id,
+ @RequestParam("name")String name) {
+ //查看id是否存在
+ SysDept sysDept = deptService.selectDeptById(id);
+ if (sysDept==null){
+ throw new ServiceException("该部门未找到");
+ }
+ //修改部门名称
+ sysDept.setDeptName(name);
+ deptService.updateDeptName(sysDept);
+ return success();
+ }
+ /**
+ * 删除部门
+ */
+ @PreAuthorize("@ss.hasPermi('permission:dept')")
+ @Log(title = "部门管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "部门管理-删除部门", tags = "系统后台-权限管理")
+ @DeleteMapping("/{deptId}")
+ public AjaxResult remove(@PathVariable Long deptId) {
+ return toAjax(deptService.deleteDeptById(deptId));
}
}
--
Gitblit v1.7.1