From b5f294729bca484a4ce726f4d2a1c096166bc9f2 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 01 Apr 2024 16:27:38 +0800
Subject: [PATCH] 生成航线文件
---
src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java b/src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java
index 13b2ff3..97d46b9 100644
--- a/src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java
+++ b/src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java
@@ -18,9 +18,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
+import java.util.stream.Collectors;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -44,11 +44,13 @@
*/
@GetMapping("/firmware-release-notes/latest")
public ResponseResult<List<DeviceFirmwareNoteDTO>> getLatestFirmwareNote(@RequestParam("device_name") List<String> deviceNames) {
- List<DeviceFirmwareNoteDTO> releaseNotes = new ArrayList<>();
- deviceNames.forEach(deviceName -> {
- Optional<DeviceFirmwareNoteDTO> latestFirmware = service.getLatestFirmwareReleaseNote(deviceName);
- latestFirmware.ifPresent(releaseNotes::add);
- });
+
+ List<DeviceFirmwareNoteDTO> releaseNotes = deviceNames.stream()
+ .map(deviceName -> service.getLatestFirmwareReleaseNote(deviceName))
+ .filter(Optional::isPresent)
+ .map(Optional::get)
+ .collect(Collectors.toList());
+
return ResponseResult.success(releaseNotes);
}
@@ -80,7 +82,7 @@
@Valid DeviceFirmwareUploadParam param) {
if (!file.getOriginalFilename().endsWith(FirmwareFileProperties.FIRMWARE_FILE_SUFFIX)) {
- return ResponseResult.error("The file format is incorrect.");
+ return ResponseResult.error("文件格式不正确");
}
CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
@@ -98,7 +100,7 @@
* @return
*/
@PutMapping("/{workspace_id}/firmwares/{firmware_id}")
- public ResponseResult importFirmwareFile(@PathVariable("workspace_id") String workspaceId,
+ public ResponseResult changeFirmwareStatus(@PathVariable("workspace_id") String workspaceId,
@PathVariable("firmware_id") String firmwareId,
@Valid @RequestBody DeviceFirmwareUpdateParam param) {
--
Gitblit v1.9.3