Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-23 b1f91d23c01266dda8cad34aa866bcac741a21cf

Merge remote-tracking branch 'origin/master'

 ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java

@@ -75,7 +75,13 @@
    public AjaxResult getInfo(@PathVariable("id") String id) {
        return success(ardVideoInspectTaskService.selectArdVideoInspectTaskById(id));
    }

    /**
     * 获取视频巡检任务详细信息（不校验权限）
     */
    @GetMapping(value = "/{id}/noPerm")
    public AjaxResult getInfoNoPerm(@PathVariable("id") String id) {
        return success(ardVideoInspectTaskService.selectArdVideoInspectTaskById(id));
    }
/*
    */
/**

 ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java

@@ -47,6 +47,24 @@

    }


    @GetMapping("/startTask/{taskId}/noPerm")
    @ApiOperation("手动开启巡检-不校验权限")
    AjaxResult startTaskNoPerm(@PathVariable String taskId) {
        boolean enablemanualTask = ardVideoInspectTaskService.isEnablemanualTask(taskId);
        if (enablemanualTask)
        {
            // 开启巡检任务
            inspectionTaskManager.startInspectionTask(taskId);
            return AjaxResult.success();
        }
        else
        {
            return AjaxResult.error();
        }

    }

    @PreAuthorize("@ss.hasPermi('inspect:control:manual')")
    @ApiOperation("手动停止巡检")
    @GetMapping("/stopTask/{taskId}")
@@ -55,6 +73,15 @@
        inspectionTaskManager.stopInspectionTask(taskId);
        return AjaxResult.success();
    }

    @ApiOperation("手动停止巡检-不校验权限")
    @GetMapping("/stopTask/{taskId}/noPerm")
    AjaxResult stopTaskNoPerm(@PathVariable String taskId) {
        // 停止巡检任务
        inspectionTaskManager.stopInspectionTask(taskId);
        return AjaxResult.success();
    }

    @PreAuthorize("@ss.hasPermi('inspect:control:manual')")
    @ApiOperation("查询已启动任务")
    @GetMapping("/getTaskList")
@@ -63,4 +90,12 @@
        Set<String> taskIds = inspectionTaskManager.getTaskMap().keySet();
        return AjaxResult.success(taskIds);
    }

    @ApiOperation("查询已启动任务-不校验权限")
    @GetMapping("/getTaskList/noPerm")
    AjaxResult getTaskListNoPerm() {
        // 停止巡检任务
        Set<String> taskIds = inspectionTaskManager.getTaskMap().keySet();
        return AjaxResult.success(taskIds);
    }
}