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 | 57 ++++++++++++++++++++++++++-------------------------------
1 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 0c902f4..5442195 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -3,59 +3,54 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
-import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
-import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
-import com.ruoyi.device.service.IDeviceRepairService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.beans.factory.annotation.Autowired;
+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;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
import java.util.Arrays;
-@Api(tags = "璁惧淇濆吇")
+@Tag(name = "璁惧淇濆吇")
@RestController
@RequestMapping("/device/maintenance")
-public class DeviceMaintenanceController {
+@AllArgsConstructor
+public class DeviceMaintenanceController extends BaseController {
- @Autowired
private IDeviceMaintenanceService deviceMaintenanceService;
-
- @Autowired
private IDeviceLedgerService deviceLedgerService;
- @ApiModelProperty("璁惧淇濆吇鍒楄〃")
+ @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()
- @ApiModelProperty("娣诲姞璁惧淇濆吇")
- public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
+ @Operation(summary = "娣诲姞璁惧淇濆吇")
+ public R<?> add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
return deviceMaintenanceService.saveDeviceRepair(deviceMaintenance);
}
- @ApiModelProperty("鏍规嵁id鏌ヨ璁惧淇濆吇")
+ @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 ()
- @ApiModelProperty("淇敼璁惧淇濆吇")
- public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
+ @Operation(summary = "淇敼璁惧淇濆吇")
+ public R<?> update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -63,24 +58,24 @@
}
@PostMapping ("maintenance")
- @ApiModelProperty("淇敼璁惧淇濆吇")
- public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
+ @Operation(summary = "淇敼璁惧淇濆吇")
+ public R<?> maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
@DeleteMapping("/{ids}")
- @ApiModelProperty("鍒犻櫎璁惧淇濆吇")
- public AjaxResult delete(@PathVariable("ids") Long[] ids) {
+ @Operation(summary = "鍒犻櫎璁惧淇濆吇")
+ 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")
- @ApiModelProperty("瀵煎嚭璁惧淇濆吇")
+ @Operation(summary = "瀵煎嚭璁惧淇濆吇")
public void export(HttpServletResponse response, Long[] ids) {
deviceMaintenanceService.export(response, ids);
}
--
Gitblit v1.9.3