巡检模块

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

@@ -2,17 +2,16 @@ 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 cn.hutool.core.util.StrUtil;
-import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.DataPermissionResult;
 import com.sundot.airport.common.enums.CheckLevelEnum;
 import com.sundot.airport.common.enums.CheckTaskStatusEnum;
-import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.common.enums.SourceTypeEnum;
 import com.sundot.airport.common.utils.SecurityUtils;
+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;
@@ -51,45 +50,47 @@ public class CheckTaskController extends BaseController {
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/list")
     public TableDataInfo list(CheckTask checkTask, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
         startPage();
         List<CheckTask> list;
-        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 (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
-            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-                checkTask.setCheckLevel(null);
-            } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-                checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
-            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
-            } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-            } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
-            } else {
-                return getDataTable(Collections.emptyList());
+            switch (dataPermission.getPermissionType()) {
+                case ALL:
+                    checkTask.setCheckLevel(null);
+                    break;
+                case STATION:
+                    checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
+                    break;
+                case BRIGADE:
+                    checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                    break;
+                case DEPARTMENT:
+                    checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    break;
+                case TEAM:
+                    checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                    break;
+                default:
+                    return getDataTable(Collections.emptyList());
             }
             list = checkTaskService.selectCheckTaskList(checkTask);
         } else if (StrUtil.equals(SourceTypeEnum.web.getCode(), source)) {
-            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-                list = checkTaskService.selectCheckTaskList(checkTask);
-            } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-                list = checkTaskService.selectCheckTaskList(checkTask);
-            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
-                list = checkTaskService.selectCheckTaskList(checkTask);
-            } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-                list = checkTaskService.selectCheckTaskListWeb(checkTask);
-            } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                return getDataTable(Collections.emptyList());
-            } else {
-                return getDataTable(Collections.emptyList());
+            switch (dataPermission.getPermissionType()) {
+                case ALL:
+                case STATION:
+                    list = checkTaskService.selectCheckTaskList(checkTask);
+                    break;
+                case BRIGADE:
+                    list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
+                    break;
+                case DEPARTMENT:
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    list = checkTaskService.selectCheckTaskListWeb(checkTask);
+                    break;
+                default:
+                    return getDataTable(Collections.emptyList());
             }
         } else {
             return getDataTable(Collections.emptyList());
@@ -104,25 +105,23 @@ public class CheckTaskController extends BaseController {
     @Log(title = "检查任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CheckTask checkTask) {
-        List<CheckTask> 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 = checkTaskService.selectCheckTaskList(checkTask);
-            } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-                list = checkTaskService.selectCheckTaskList(checkTask);
-            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        List<CheckTask> list;
+        switch (dataPermission.getPermissionType()) {
+            case ALL:
+            case STATION:
                 list = checkTaskService.selectCheckTaskList(checkTask);
-            } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getDeptId());
+                break;
+            case BRIGADE:
+                list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
+                break;
+            case DEPARTMENT:
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 list = checkTaskService.selectCheckTaskListWeb(checkTask);
-            } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                list = Collections.emptyList();
-            } else {
+                break;
+            default:
                 list = Collections.emptyList();
-            }
+                break;
         }
         ExcelUtil<CheckTask> util = new ExcelUtil<CheckTask>(CheckTask.class);
         util.exportExcel(response, list, "检查任务数据");
