From ea531a6f0efba09ca671fee7e406e42955d1f0d1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 五月 2026 17:48:26 +0800
Subject: [PATCH] 编辑采购台账报错异常+供应商往来查询入库金额sql调整优化
---
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 5442195..51cef45 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -7,8 +7,9 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -21,7 +22,7 @@
@RestController
@RequestMapping("/device/maintenance")
@AllArgsConstructor
-public class DeviceMaintenanceController extends BaseController {
+public class DeviceMaintenanceController {
private IDeviceMaintenanceService deviceMaintenanceService;
@@ -29,13 +30,14 @@
@Operation(summary = "璁惧淇濆吇鍒楄〃")
@GetMapping("/page")
- public R<?> page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
- return R.ok(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
+ public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
+ return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
}
+ @Log(title = "鏂板璁惧淇濆吇", businessType = BusinessType.INSERT)
@PostMapping()
@Operation(summary = "娣诲姞璁惧淇濆吇")
- public R<?> add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public AjaxResult add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -44,36 +46,40 @@
@Operation(summary = "鏍规嵁id鏌ヨ璁惧淇濆吇")
@GetMapping("/{id}")
- public R<?> detail(@PathVariable Long id) {
- return R.ok(deviceMaintenanceService.detailById(id));
+ public AjaxResult detail(@PathVariable Long id) {
+ return AjaxResult.success(deviceMaintenanceService.detailById(id));
}
+ @Log(title = "淇敼璁惧淇濆吇", businessType = BusinessType.UPDATE)
@PutMapping ()
@Operation(summary = "淇敼璁惧淇濆吇")
- public R<?> update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public AjaxResult update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
+ @Log(title = "鎵ц璁惧淇濆吇", businessType = BusinessType.UPDATE)
@PostMapping ("maintenance")
@Operation(summary = "淇敼璁惧淇濆吇")
- public R<?> maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public AjaxResult maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
+ @Log(title = "鍒犻櫎璁惧淇濆吇", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧淇濆吇")
- public R<?> delete(@PathVariable("ids") Long[] ids) {
+ public AjaxResult delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
- return R.fail("鍒犻櫎澶辫触");
+ return AjaxResult.error("鍒犻櫎澶辫触");
}
- return R.ok();
+ return AjaxResult.success();
}
+ @Log(title = "瀵煎嚭璁惧淇濆吇", businessType = BusinessType.EXPORT)
@PostMapping("export")
@Operation(summary = "瀵煎嚭璁惧淇濆吇")
public void export(HttpServletResponse response, Long[] ids) {
--
Gitblit v1.9.3