From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index e53953d..51cef45 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -7,6 +7,8 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
+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;
@@ -32,9 +34,10 @@
return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
}
+ @Log(title = "鏂板璁惧淇濆吇", businessType = BusinessType.INSERT)
@PostMapping()
@Operation(summary = "娣诲姞璁惧淇濆吇")
- public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
+ public AjaxResult add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -47,22 +50,25 @@
return AjaxResult.success(deviceMaintenanceService.detailById(id));
}
+ @Log(title = "淇敼璁惧淇濆吇", businessType = BusinessType.UPDATE)
@PutMapping ()
@Operation(summary = "淇敼璁惧淇濆吇")
- public AjaxResult update(@RequestBody DeviceMaintenance 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 AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
+ public AjaxResult maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
+ @Log(title = "鍒犻櫎璁惧淇濆吇", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧淇濆吇")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
@@ -73,6 +79,7 @@
return AjaxResult.success();
}
+ @Log(title = "瀵煎嚭璁惧淇濆吇", businessType = BusinessType.EXPORT)
@PostMapping("export")
@Operation(summary = "瀵煎嚭璁惧淇濆吇")
public void export(HttpServletResponse response, Long[] ids) {
--
Gitblit v1.9.3