From 217e39bec2ae2a861c4619d277ab0bc823cf85d4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 28 二月 2025 11:41:35 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
index e3c8a36..4f6bb63 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
@@ -12,7 +12,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -61,7 +61,7 @@
*/
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobLogId}")
- public Result getInfo(@PathVariable Long jobLogId)
+ public AjaxResult getInfo(@PathVariable Long jobLogId)
{
return success(jobLogService.selectJobLogById(jobLogId));
}
@@ -73,7 +73,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobLogIds}")
- public Result remove(@PathVariable Long[] jobLogIds)
+ public AjaxResult remove(@PathVariable Long[] jobLogIds)
{
return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
}
@@ -84,7 +84,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
- public Result clean()
+ public AjaxResult clean()
{
jobLogService.cleanJobLog();
return success();
--
Gitblit v1.9.3