Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

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

@@ -3,8 +3,6 @@
import java.util.List;

import jakarta.servlet.http.HttpServletResponse;

import lombok.AllArgsConstructor;

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;

@@ -15,10 +13,11 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

import com.ruoyi.framework.web.controller.BaseController;

import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;

import com.ruoyi.project.monitor.domain.SysJobLog;

import com.ruoyi.project.monitor.service.ISysJobLogService;

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


/**

 * 调度日志操作处理

@@ -62,9 +61,9 @@
     */

    @PreAuthorize("@ss.hasPermi('monitor:job:query')")

    @GetMapping(value = "/{jobLogId}")

    public AjaxResult getInfo(@PathVariable Long jobLogId)

    public R<?> getInfo(@PathVariable Long jobLogId)
    {

        return success(jobLogService.selectJobLogById(jobLogId));

        return R.ok(jobLogService.selectJobLogById(jobLogId));
    }





@@ -74,9 +73,10 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")

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

    @DeleteMapping("/{jobLogIds}")

    public AjaxResult remove(@PathVariable Long[] jobLogIds)

    public R<?> remove(@PathVariable Long[] jobLogIds)
    {

        return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));

        jobLogService.deleteJobLogByIds(jobLogIds);
        return R.ok();
    }



    /**

@@ -85,9 +85,9 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")

    @Log(title = "调度日志", businessType = BusinessType.CLEAN)

    @DeleteMapping("/clean")

    public AjaxResult clean()

    public R<?> clean()
    {

        jobLogService.cleanJobLog();

        return success();

        return R.ok();
    }

}