./gradlew :spotlessApply 실행

2025-11-26 10:13:11 +09:00
parent 51a9f18af2
commit e96cff6ea5
54 changed files with 2095 additions and 2214 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java
+++ b/src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java
@@ -2,7 +2,6 @@ package com.kamco.cd.kamcoback.model;

 import com.kamco.cd.kamcoback.code.dto.CommonCodeDto;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
-import com.kamco.cd.kamcoback.log.dto.AuditLogDto;
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
 import com.kamco.cd.kamcoback.model.dto.ModelVerDto;
 import com.kamco.cd.kamcoback.model.service.ModelMngService;
@@ -13,13 +12,12 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.transaction.Transactional;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;

@Tag(name = "모델 관리", description = "모델 관리 API")
@RequiredArgsConstructor
@@ -32,17 +30,17 @@ public class ModelMngApiController {

  @Operation(summary = "목록 조회", description = "모든 모델 조회")
  @ApiResponses(
-    value = {
-      @ApiResponse(
-        responseCode = "200",
-        description = "조회 성공",
-        content =
-        @Content(
-          mediaType = "application/json",
-          schema = @Schema(implementation = CommonCodeDto.Basic.class))),
-      @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
-      @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-    })
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "조회 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = CommonCodeDto.Basic.class))),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
  @GetMapping
  public ApiResponseDto<List<ModelMngDto.Basic>> getFindAll() {
    return ApiResponseDto.ok(modelMngService.findModelMngAll());
@@ -50,6 +48,7 @@ public class ModelMngApiController {

  /**
   * 최종 등록 모델 정보
+   *
   * @return ModelMngDto.FinalModelDto
   */
  @Operation(summary = "최종 등록 모델 조회", description = "최종 등록 모델 조회")
@@ -60,6 +59,7 @@ public class ModelMngApiController {

  /**
   * 모델 등록 => 모델, 버전 동시 등록 (UI 상 따로 등록하는 곳 없음)
+   *
   * @param addReq 모델 입력 값
   * @return ModelVerDto.Basic
   */
@@ -71,7 +71,8 @@ public class ModelMngApiController {

  @Operation(summary = "모델 수정", description = "모델 수정")
  @PutMapping("/{id}")
-  public ApiResponseDto<Long> update(@PathVariable Long id, @RequestBody ModelMngDto.AddReq addReq) {
+  public ApiResponseDto<Long> update(
+      @PathVariable Long id, @RequestBody ModelMngDto.AddReq addReq) {
    return ApiResponseDto.ok(modelMngService.update(id, addReq));
  }

@@ -84,19 +85,19 @@ public class ModelMngApiController {
  @Operation(summary = "모델 등록 이력", description = "모델 등록 이력")
  @GetMapping("/reg-history")
  public ApiResponseDto<Page<ModelMngDto.ModelRegHistory>> getRegHistoryList(
-    @RequestParam(required = false) LocalDate startDate,
-    @RequestParam(required = false) LocalDate endDate,
-    @RequestParam int page,
-    @RequestParam(defaultValue = "20") int size,
-    @RequestParam(required = false) String searchVal,
-    @RequestParam(required = false) String searchColumn
-  ) {
+      @RequestParam(required = false) LocalDate startDate,
+      @RequestParam(required = false) LocalDate endDate,
+      @RequestParam int page,
+      @RequestParam(defaultValue = "20") int size,
+      @RequestParam(required = false) String searchVal,
+      @RequestParam(required = false) String searchColumn) {
    ModelMngDto.searchReq searchReq =
-      new ModelMngDto.searchReq(page, size, Optional.ofNullable(searchColumn).orElse("createdDate") + ",desc");
-      //searchColumn:: Entity 컬럼명칭으로 -> 기본값 = 등록일 createdDate, (선택) 배포일 deployDttm
+        new ModelMngDto.searchReq(
+            page, size, Optional.ofNullable(searchColumn).orElse("createdDate") + ",desc");
+    // searchColumn:: Entity 컬럼명칭으로 -> 기본값 = 등록일 createdDate, (선택) 배포일 deployDttm

    Page<ModelMngDto.ModelRegHistory> result =
-      modelMngService.getRegHistoryList(searchReq, startDate, endDate, searchVal);
+        modelMngService.getRegHistoryList(searchReq, startDate, endDate, searchVal);

    return ApiResponseDto.ok(result);
  }
--- a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java
@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.model.dto;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
+import java.time.ZonedDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -11,8 +12,6 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;

-import java.time.ZonedDateTime;
-
 public class ModelMngDto {

  @Schema(name = "ModelMng Basic", description = "모델관리 엔티티 기본 정보")
@@ -24,26 +23,23 @@ public class ModelMngDto {
    private final String modelCate;
    private final String modelPath;

-    @JsonFormatDttm
-    private final ZonedDateTime createdDttm;
+    @JsonFormatDttm private final ZonedDateTime createdDttm;
    private final Long createdUid;

-    @JsonFormatDttm
-    private final ZonedDateTime updatedDttm;
+    @JsonFormatDttm private final ZonedDateTime updatedDttm;
    private final Long updatedUid;
    private final String modelCntnt;

    public Basic(
-      Long id,
-      String modelNm,
-      String modelCate,
-      String modelPath,
-      ZonedDateTime createdDttm,
-      Long createdUid,
-      ZonedDateTime updatedDttm,
-      Long updatedUid,
-      String modelCntnt
-    ) {
+        Long id,
+        String modelNm,
+        String modelCate,
+        String modelPath,
+        ZonedDateTime createdDttm,
+        Long createdUid,
+        ZonedDateTime updatedDttm,
+        Long updatedUid,
+        String modelCntnt) {
      this.id = id;
      this.modelNm = modelNm;
      this.modelCate = modelCate;
@@ -70,8 +66,17 @@ public class ModelMngDto {
    private final String deployState;
    private final String modelPath;

-    public FinalModelDto(Long modelUid, String modelNm, String modelCate, Long modelVerUid, String modelVer,
-        String usedState, String modelState, Double qualityProb, String deployState, String modelPath) {
+    public FinalModelDto(
+        Long modelUid,
+        String modelNm,
+        String modelCate,
+        Long modelVerUid,
+        String modelVer,
+        String usedState,
+        String modelState,
+        Double qualityProb,
+        String deployState,
+        String modelPath) {
      this.modelUid = modelUid;
      this.modelNm = modelNm;
      this.modelCate = modelCate;
@@ -117,7 +122,7 @@ public class ModelMngDto {
        String[] sortParams = sort.split(",");
        String property = sortParams[0];
        Sort.Direction direction =
-          sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
+            sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
        return PageRequest.of(page, size, Sort.by(direction, property));
      }
      return PageRequest.of(page, size);
--- a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelVerDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelVerDto.java
@@ -2,13 +2,8 @@ package com.kamco.cd.kamcoback.model.dto;

 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
 import java.time.ZonedDateTime;
+import lombok.Getter;

 public class ModelVerDto {

@@ -28,29 +23,26 @@ public class ModelVerDto {
    private final String deployState;
    private final String modelPath;

-    @JsonFormatDttm
-    private final ZonedDateTime createdDttm;
+    @JsonFormatDttm private final ZonedDateTime createdDttm;
    private final Long createdUid;

-    @JsonFormatDttm
-    private final ZonedDateTime updatedDttm;
+    @JsonFormatDttm private final ZonedDateTime updatedDttm;
    private final Long updatedUid;

    public Basic(
-      Long id,
-      Long modelUid,
-      String modelCate,
-      String modelVer,
-      String usedState,
-      String modelState,
-      Double qualityProb,
-      String deployState,
-      String modelPath,
-      ZonedDateTime createdDttm,
-      Long createdUid,
-      ZonedDateTime updatedDttm,
-      Long updatedUid
-    ) {
+        Long id,
+        Long modelUid,
+        String modelCate,
+        String modelVer,
+        String usedState,
+        String modelState,
+        Double qualityProb,
+        String deployState,
+        String modelPath,
+        ZonedDateTime createdDttm,
+        Long createdUid,
+        ZonedDateTime updatedDttm,
+        Long updatedUid) {
      this.id = id;
      this.modelUid = modelUid;
      this.modelCate = modelCate;
@@ -66,5 +58,4 @@ public class ModelVerDto {
      this.updatedUid = updatedUid;
    }
  }
-
 }
--- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java
@@ -1,18 +1,16 @@
 package com.kamco.cd.kamcoback.model.service;

-import com.kamco.cd.kamcoback.log.dto.AuditLogDto;
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
 import com.kamco.cd.kamcoback.model.dto.ModelVerDto;
 import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

-import java.time.LocalDate;
-import java.util.List;
-import java.util.Optional;
-
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
@@ -20,7 +18,7 @@ public class ModelMngService {

  private final ModelMngCoreService modelMngCoreService;

-  public List<ModelMngDto.Basic> findModelMngAll(){
+  public List<ModelMngDto.Basic> findModelMngAll() {
    return modelMngCoreService.findModelMngAll();
  }

@@ -40,7 +38,8 @@ public class ModelMngService {
    return modelMngCoreService.delete(id);
  }

-  public Page<ModelMngDto.ModelRegHistory> getRegHistoryList(ModelMngDto.searchReq searchReq, LocalDate startDate, LocalDate endDate, String searchVal) {
+  public Page<ModelMngDto.ModelRegHistory> getRegHistoryList(
+      ModelMngDto.searchReq searchReq, LocalDate startDate, LocalDate endDate, String searchVal) {
    return modelMngCoreService.getRegHistoryList(searchReq, startDate, endDate, searchVal);
  }
 }