From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 a15344d..9ed3059 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
@@ -3,6 +3,8 @@
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;
@@ -13,15 +15,14 @@
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.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
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;
/**
* 璋冨害鏃ュ織鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -55,15 +56,15 @@
ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
util.exportExcel(response, list, "璋冨害鏃ュ織");
}
-
+
/**
* 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobLogId}")
- public R<?> getInfo(@PathVariable Long jobLogId)
+ public AjaxResult getInfo(@PathVariable Long jobLogId)
{
- return R.ok(jobLogService.selectJobLogById(jobLogId));
+ return success(jobLogService.selectJobLogById(jobLogId));
}
@@ -73,10 +74,9 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobLogIds}")
- public R<?> remove(@PathVariable Long[] jobLogIds)
+ public AjaxResult remove(@PathVariable Long[] jobLogIds)
{
- jobLogService.deleteJobLogByIds(jobLogIds);
- return R.ok();
+ return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
}
/**
@@ -85,9 +85,9 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
- public R<?> clean()
+ public AjaxResult clean()
{
jobLogService.cleanJobLog();
- return R.ok();
+ return success();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3