From d34a44a1ffa778c0a95027f67d56544b0faa4930 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 17:16:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
index b6fbd98..0c29d22 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.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.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,9 +27,9 @@
*/
@RestController
@RequestMapping("/monitor/jobLog")
+@AllArgsConstructor
public class SysJobLogController extends BaseController
{
- @Autowired
private ISysJobLogService jobLogService;
/**
@@ -60,10 +61,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 +88,6 @@
public AjaxResult clean()
{
jobLogService.cleanJobLog();
- return AjaxResult.success();
+ return success();
}
}
--
Gitblit v1.9.3