From 9a30a3a8d3862a9b2ce898535b7cb51c3ddac816 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:01:11 +0800
Subject: [PATCH] refactor(controller): 将控制器响应结果统一为R类型并继承BaseController
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index ab27019..2bb6cd7 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -4,7 +4,8 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.dto.StaffOnJobExcelDto;
import com.ruoyi.staff.pojo.StaffContract;
@@ -26,7 +27,7 @@
@RestController
@RequestMapping("/staff/staffOnJob")
@Tag(name = "鍛樺伐鍙拌处")
-public class StaffOnJobController {
+public class StaffOnJobController extends BaseController {
@Resource
private IStaffOnJobService staffOnJobService;
@@ -39,8 +40,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
- return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
+ public R<?> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
+ return R.ok(staffOnJobService.staffOnJobListPage(page, staffOnJob));
}
/**
@@ -48,8 +49,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
- return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
+ public R<?> staffOnJobList(StaffOnJob staffOnJob) {
+ return R.ok(staffOnJobService.staffOnJobList(staffOnJob));
}
/**
@@ -58,8 +59,8 @@
* @return
*/
@PostMapping("")
- public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
- return AjaxResult.success(staffOnJobService.add(staffOnJob));
+ public R<?> add(@RequestBody StaffOnJobDto staffOnJob) {
+ return R.ok(staffOnJobService.add(staffOnJob));
}
/**
@@ -68,8 +69,8 @@
* @return
*/
@PutMapping("/{id}")
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
- return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
+ public R<?> update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
+ return R.ok(staffOnJobService.update(id, staffOnJobDto));
}
/**
@@ -78,11 +79,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
+ public R<?> delStaffOnJobs(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(staffOnJobService.delStaffOnJobs(ids));
+ return R.ok(staffOnJobService.delStaffOnJobs(ids));
}
/**
@@ -91,8 +92,8 @@
* @return
*/
@GetMapping("/{id}")
- public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
- return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
+ public R<?> staffOnJobDetail(@PathVariable("id") Long id) {
+ return R.ok(staffOnJobService.staffOnJobDetail(id));
}
/**
@@ -102,8 +103,8 @@
* @return
*/
@PostMapping("/renewContract/{id}")
- public AjaxResult renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
- return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
+ public R<?> renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
+ return R.ok(staffOnJobService.renewContract(id, staffContract));
}
@Operation(summary = "涓嬭浇妯℃澘")
@@ -118,12 +119,12 @@
*/
@PostMapping("/import")
@Log(title = "鍦ㄨ亴鍛樺伐瀵煎叆", businessType = BusinessType.IMPORT)
- public AjaxResult importData(@RequestPart("file") MultipartFile file) {
+ public R<?> importData(@RequestPart("file") MultipartFile file) {
Boolean b = staffOnJobService.importData(file);
if (b) {
- return AjaxResult.success("瀵煎叆鎴愬姛");
+ return R.ok(null, "瀵煎叆鎴愬姛");
}
- return AjaxResult.error("瀵煎叆澶辫触");
+ return R.fail("瀵煎叆澶辫触");
}
/**
@@ -143,8 +144,8 @@
*/
@PostMapping("/exportCopy")
@Operation(summary = "word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
- public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
- return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
+ public R<?> exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
+ return R.ok(staffOnJobService.exportCopy(response, staffOnJob));
}
--
Gitblit v1.9.3