./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/inference/InferenceResultApiController.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java
@@ -4,7 +4,6 @@ import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Dashboard;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Detail;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.SearchReq;
 import com.kamco.cd.kamcoback.inference.service.InferenceResultService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -29,132 +28,125 @@ public class InferenceResultApiController {

  private final InferenceResultService inferenceResultService;

-  @Operation(
-    summary = "추론관리 분석결과 목록 조회",
-    description =
-      "분석상태, 제목으로 분석결과를 조회 합니다.")
+  @Operation(summary = "추론관리 분석결과 목록 조회", description = "분석상태, 제목으로 분석결과를 조회 합니다.")
  @ApiResponses(
-    value = {
-      @ApiResponse(
-        responseCode = "200",
-        description = "검색 성공",
-        content =
-        @Content(
-          mediaType = "application/json",
-          schema = @Schema(implementation = Page.class))),
-      @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
-      @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-    })
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "검색 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Page.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
  @GetMapping("/list")
  public ApiResponseDto<Page<InferenceResultDto.AnalResList>> getInferenceResultList(
-    @Parameter(description = "분석상태", example = "0000")
-    @RequestParam(required = false)
-    String statCode,
-    @Parameter(description = "제목", example = "2023_2024년도") @RequestParam(required = false)
-    String title,
-    @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
-    int page,
-    @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
-    int size,
-    @Parameter(description = "정렬 조건 (형식: 필드명,방향)", example = "name,asc")
-    @RequestParam(required = false)
-      String sort
-  ) {
-    InferenceResultDto.SearchReq searchReq = new InferenceResultDto.SearchReq(statCode, title, page, size, sort);
-    Page<InferenceResultDto.AnalResList> analResList = inferenceResultService.getInferenceResultList(searchReq);
+      @Parameter(description = "분석상태", example = "0000") @RequestParam(required = false)
+          String statCode,
+      @Parameter(description = "제목", example = "2023_2024년도") @RequestParam(required = false)
+          String title,
+      @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
+          int page,
+      @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
+          int size,
+      @Parameter(description = "정렬 조건 (형식: 필드명,방향)", example = "name,asc")
+          @RequestParam(required = false)
+          String sort) {
+    InferenceResultDto.SearchReq searchReq =
+        new InferenceResultDto.SearchReq(statCode, title, page, size, sort);
+    Page<InferenceResultDto.AnalResList> analResList =
+        inferenceResultService.getInferenceResultList(searchReq);
    return ApiResponseDto.ok(analResList);
  }

-  @Operation(
-    summary = "추론관리 분석결과 요약정보",
-    description =
-      "분석결과 요약정보를 조회합니다.")
+  @Operation(summary = "추론관리 분석결과 요약정보", description = "분석결과 요약정보를 조회합니다.")
  @ApiResponses(
-    value = {
-      @ApiResponse(
-        responseCode = "200",
-        description = "검색 성공",
-        content =
-        @Content(
-          mediaType = "application/json",
-          schema = @Schema(implementation = InferenceResultDto.AnalResSummary.class))),
-      @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
-      @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-    })
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "검색 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = InferenceResultDto.AnalResSummary.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
  @GetMapping("/summary")
  public ApiResponseDto<InferenceResultDto.AnalResSummary> getInferenceResultSummary(
-    @Parameter(description = "목록 id", example = "1")
-    @RequestParam Long id) {
+      @Parameter(description = "목록 id", example = "1") @RequestParam Long id) {
    return ApiResponseDto.ok(inferenceResultService.getInferenceResultSummary(id));
  }

-
-  @Operation(
-    summary = "추론관리 분석결과 상세",
-    description =
-      "분석결과 상제 정보 Summary, DashBoard")
+  @Operation(summary = "추론관리 분석결과 상세", description = "분석결과 상제 정보 Summary, DashBoard")
  @ApiResponses(
-    value = {
-      @ApiResponse(
-        responseCode = "200",
-        description = "검색 성공",
-        content =
-        @Content(
-          mediaType = "application/json",
-          schema = @Schema(implementation = InferenceResultDto.Detail.class))),
-      @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
-      @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-    })
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "검색 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = InferenceResultDto.Detail.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
  @GetMapping("/detail")
  public ApiResponseDto<InferenceResultDto.Detail> getInferenceDetail(
-    @Parameter(description = "목록 id", example = "1")
-    @RequestParam Long id) {
+      @Parameter(description = "목록 id", example = "1") @RequestParam Long id) {
    // summary
-    InferenceResultDto.AnalResSummary summary = inferenceResultService.getInferenceResultSummary(id);
-    //dashBoard
+    InferenceResultDto.AnalResSummary summary =
+        inferenceResultService.getInferenceResultSummary(id);
+    // dashBoard
    List<InferenceResultDto.Dashboard> dashboardList = this.getInferenceResultDashboard(id);
    return ApiResponseDto.ok(new Detail(summary, dashboardList));
  }

-  @Operation(
-    summary = "추론관리 분석결과 상세 목록",
-    description =
-      "추론관리 분석결과 상세 목록 geojson 데이터 조회")
+  @Operation(summary = "추론관리 분석결과 상세 목록", description = "추론관리 분석결과 상세 목록 geojson 데이터 조회")
  @ApiResponses(
-    value = {
-      @ApiResponse(
-        responseCode = "200",
-        description = "검색 성공",
-        content =
-        @Content(
-          mediaType = "application/json",
-          schema = @Schema(implementation = Page.class))),
-      @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
-      @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-    })
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "검색 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Page.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
  @GetMapping("/geom")
  public ApiResponseDto<Page<InferenceResultDto.Geom>> getInferenceResultGeomList(
-    @Parameter(description = "기준년도 분류", example = "0001") @RequestParam(required = false) String targetClass,
-    @Parameter(description = "비교년도 분류", example = "0002") @RequestParam(required = false) String compareClass,
-    @Parameter(description = "5000:1 도협번호 37801011,37801012") @RequestParam(required = false) List<Long> mapSheetNum,
-    @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0") int page,
-    @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20") int size,
-    @Parameter(description = "정렬 조건 (형식: 필드명,방향)", example = "name,asc") @RequestParam(required = false) String sort
-  ) {
-    InferenceResultDto.SearchGeoReq searchGeoReq = new InferenceResultDto.SearchGeoReq(targetClass, compareClass, mapSheetNum, page, size, sort);
-    Page<InferenceResultDto.Geom> geomList = inferenceResultService.getInferenceResultGeomList(searchGeoReq);
+      @Parameter(description = "기준년도 분류", example = "0001") @RequestParam(required = false)
+          String targetClass,
+      @Parameter(description = "비교년도 분류", example = "0002") @RequestParam(required = false)
+          String compareClass,
+      @Parameter(description = "5000:1 도협번호 37801011,37801012") @RequestParam(required = false)
+          List<Long> mapSheetNum,
+      @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
+          int page,
+      @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
+          int size,
+      @Parameter(description = "정렬 조건 (형식: 필드명,방향)", example = "name,asc")
+          @RequestParam(required = false)
+          String sort) {
+    InferenceResultDto.SearchGeoReq searchGeoReq =
+        new InferenceResultDto.SearchGeoReq(
+            targetClass, compareClass, mapSheetNum, page, size, sort);
+    Page<InferenceResultDto.Geom> geomList =
+        inferenceResultService.getInferenceResultGeomList(searchGeoReq);
    return ApiResponseDto.ok(geomList);
  }

  /**
   * 분석결과 상세 대시보드 조회
+   *
   * @param id
   * @return
   */
  private List<Dashboard> getInferenceResultDashboard(Long id) {
    return inferenceResultService.getInferenceResultBasic(id);
  }
-
-
-
 }
--- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java
@@ -8,7 +8,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -23,23 +22,20 @@ public class InferenceResultDto {
    private String dataName;
    private Long mapSheepNum;
    private Long detectingCnt;
-    @JsonFormatDttm
-    private ZonedDateTime analStrtDttm;
-    @JsonFormatDttm
-    private ZonedDateTime analEndDttm;
+    @JsonFormatDttm private ZonedDateTime analStrtDttm;
+    @JsonFormatDttm private ZonedDateTime analEndDttm;
    private Long analSec;
    private String analState;

    public Basic(
-      Long id,
-      String dataName,
-      Long mapSheepNum,
-      Long detectingCnt,
-      ZonedDateTime analStrtDttm,
-      ZonedDateTime analEndDttm,
-      Long analSec,
-      String analState
-    ) {
+        Long id,
+        String dataName,
+        Long mapSheepNum,
+        Long detectingCnt,
+        ZonedDateTime analStrtDttm,
+        ZonedDateTime analEndDttm,
+        Long analSec,
+        String analState) {
      this.id = id;
      this.dataName = dataName;
      this.mapSheepNum = mapSheepNum;
@@ -58,10 +54,8 @@ public class InferenceResultDto {
    private String analTitle;
    private String analMapSheet;
    private Long detectingCnt;
-    @JsonFormatDttm
-    private ZonedDateTime analStrtDttm;
-    @JsonFormatDttm
-    private ZonedDateTime analEndDttm;
+    @JsonFormatDttm private ZonedDateTime analStrtDttm;
+    @JsonFormatDttm private ZonedDateTime analEndDttm;
    private Long analSec;
    private Long analPredSec;
    private String analState;
@@ -69,18 +63,17 @@ public class InferenceResultDto {
    private String gukyuinUsed;

    public AnalResList(
-      Long id,
-      String analTitle,
-      String analMapSheet,
-      Long detectingCnt,
-      ZonedDateTime analStrtDttm,
-      ZonedDateTime analEndDttm,
-      Long analSec,
-      Long analPredSec,
-      String analState,
-      String analStateNm,
-      String gukyuinUsed
-    ) {
+        Long id,
+        String analTitle,
+        String analMapSheet,
+        Long detectingCnt,
+        ZonedDateTime analStrtDttm,
+        ZonedDateTime analEndDttm,
+        Long analSec,
+        Long analPredSec,
+        String analState,
+        String analStateNm,
+        String gukyuinUsed) {
      this.id = id;
      this.analTitle = analTitle;
      this.analMapSheet = analMapSheet;
@@ -103,10 +96,8 @@ public class InferenceResultDto {
    private Integer targetYyyy;
    private Integer compareYyyy;
    private String analMapSheet;
-    @JsonFormatDttm
-    private ZonedDateTime analStrtDttm;
-    @JsonFormatDttm
-    private ZonedDateTime analEndDttm;
+    @JsonFormatDttm private ZonedDateTime analStrtDttm;
+    @JsonFormatDttm private ZonedDateTime analEndDttm;
    private Long analSec;
    private Long analPredSec;
    private String resultUrl;
@@ -116,21 +107,20 @@ public class InferenceResultDto {
    private String analStateNm;

    public AnalResSummary(
-      Long id,
-      String modelInfo,
-      Integer targetYyyy,
-      Integer compareYyyy,
-      String analMapSheet,
-      ZonedDateTime analStrtDttm,
-      ZonedDateTime analEndDttm,
-      Long analSec,
-      Long analPredSec,
-      String resultUrl,
-      Long detectingCnt,
-      Double accuracy,
-      String analState,
-      String analStateNm
-    ) {
+        Long id,
+        String modelInfo,
+        Integer targetYyyy,
+        Integer compareYyyy,
+        String analMapSheet,
+        ZonedDateTime analStrtDttm,
+        ZonedDateTime analEndDttm,
+        Long analSec,
+        Long analPredSec,
+        String resultUrl,
+        Long detectingCnt,
+        Double accuracy,
+        String analState,
+        String analStateNm) {
      this.id = id;
      this.modelInfo = modelInfo;
      this.targetYyyy = targetYyyy;
@@ -157,30 +147,27 @@ public class InferenceResultDto {
    String classAfterName;
    Long classBeforeCnt;
    Long classAfterCnt;
-    @JsonFormatDttm
-    ZonedDateTime createdDttm;
+    @JsonFormatDttm ZonedDateTime createdDttm;
    Long createdUid;
-    @JsonFormatDttm
-    ZonedDateTime updatedDttm;
+    @JsonFormatDttm ZonedDateTime updatedDttm;
    Long updatedUid;
    Long refMapSheetNum;
    Long dataUid;

    public Dashboard(
-      Integer compareYyyy,
-      Integer targetYyyy,
-      Long mapSheetNum,
-      String classBeforeName,
-      String classAfterName,
-      Long classBeforeCnt,
-      Long classAfterCnt,
-      ZonedDateTime createdDttm,
-      Long createdUid,
-      ZonedDateTime updatedDttm,
-      Long updatedUid,
-      Long refMapSheetNum,
-      Long dataUid
-    ) {
+        Integer compareYyyy,
+        Integer targetYyyy,
+        Long mapSheetNum,
+        String classBeforeName,
+        String classAfterName,
+        Long classBeforeCnt,
+        Long classAfterCnt,
+        ZonedDateTime createdDttm,
+        Long createdUid,
+        ZonedDateTime updatedDttm,
+        Long updatedUid,
+        Long refMapSheetNum,
+        Long dataUid) {
      this.compareYyyy = compareYyyy;
      this.targetYyyy = targetYyyy;
      this.mapSheetNum = mapSheetNum;
@@ -202,10 +189,7 @@ public class InferenceResultDto {
    AnalResSummary summary;
    List<Dashboard> dashboard;

-    public Detail(
-      AnalResSummary summary,
-      List<Dashboard> dashboard
-    ) {
+    public Detail(AnalResSummary summary, List<Dashboard> dashboard) {
      this.summary = summary;
      this.dashboard = dashboard;
    }
@@ -224,16 +208,15 @@ public class InferenceResultDto {
    Long mapSheetNum;

    public Geom(
-      Integer compareYyyy,
-      Integer targetYyyy,
-      String classBeforeCd,
-      String classBeforeName,
-      Double classBeforeProb,
-      String classAfterCd,
-      String classAfterName,
-      Double classAfterProb,
-      Long mapSheetNum
-    ) {
+        Integer compareYyyy,
+        Integer targetYyyy,
+        String classBeforeCd,
+        String classBeforeName,
+        Double classBeforeProb,
+        String classAfterCd,
+        String classAfterName,
+        Double classAfterProb,
+        Long mapSheetNum) {
      this.compareYyyy = compareYyyy;
      this.targetYyyy = targetYyyy;
      this.classBeforeCd = classBeforeCd;
@@ -246,9 +229,6 @@ public class InferenceResultDto {
    }
  }

-
-
-
  @Schema(name = "InferenceResultSearchReq", description = "분석결과 목록 요청 정보")
  @Getter
  @Setter
@@ -270,7 +250,7 @@ public class InferenceResultDto {
        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);
@@ -288,7 +268,7 @@ public class InferenceResultDto {
    private String targetClass;
    // 비교년도
    private String compareClass;
-    //분석도엽
+    // 분석도엽
    private List<Long> mapSheetNum;

    // 페이징 파라미터
@@ -301,7 +281,7 @@ public class InferenceResultDto {
        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/inference/service/InferenceResultService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
@@ -1,7 +1,6 @@
 package com.kamco.cd.kamcoback.inference.service;

 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Basic;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Dashboard;
 import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
 import java.util.List;
@@ -19,15 +18,18 @@ public class InferenceResultService {

  /**
   * 추론관리 > 분석결과 목록 조회
+   *
   * @param searchReq
   * @return
   */
-  public Page<InferenceResultDto.AnalResList> getInferenceResultList(InferenceResultDto.SearchReq searchReq) {
+  public Page<InferenceResultDto.AnalResList> getInferenceResultList(
+      InferenceResultDto.SearchReq searchReq) {
    return inferenceResultCoreService.getInferenceResultList(searchReq);
  }

  /**
   * 분석결과 요약정보
+   *
   * @param id
   * @return
   */
@@ -37,6 +39,7 @@ public class InferenceResultService {

  /**
   * 분석결과 대시보드 조회
+   *
   * @param id
   * @return
   */
@@ -46,12 +49,12 @@ public class InferenceResultService {

  /**
   * 분석결과 상세 목록
+   *
   * @param searchGeoReq
   * @return
   */
-  public Page<InferenceResultDto.Geom> getInferenceResultGeomList(InferenceResultDto.SearchGeoReq searchGeoReq) {
+  public Page<InferenceResultDto.Geom> getInferenceResultGeomList(
+      InferenceResultDto.SearchGeoReq searchGeoReq) {
    return inferenceResultCoreService.getInferenceResultGeomList(searchGeoReq);
  }
-
-
 }