Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-06-17 a8c1d02ee14a3aa01dc02f496a9e4a61b6abdf99

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

@@ -1,17 +1,5 @@
package com.ruoyi.quartz.controller;



import java.util.List;

import org.quartz.SchedulerException;

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

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

import org.springframework.web.bind.annotation.DeleteMapping;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PathVariable;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.PutMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.core.controller.BaseController;

@@ -25,6 +13,12 @@
import com.ruoyi.quartz.domain.SysJob;

import com.ruoyi.quartz.service.ISysJobService;

import com.ruoyi.quartz.util.CronUtils;

import org.quartz.SchedulerException;

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

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

import org.springframework.web.bind.annotation.*;



import java.util.List;



/**

 * 调度任务信息操作处理

@@ -45,9 +39,7 @@
    @GetMapping("/list")

    public TableDataInfo list(SysJob sysJob)

    {

        startPage();

        List<SysJob> list = jobService.selectJobList(sysJob);

        return getDataTable(list);

        return jobService.selectPageJobList(sysJob);

    }



    /**