From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index d3c19bb..ace3b17 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -5,6 +5,8 @@
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceRepairService;
+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;
@@ -28,6 +30,7 @@
return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
}
+ @Log(title = "鏂板璁惧鎶ヤ慨", businessType = BusinessType.INSERT)
@PostMapping()
@Operation(summary = "娣诲姞璁惧鎶ヤ慨")
public AjaxResult add( @RequestBody DeviceRepairDto deviceRepairDto) {
@@ -40,18 +43,28 @@
return AjaxResult.success(deviceRepairService.detailById(id));
}
+ @Log(title = "淇敼璁惧鎶ヤ慨", businessType = BusinessType.UPDATE)
@PutMapping ()
@Operation(summary = "淇敼璁惧鎶ヤ慨")
public AjaxResult update( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.updateDeviceRepair(deviceRepairDto);
}
- @PostMapping ("repair")
+ @Log(title = "璁惧缁翠慨", businessType = BusinessType.UPDATE)
+ @PostMapping ("/repair")
@Operation(summary = "璁惧缁翠慨")
public AjaxResult repair( @RequestBody DeviceRepairDto deviceRepairDto) {
- return deviceRepairService.updateDeviceRepair(deviceRepairDto);
+ return deviceRepairService.confirmRepair(deviceRepairDto);
}
+ @Log(title = "璁惧鎶ヤ慨楠屾敹", businessType = BusinessType.UPDATE)
+ @PostMapping ("/acceptance")
+ @Operation(summary = "璁惧鎶ヤ慨楠屾敹瀹℃壒")
+ public AjaxResult acceptance(@RequestBody DeviceRepairDto deviceRepairDto) {
+ return deviceRepairService.approveRepairAcceptance(deviceRepairDto);
+ }
+
+ @Log(title = "鍒犻櫎璁惧鎶ヤ慨", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧鎶ヤ慨")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
@@ -62,6 +75,7 @@
return AjaxResult.success();
}
+ @Log(title = "瀵煎嚭璁惧鎶ヤ慨", businessType = BusinessType.EXPORT)
@PostMapping("export")
@Operation(summary = "瀵煎嚭璁惧鎶ヤ慨")
public void export(HttpServletResponse response, Long[] ids) {
--
Gitblit v1.9.3