From f6b53f228e59aa5dfae2e0070a7f097d47703fdc Mon Sep 17 00:00:00 2001
From: BrandWang <rj090123@163.com>
Date: Thu, 30 Mar 2023 10:23:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=AF=E5=9B=9E=E6=BA=AF):=20=E5=8F=AF?=
 =?UTF-8?q?=E5=9B=9E=E6=BA=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改存储桶
---
 .../java/com/wabestway/recall/web/OrderController.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/wabestway/recall/web/OrderController.java b/src/main/java/com/wabestway/recall/web/OrderController.java
index 4169c38..5f5ac59 100644
--- a/src/main/java/com/wabestway/recall/web/OrderController.java
+++ b/src/main/java/com/wabestway/recall/web/OrderController.java
@@ -91,8 +91,7 @@ public class OrderController {
         Sort s = Sort.by("createAt");
         Flux<Order> flux = orderRepository.findAll(ep, s);
         flux.filter(fo -> fo.getFileId() == null).subscribe(fo -> {
-            Flux<Record> rs = recordRepository.findAllByTraceIdOrderByCreateAtAsc(fo.getTraceId());
-            Mono<List<List<String>>> es = rs.map(rr -> rr.getEvents()).collectList();
+            Mono<List<List<String>>> es = recordRepository.findAllByTraceIdOrderByCreateAtAsc(fo.getTraceId()).map(rr -> rr.getEvents()).collectList();
             Mono<List<String>> events = es.flatMapIterable(lists -> lists).flatMapIterable(list -> list).collectList();
             events.subscribe(e -> {
                 JSONArray array = JSONArray.parseArray(JSON.toJSONString(e));
@@ -145,9 +144,10 @@ public class OrderController {
 
             File file = new File(tempDir.toFile(), "video.mp4");
             if (file.exists()) {
+                log.info(String.valueOf(file.length()));
                 byte[] fileBytes = Files.readAllBytes(file.toPath());
                 String titles = fo.getOrderId() + ".mp4";
-                UploadFileDTO uploadFileDTO = new UploadFileDTO(fileBytes, "contractExcel", titles);
+                UploadFileDTO uploadFileDTO = new UploadFileDTO(fileBytes, "RECALL", titles);
 
                 ResObj<UploadRespVO> uploadResObj = storageFeignClient.uploadBytes(uploadFileDTO);
                 log.info(JSON.toJSONString(uploadResObj));
@@ -157,7 +157,7 @@ public class OrderController {
                     orderRepository.save(fo).subscribe();
                 }
             }
-        } catch (IOException | InterruptedException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         } finally {
             // 删除临时目录