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/device/controller/DeviceMaintenanceController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index e34fc37..5442195 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -7,7 +7,8 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -20,7 +21,7 @@
@RestController
@RequestMapping("/device/maintenance")
@AllArgsConstructor
-public class DeviceMaintenanceController {
+public class DeviceMaintenanceController extends BaseController {
private IDeviceMaintenanceService deviceMaintenanceService;
@@ -28,13 +29,13 @@
@Operation(summary = "璁惧淇濆吇鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
- return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
+ public R<?> page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
+ return R.ok(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
}
@PostMapping()
@Operation(summary = "娣诲姞璁惧淇濆吇")
- public AjaxResult add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public R<?> add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -43,13 +44,13 @@
@Operation(summary = "鏍规嵁id鏌ヨ璁惧淇濆吇")
@GetMapping("/{id}")
- public AjaxResult detail(@PathVariable Long id) {
- return AjaxResult.success(deviceMaintenanceService.detailById(id));
+ public R<?> detail(@PathVariable Long id) {
+ return R.ok(deviceMaintenanceService.detailById(id));
}
@PutMapping ()
@Operation(summary = "淇敼璁惧淇濆吇")
- public AjaxResult update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public R<?> update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -58,19 +59,19 @@
@PostMapping ("maintenance")
@Operation(summary = "淇敼璁惧淇濆吇")
- public AjaxResult maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public R<?> maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧淇濆吇")
- public AjaxResult delete(@PathVariable("ids") Long[] ids) {
+ public R<?> delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
- return AjaxResult.error("鍒犻櫎澶辫触");
+ return R.fail("鍒犻櫎澶辫触");
}
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("export")
--
Gitblit v1.9.3