Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

昨天 dbd7fd484b5c7ed00cb895f227645848c3677c08

 src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java

@@ -1,7 +1,8 @@
package com.ruoyi.project.monitor.controller;



import java.util.List;

import javax.servlet.http.HttpServletResponse;

import jakarta.servlet.http.HttpServletResponse;

import lombok.AllArgsConstructor;

import org.quartz.SchedulerException;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

@@ -34,9 +35,9 @@
 */

@RestController

@RequestMapping("/monitor/job")

@AllArgsConstructor

public class SysJobController extends BaseController

{

    @Autowired

    private ISysJobService jobService;



    /**

@@ -177,7 +178,7 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")

    @Log(title = "定时任务", businessType = BusinessType.DELETE)

    @DeleteMapping("/{jobIds}")

    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException

    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException

    {

        jobService.deleteJobByIds(jobIds);

        return success();