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

云

2026-04-22 f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1

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

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



import java.util.List;

import javax.servlet.http.HttpServletResponse;

import jakarta.servlet.http.HttpServletResponse;

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

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

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

@@ -60,10 +60,10 @@
     * 根据调度编号获取详细信息

     */

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

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

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

    public AjaxResult getInfo(@PathVariable Long jobLogId)

    {

        return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));

        return success(jobLogService.selectJobLogById(jobLogId));

    }





@@ -87,6 +87,6 @@
    public AjaxResult clean()

    {

        jobLogService.cleanJobLog();

        return AjaxResult.success();

        return success();

    }

}