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 | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 1b43372..ace3b17 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -5,8 +5,9 @@
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceRepairService;
-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;
@@ -19,56 +20,62 @@
@RequestMapping("/device/repair")
@RestController
@AllArgsConstructor
-public class DeviceRepairController extends BaseController {
+public class DeviceRepairController {
private IDeviceRepairService deviceRepairService;
@Operation(summary = "璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
- public R<?> page(Page page , DeviceRepairDto deviceRepairDto) {
- return R.ok(deviceRepairService.queryPage(page,deviceRepairDto));
+ public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
+ return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
}
+ @Log(title = "鏂板璁惧鎶ヤ慨", businessType = BusinessType.INSERT)
@PostMapping()
@Operation(summary = "娣诲姞璁惧鎶ヤ慨")
- public R<?> add( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public AjaxResult add( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.saveDeviceRepair(deviceRepairDto);
}
@Operation(summary = "鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
- public R<?> detail(@PathVariable Long id) {
- return R.ok(deviceRepairService.detailById(id));
+ public AjaxResult detail(@PathVariable Long id) {
+ return AjaxResult.success(deviceRepairService.detailById(id));
}
+ @Log(title = "淇敼璁惧鎶ヤ慨", businessType = BusinessType.UPDATE)
@PutMapping ()
@Operation(summary = "淇敼璁惧鎶ヤ慨")
- public R<?> update( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public AjaxResult update( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.updateDeviceRepair(deviceRepairDto);
}
+ @Log(title = "璁惧缁翠慨", businessType = BusinessType.UPDATE)
@PostMapping ("/repair")
@Operation(summary = "璁惧缁翠慨")
- public R<?> repair( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public AjaxResult repair( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.confirmRepair(deviceRepairDto);
}
+ @Log(title = "璁惧鎶ヤ慨楠屾敹", businessType = BusinessType.UPDATE)
@PostMapping ("/acceptance")
@Operation(summary = "璁惧鎶ヤ慨楠屾敹瀹℃壒")
- public R<?> acceptance(@RequestBody DeviceRepairDto deviceRepairDto) {
+ public AjaxResult acceptance(@RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.approveRepairAcceptance(deviceRepairDto);
}
+ @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 = deviceRepairService.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