영상관리 chunk, uploadPair 로직 수정

src/main/java/com/kamco/cd/kamcoback/upload/dto/UploadDto.java

@@ -43,6 +43,7 @@ public class UploadDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class UploadAddReq {
+
     @Schema(description = "업로드 ID", example = "각데이터의 식별키")
     private String uploadId;
 
@@ -144,6 +145,7 @@ public class UploadDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class uploadDto {
+
     @Schema(description = "업로드 ID", example = "각데이터의 식별키")
     private String uploadId;
 
@@ -189,6 +191,7 @@ public class UploadDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class UploadRes {
+
     private String res;
     private String resMsg;
     private UUID uuid;
@@ -196,6 +199,7 @@ public class UploadDto {
     private String fileName;
     private int chunkIndex;
     private int chunkTotalIndex;
+    private String uploadId;
 
     public double getUploadRate() {
       if (this.chunkTotalIndex == 0) {

src/main/java/com/kamco/cd/kamcoback/upload/service/UploadService.java

@@ -60,7 +60,9 @@ public class UploadService {
     UploadDto.UploadRes upRes = new UploadDto.UploadRes();
 
     long datasetId = 0;
-    if (upAddReqDto.getDatasetId() != null) datasetId = upAddReqDto.getDatasetId();
+    if (upAddReqDto.getDatasetId() != null) {
+      datasetId = upAddReqDto.getDatasetId();
+    }
     String uploadId = System.currentTimeMillis() + "";
     // UUID uuid = UUID.randomUUID();
     UUID uuid = upAddReqDto.getUuid();
@@ -86,7 +88,9 @@ public class UploadService {
 
     // 세션 신규,중복체크(초기화 포함)
     UploadDto.uploadDto dto = this.checkUploadSession(upAddReqDto, upRes);
-    if (!upRes.getRes().equals("success")) return upRes;
+    if (!upRes.getRes().equals("success")) {
+      return upRes;
+    }
 
     status = FileUploadStatus.UPLOADING.name();
     upAddReqDto.setStatus(status);
@@ -97,7 +101,9 @@ public class UploadService {
     }
 
     // 폴더 생성 및 체크
-    if (!checkChunkFoler(upRes, tmpDataSetDir, fianlDir)) return upRes;
+    if (!checkChunkFoler(upRes, tmpDataSetDir, fianlDir)) {
+      return upRes;
+    }
 
     // chunk저장하기
     if (!FIleChecker.multipartChunkSaveTo(file, tmpDataSetDir, chunkIndex)) {
@@ -232,7 +238,10 @@ public class UploadService {
       uploadSessionCoreService.updateUploadSessionStatus(upAddReqDto);
     }
 
-    if (dto != null) upRes.setUuid(dto.getUuid());
+    if (dto != null) {
+      upRes.setUuid(dto.getUuid());
+      upRes.setUploadId(dto.getUploadId());
+    }
 
     upRes.setChunkIndex(upAddReqDto.getChunkIndex());
     upRes.setChunkTotalIndex(upAddReqDto.getChunkTotalIndex());