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/DeviceMaintenanceFileController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
index f4e1dd4..8c077ba 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
@@ -4,8 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
-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 org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +25,7 @@
@RestController
@RequestMapping("/maintenanceTaskFile")
@Tag(name = "璁惧淇濆吇闄勪欢")
-public class DeviceMaintenanceFileController extends BaseController {
+public class DeviceMaintenanceFileController {
@Resource
private DeviceMaintenanceFileService deviceMaintenanceFileService;
@@ -35,9 +36,10 @@
* @param deviceMaintenanceFile
* @return
*/
+ @Log(title = "鏂板璁惧淇濆吇闄勪欢", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public R<?> add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
- return R.ok(deviceMaintenanceFileService.save(deviceMaintenanceFile));
+ public AjaxResult add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
+ return AjaxResult.success(deviceMaintenanceFileService.save(deviceMaintenanceFile));
}
/**
@@ -45,13 +47,14 @@
* @param ids
* @return
*/
+ @Log(title = "鍒犻櫎璁惧淇濆吇闄勪欢", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
- public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(deviceMaintenanceFileService.removeBatchByIds(ids));
+ return AjaxResult.success(deviceMaintenanceFileService.removeBatchByIds(ids));
}
/**
@@ -61,8 +64,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
- return R.ok(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
+ public AjaxResult qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
+ return AjaxResult.success(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
}
--
Gitblit v1.9.3