Prefix 수정

src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java

@@ -12,8 +12,6 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -21,117 +19,115 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-@Tag(name = "추론관리 분석결과", description = "추론관리 분석결과")
-@RequestMapping({"/api/inf/res"})
+@Tag(name = "추론관리", description = "추론관리 API")
+@RequestMapping("/api/inference")
 @RequiredArgsConstructor
 @RestController
 public class InferenceResultApiController {
 
-  private static final Logger logger = LoggerFactory.getLogger(InferenceResultApiController.class);
-
   private final InferenceResultService inferenceResultService;
 
   @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 = "0002") @RequestParam(required = false)
-          String statCode,
-      @Parameter(description = "제목", example = "변화탐지") @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 = "0002") @RequestParam(required = false)
+    String statCode,
+    @Parameter(description = "제목", example = "변화탐지") @RequestParam(required = false) String title,
+    @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
+    int page,
+    @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
+    int size) {
     InferenceResultDto.SearchReq searchReq =
-        new InferenceResultDto.SearchReq(statCode, title, page, size);
+      new InferenceResultDto.SearchReq(statCode, title, page, size);
     Page<InferenceResultDto.AnalResList> analResList =
-        inferenceResultService.getInferenceResultList(searchReq);
+      inferenceResultService.getInferenceResultList(searchReq);
     return ApiResponseDto.ok(analResList);
   }
 
   @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/{id}")
   public ApiResponseDto<InferenceResultDto.AnalResSummary> getInferenceResultSummary(
-      @Parameter(description = "목록 id", example = "53") @PathVariable Long id) {
+    @Parameter(description = "목록 id", example = "53") @PathVariable Long id) {
     return ApiResponseDto.ok(inferenceResultService.getInferenceResultSummary(id));
   }
 
   @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/{id}")
   public ApiResponseDto<InferenceResultDto.Detail> getInferenceDetail(
-      @Parameter(description = "목록 id", example = "53") @PathVariable Long id) {
+    @Parameter(description = "목록 id", example = "53") @PathVariable Long id) {
     return ApiResponseDto.ok(inferenceResultService.getDetail(id));
   }
 
   @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/{id}")
   public ApiResponseDto<Page<InferenceResultDto.Geom>> getInferenceResultGeomList(
-      @Parameter(description = "분석결과 id", example = "53") @PathVariable Long id,
-      @Parameter(description = "기준년도 분류", example = "land") @RequestParam(required = false)
-          String targetClass,
-      @Parameter(description = "비교년도 분류", example = "waste") @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) {
+    @Parameter(description = "분석결과 id", example = "53") @PathVariable Long id,
+    @Parameter(description = "기준년도 분류", example = "land") @RequestParam(required = false)
+    String targetClass,
+    @Parameter(description = "비교년도 분류", example = "waste") @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);
+      new InferenceResultDto.SearchGeoReq(
+        targetClass, compareClass, mapSheetNum, page, size, sort);
     Page<InferenceResultDto.Geom> geomList =
-        inferenceResultService.getInferenceResultGeomList(id, searchGeoReq);
+      inferenceResultService.getInferenceResultGeomList(id, searchGeoReq);
     return ApiResponseDto.ok(geomList);
   }
 }

src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultMngApiController.java

@@ -1,12 +0,0 @@
-package com.kamco.cd.kamcoback.inference;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Tag(name = "추론관리", description = "어드민 홈 > 추론관리 > 분석결과")
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/api/inference")
-public class InferenceResultMngApiController {}

src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultMngDto.java

@@ -1,11 +1,37 @@
 package com.kamco.cd.kamcoback.inference.dto;
 
 import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 
 public class InferenceResultMngDto {
 
+  @Schema(name = "SearchListReq", description = "분석결과 목록 검색 조건")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class SearchListReq {
+
+    // 검색 조건
+    private String applyYn;
+    private String strtDttm;
+    private String endDttm;
+
+    // 페이징 파라미터
+    private int page = 0;
+    private int size = 20;
+
+    public Pageable toPageable() {
+      return PageRequest.of(page, size);
+    }
+  }
+
   @Getter
   @AllArgsConstructor
   public enum DetectOption implements EnumType {