From a7aaeabc7873a0eafb4a7ecad7f65b018b7a9bc9 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 24 Feb 2023 19:31:23 +0800
Subject: [PATCH] What's new? 1. Add license for dock. 2. Modify the logic corresponding to the firmware file and device type. 3. Add multiple mqtt clients options. 4. Modify the structure of the interface for obtaining the device list. 5. Fixed some issues.
---
src/main/java/com/dji/sample/media/controller/MediaController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/controller/MediaController.java b/src/main/java/com/dji/sample/media/controller/MediaController.java
index 0e73743..b02f8ad 100644
--- a/src/main/java/com/dji/sample/media/controller/MediaController.java
+++ b/src/main/java/com/dji/sample/media/controller/MediaController.java
@@ -1,8 +1,10 @@
package com.dji.sample.media.controller;
import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.component.mqtt.model.MapKeyConst;
import com.dji.sample.media.model.FileUploadDTO;
import com.dji.sample.media.service.IMediaService;
+import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -10,7 +12,6 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
/**
* @author sean
@@ -36,7 +37,7 @@
boolean isExist = mediaService.fastUpload(workspaceId, file.getFingerprint());
- return isExist ? ResponseResult.success() : ResponseResult.error(file.getFingerprint() + "already exists.");
+ return isExist ? ResponseResult.success() : ResponseResult.error(file.getFingerprint() + "don't exist.");
}
/**
@@ -56,18 +57,17 @@
/**
* Query the files that already exist in this workspace based on the workspace id and the collection of tiny fingerprints.
* @param workspaceId
- * @param tinyFingerprints
+ * @param tinyFingerprints There is only one tiny_fingerprint parameter in the body.
+ * But it is not recommended to use Map to receive the parameter.
* @return
*/
- @GetMapping("/{workspace_id}/files/tiny-fingerprints")
- public ResponseResult<Map<String, List<String>>> uploadCallback(@PathVariable(name = "workspace_id") String workspaceId,
- @RequestParam(value = "tiny_fingerprint") List<String> tinyFingerprints) {
- List<String> tinyFingerprintList = mediaService.getAllTinyFingerprintsByWorkspaceId(workspaceId);
- List<String> existingList = tinyFingerprints
- .stream()
- .filter(tinyFingerprintList::contains)
- .collect(Collectors.toList());
- return ResponseResult.success(new ConcurrentHashMap<>(Map.of("tiny_fingerprints", existingList)));
+ @PostMapping("/{workspace_id}/files/tiny-fingerprints")
+ public ResponseResult<Map<String, List<String>>> uploadCallback(
+ @PathVariable(name = "workspace_id") String workspaceId,
+ @RequestBody Map<String, List<String>> tinyFingerprints) throws JsonProcessingException {
+
+ List<String> existingList = mediaService.getExistTinyFingerprints(workspaceId, tinyFingerprints.get(MapKeyConst.TINY_FINGERPRINTS));
+ return ResponseResult.success(new ConcurrentHashMap<>(Map.of(MapKeyConst.TINY_FINGERPRINTS, existingList)));
}
}
\ No newline at end of file
--
Gitblit v1.9.3