@@ -177,27 +176,29 @@ public class CheckTaskController extends BaseController {
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/unReadNum")
     public AjaxResult unReadNum() {
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return success(0);
-        }
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
         CheckTask checkTask = new CheckTask();
         checkTask.setStatus(CheckTaskStatusEnum.IN_PROGRESS.getCode());
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            checkTask.setCheckLevel(null);
-        } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-            checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
-        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-            checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
-        } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
-            checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getDeptId());
-        } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
-            checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
-        } else {
-            return success(0);
+        switch (dataPermission.getPermissionType()) {
+            case ALL:
+                checkTask.setCheckLevel(null);
+                break;
+            case STATION:
+                checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
+                break;
+            case BRIGADE:
+                checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                break;
+            case DEPARTMENT:
+                checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                break;
+            case TEAM:
+                checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                break;
+            default:
+                return success(0);
         }
         List<CheckTask> list = checkTaskService.selectCheckTaskList(checkTask);
         if (CollUtil.isEmpty(list)) {

airport-check/src/main/java/com/sundot/airport/check/mapper/CheckTaskMapper.java

@@ -67,4 +67,12 @@ public interface CheckTaskMapper extends BaseMapper<CheckTask> {
      * @return 检查任务集合
      */
     public List<CheckTask> selectCheckTaskListWeb(CheckTask checkTask);
+
+    /**
+     * 查询检查任务列表web端
+     *
+     * @param checkTask 检查任务
+     * @return 检查任务集合
+     */
+    public List<CheckTask> selectCheckTaskListBrigadeWeb(CheckTask checkTask);
 }

airport-check/src/main/java/com/sundot/airport/check/service/ICheckTaskService.java

@@ -75,4 +75,12 @@ public interface ICheckTaskService extends IService<CheckTask> {
      * @return 检查任务集合
      */
     public List<CheckTask> selectCheckTaskListWeb(CheckTask checkTask);
+
+    /**
+     * 查询检查任务列表web端
+     *
+     * @param checkTask 检查任务
+     * @return 检查任务集合
+     */
+    public List<CheckTask> selectCheckTaskListBrigadeWeb(CheckTask checkTask);
 }

airport-check/src/main/java/com/sundot/airport/check/service/impl/CheckTaskServiceImpl.java

@@ -294,6 +294,35 @@ public class CheckTaskServiceImpl extends ServiceImpl<CheckTaskMapper, CheckTask
     }
 
     /**
+     * 查询检查任务列表web端
+     *
+     * @param checkTask 检查任务
+     * @return 检查任务
+     */
+    @Override
+    public List<CheckTask> selectCheckTaskListBrigadeWeb(CheckTask checkTask) {
+        List<CheckTask> result = checkTaskMapper.selectCheckTaskListBrigadeWeb(checkTask);
+        if (CollUtil.isNotEmpty(result)) {
+            Date currentDate = getDateWithoutTime(DateUtils.getNowDate());
+            result.forEach(item -> {
+                if (currentDate.before(item.getCheckStartTime())) {
+                    item.setStatus(CheckTaskStatusEnum.PENDING_EXECUTION.getCode());
+                    item.setStatusDesc(CheckTaskStatusEnum.PENDING_EXECUTION.getDesc());
+                } else if (currentDate.after(item.getCheckEndTime())) {
+                    item.setStatus(CheckTaskStatusEnum.COMPLETED.getCode());
+                    item.setStatusDesc(CheckTaskStatusEnum.COMPLETED.getDesc());
+                } else {
+                    item.setStatus(CheckTaskStatusEnum.IN_PROGRESS.getCode());
+                    item.setStatusDesc(CheckTaskStatusEnum.IN_PROGRESS.getDesc());
+                }
+            });
+            //是否已读处理
+            checkIsRead(result);
+        }
+        return result;
+    }
+
+    /**
      * 转换为树形结构
      */
     public List<CheckProjectItemTreeVo> convertToTree(List<CheckProjectItemVo> itemList) {

airport-check/src/main/resources/mapper/check/CheckTaskMapper.xml

@@ -283,4 +283,30 @@
         order by create_time desc
     </select>
 
+    <select id="selectCheckTaskListBrigadeWeb" parameterType="CheckTask" resultMap="CheckTaskResult">
+        <include refid="selectCheckTaskVo"/>
+        <where>
+            <if test="taskCode != null  and taskCode != ''">and task_code = #{taskCode}</if>
+            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
+            <choose>
+                <when test="status == 'PENDING_EXECUTION'">
+                    and current_date() <![CDATA[<]]> check_start_time
+                </when>
+                <when test="status == 'COMPLETED'">
+                    and current_date() <![CDATA[>]]> check_end_time
+                </when>
+                <when test="status == 'IN_PROGRESS'">
+                    and current_date() <![CDATA[>=]]> check_start_time
+                    and current_date() <![CDATA[<=]]> check_end_time
+                </when>
+                <otherwise>
+
+                </otherwise>
+            </choose>
+            <if test="checkedLevel != null  and checkedLevel != ''">and checked_level = #{checkedLevel}</if>
+            and check_level in ('BRIGADE_LEVEL','DEPARTMENT_LEVEL', 'TEAM_LEVEL')
+        </where>
+        order by create_time desc
+    </select>
+
 </mapper>