모델관리수정, chunk샘플페이지수정

src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java

@@ -1,12 +1,19 @@
 package com.kamco.cd.kamcoback.model.service;
 
+import com.kamco.cd.kamcoback.common.utils.FIleChecker;
+import com.kamco.cd.kamcoback.common.utils.FIleChecker.Basic;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
+import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.FilesDto;
+import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.SrchFilesDto;
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelMetricAddReq;
+import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelUploadResDto;
 import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService;
 import com.kamco.cd.kamcoback.upload.dto.UploadDto;
 import com.kamco.cd.kamcoback.upload.service.UploadService;
+import java.io.IOException;
 import java.time.LocalDate;
+import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -63,6 +70,8 @@ public class ModelMngService {
   public ApiResponseDto.ResponseObj insertModel(ModelMngDto.AddReq addReq) {
     UUID uuid = UUID.randomUUID();
     addReq.setUuid(uuid);
+    addReq.setClsModelVersion(addReq.getModelVer());
+    addReq.setPriority(0L);
     Long modelUid = modelMngCoreService.insertModel(addReq);
 
     ModelMetricAddReq modelMetricAddReq = new ModelMetricAddReq();
@@ -74,15 +83,80 @@ public class ModelMngService {
     modelMetricAddReq.setLoss(0);
     modelMetricAddReq.setIou(0);
 
+
     modelMngCoreService.insertModelResultMetric(modelMetricAddReq);
 
     return new ApiResponseDto.ResponseObj(ApiResponseDto.ApiResponseCode.OK, "등록되었습니다.");
   }
 
-  public UploadDto.UploadRes uploadChunkModelFile(
+  public ModelUploadResDto uploadChunkModelFile(
       UploadDto.UploadAddReq upAddReqDto, MultipartFile chunkFile) {
-    UploadDto.UploadRes upRes = uploadService.uploadChunk(upAddReqDto, chunkFile);
+      UploadDto.UploadRes upRes = uploadService.uploadChunk(upAddReqDto, chunkFile);
 
-    return upRes;
+
+      ModelUploadResDto modelUploadResDto = new ModelUploadResDto();
+      modelUploadResDto.setRes(upRes.getRes());
+      modelUploadResDto.setResMsg(upRes.getResMsg());
+      modelUploadResDto.setUuid(upRes.getUuid());
+      modelUploadResDto.setFilePath(upRes.getFilePath());
+      modelUploadResDto.setFileName(upRes.getFileName());
+      modelUploadResDto.setChunkIndex(upRes.getChunkIndex());
+      modelUploadResDto.setChunkTotalIndex(upRes.getChunkTotalIndex());
+      //압축풀기 (String zipFilePath, String destDirectory)
+
+    if( upRes.getChunkIndex() == upRes.getChunkTotalIndex() ) {
+      try {
+        FIleChecker.unzip(upRes.getFileName(), upRes.getFilePath());
+
+        this.getUnzipModelFiles(upRes.getFilePath(), modelUploadResDto);
+
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+
+
+
+    return modelUploadResDto;
+  }
+
+  public ModelUploadResDto getUnzipModelFiles(String dirPath, ModelUploadResDto modelUploadResDto) {
+
+    //String dirPath = srchDto.getDirPath();
+    int startPos = 0;
+    int endPos = 20;
+
+    List<Basic> files =
+      FIleChecker.getFilesFromAllDepth(
+        dirPath,
+        "*",
+        "pth,py",
+        10,
+        "name",
+        startPos,
+        endPos);
+
+    for (Basic dto : files) {
+      // 예: 파일명 출력 및 추가 작업
+      String foldNm = dto.getFullPath().replace(dto.getFileNm(), "");
+
+      if( dto.getExtension().equals("pth") ) {
+        modelUploadResDto.setCdModelPath(foldNm);
+        modelUploadResDto.setCdModelFileName(dto.getFileNm());
+      }else if( dto.getExtension().equals("py") ) {
+        modelUploadResDto.setCdModelConfigPath(foldNm);
+        modelUploadResDto.setCdModelConfigFileName(dto.getFileNm());
+      }else if( dto.getExtension().equals("json") ) {
+        modelUploadResDto.setClsModelPath(foldNm);
+        modelUploadResDto.setClsModelFileName(dto.getFileNm());
+      }
+
+    }
+
+    //int fileListPos = 0;
+    //int fileTotCnt = files.size();
+    //long fileTotSize = FIleChecker.getFileTotSize(files);
+
+    return modelUploadResDto;
   }
 }