buzhanyi 2 vuotta sitten
vanhempi
commit
5a08777fb8

+ 17 - 6
hazard-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java

@@ -2,6 +2,8 @@ package com.ozs.web.controller.system;
 
 import java.util.List;
 
+import com.ozs.common.core.domain.entity.SysRole;
+import com.ozs.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.system.service.ISysDeptService;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 部门信息
  *
@@ -31,8 +35,7 @@ import com.ozs.system.service.ISysDeptService;
  */
 @RestController
 @RequestMapping("/system/dept")
-public class SysDeptController extends BaseController
-{
+public class SysDeptController extends BaseController {
     @Autowired
     private ISysDeptService deptService;
 
@@ -130,15 +133,23 @@ public class SysDeptController extends BaseController
     @DeleteMapping("/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId)
     {
-        if (deptService.hasChildByDeptId(deptId))
-        {
+        if (deptService.hasChildByDeptId(deptId)) {
             return warn("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
-        {
+        if (deptService.checkDeptExistUser(deptId)) {
             return warn("部门存在用户,不允许删除");
         }
         deptService.checkDeptDataScope(deptId);
         return toAjax(deptService.deleteDeptById(deptId));
     }
+
+    @Log(title = "部门管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @PostMapping("/export")
+    @ApiOperation("部门管理")
+    public void export(HttpServletResponse response, SysDept dept) {
+        List<SysDept> list = deptService.selectDeptList(dept);
+        ExcelUtil<SysDept> util = new ExcelUtil<SysDept>(SysDept.class);
+        util.exportExcel(response, list, "角色数据");
+    }
 }

+ 21 - 6
hazard-admin/src/main/java/com/ozs/web/controller/system/SysMenuController.java

@@ -1,6 +1,11 @@
 package com.ozs.web.controller.system;
 
 import java.util.List;
+
+import com.ozs.common.core.domain.entity.SysDept;
+import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -21,6 +26,8 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.system.service.ISysMenuService;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 菜单信息
  *
@@ -28,8 +35,7 @@ import com.ozs.system.service.ISysMenuService;
  */
 @RestController
 @RequestMapping("/system/menu")
-public class SysMenuController extends BaseController
-{
+public class SysMenuController extends BaseController {
     @Autowired
     private ISysMenuService menuService;
 
@@ -129,14 +135,23 @@ public class SysMenuController extends BaseController
     @DeleteMapping("/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId)
     {
-        if (menuService.hasChildByMenuId(menuId))
-        {
+        if (menuService.hasChildByMenuId(menuId)) {
             return warn("存在子菜单,不允许删除");
         }
-        if (menuService.checkMenuExistRole(menuId))
-        {
+        if (menuService.checkMenuExistRole(menuId)) {
             return warn("菜单已分配,不允许删除");
         }
         return toAjax(menuService.deleteMenuById(menuId));
     }
+
+    @Log(title = "菜单管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:menu:export')")
+    @PostMapping("/export")
+    @ApiOperation("菜单管理")
+    public void export(HttpServletResponse response, SysMenu menu) {
+        LoginUser loginUser = getLoginUser();
+        List<SysMenu> list = menuService.selectMenuList(menu, loginUser.getId());
+        ExcelUtil<SysMenu> util = new ExcelUtil<SysMenu>(SysMenu.class);
+        util.exportExcel(response, list, "角色数据");
+    }
 }