From 089964a497c2528e88ddc610af5f88f631303431 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 15:28:16 +0800
Subject: [PATCH] feat: 设备保养新增任务状态，启动/停止与调度器关联
---
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
index d7da280..cbb9cc3 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.List;
@@ -31,22 +32,41 @@
/**
* 鏂板
+ *
* @param deviceMaintenanceFile
* @return
*/
@PostMapping("/add")
public AjaxResult add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
- return AjaxResult.success(deviceMaintenanceFileService.save(deviceMaintenanceFile));
+ try {
+ return AjaxResult.success(deviceMaintenanceFileService.saveRecord(deviceMaintenanceFile));
+ } catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 涓婁紶闄勪欢
+ */
+ @PostMapping("/upload")
+ public AjaxResult upload(@RequestParam("file") MultipartFile file,
+ @RequestParam("deviceMaintenanceId") Integer deviceMaintenanceId) {
+ try {
+ return AjaxResult.success(deviceMaintenanceFileService.uploadFile(file, deviceMaintenanceId));
+ } catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
}
/**
* 鍒犻櫎
+ *
* @param ids
* @return
*/
@DeleteMapping("/del")
public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
+ if (CollectionUtils.isEmpty(ids)) {
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
@@ -54,14 +74,20 @@
}
/**
- *鍒嗛〉鏌ヨ
+ * 鍒嗛〉鏌ヨ
+ *
* @param page
* @param deviceMaintenanceFile
* @return
*/
@GetMapping("/listPage")
public AjaxResult qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
- return AjaxResult.success(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
+ Page<DeviceMaintenanceFile> result = deviceMaintenanceFileService.page(page,
+ Wrappers.<DeviceMaintenanceFile>lambdaQuery()
+ .eq(DeviceMaintenanceFile::getDeviceMaintenanceId, deviceMaintenanceFile.getDeviceMaintenanceId())
+ .orderByDesc(DeviceMaintenanceFile::getCreateTime));
+ deviceMaintenanceFileService.enrichAccessUrl(result.getRecords());
+ return AjaxResult.success(result);
}
--
Gitblit v1.9.3