巡检模块

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckCorrectionController.java

@@ -2,13 +2,11 @@ package com.sundot.airport.web.controller.check;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.CollUtil;
-import com.sundot.airport.common.core.domain.entity.SysRole;
-import com.sundot.airport.common.enums.RoleTypeEnum;
-import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.web.core.utils.DataPermissionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,25 +44,21 @@ public class CheckCorrectionController extends BaseController {
     @PreAuthorize("@ss.hasPermi('check:checkCorrection:list')")
     @GetMapping("/list")
     public TableDataInfo list(CheckCorrection checkCorrection) {
-        startPage();
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return getDataTable(Collections.emptyList());
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-
-        } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-
-        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-            checkCorrection.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
-        } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            checkCorrection.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
-        } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            return getDataTable(Collections.emptyList());
-        } else {
-            return getDataTable(Collections.emptyList());
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case BRIGADE:
+                checkCorrection.setCheckedBrigadeId(dataPermission.getValue());
+                break;
+            case DEPARTMENT:
+                checkCorrection.setCheckedDepartmentId(dataPermission.getValue());
+                break;
+            case TEAM:
+            case SELF:
+                return getDataTable(Collections.emptyList());
+            default:
+                break;
         }
+        startPage();
         List<CheckCorrection> list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
         return getDataTable(list);
     }
@@ -77,24 +71,22 @@ public class CheckCorrectionController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, CheckCorrection checkCorrection) {
         List<CheckCorrection> list = Collections.emptyList();
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isNotEmpty(roles)) {
-            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-                list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
-            } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case ALL:
+            case STATION:
                 list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
-            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                checkCorrection.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
+                break;
+            case BRIGADE:
+                checkCorrection.setCheckedBrigadeId(dataPermission.getValue());
                 list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
-            } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                checkCorrection.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
+                break;
+            case DEPARTMENT:
+                checkCorrection.setCheckedDepartmentId(dataPermission.getValue());
                 list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
-            } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                list = Collections.emptyList();
-            } else {
-                list = Collections.emptyList();
-            }
+                break;
+            default:
+                break;
         }
         ExcelUtil<CheckCorrection> util = new ExcelUtil<CheckCorrection>(CheckCorrection.class);
         util.exportExcel(response, list, "问题整改数据");