Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201

2026-01-05 13:36:36 +09:00
parent 8c149605e5 6d8b3edf7b
commit 6d2d21b221
7 changed files with 389 additions and 96 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java
+++ b/src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java
@@ -1,9 +1,10 @@
 package com.kamco.cd.kamcoback.label;

-import com.kamco.cd.kamcoback.code.dto.CommonCodeDto;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
+import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.ChangeDetectYear;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
+import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngSearchReq;
 import com.kamco.cd.kamcoback.label.service.LabelWorkService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -13,10 +14,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
 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 java.util.List;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +34,24 @@ public class LabelWorkerApiController {

  private final LabelWorkService labelWorkService;

+  @Operation(summary = "변화탐지 년도 셀렉트박스 조회", description = "라벨링작업 관리 > 목록 조회 변화탐지 년도 셀렉트박스 조회")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "조회 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = ChangeDetectYear.class))),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @GetMapping("/change-detect-year")
+  public ApiResponseDto<List<ChangeDetectYear>> getChangeDetectYear() {
+    return ApiResponseDto.ok(labelWorkService.getChangeDetectYear());
+  }
+
  @Operation(summary = "라벨링작업 관리 > 목록 조회", description = "라벨링작업 관리 > 목록 조회")
  @ApiResponses(
      value = {
@@ -39,26 +61,45 @@ public class LabelWorkerApiController {
            content =
                @Content(
                    mediaType = "application/json",
-                    schema = @Schema(implementation = CommonCodeDto.Basic.class))),
+                    schema = @Schema(implementation = Page.class))),
        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
      })
  @GetMapping("/label-work-mng-list")
  public ApiResponseDto<Page<LabelWorkMng>> labelWorkMngList(
-      @Parameter(description = "변화탐지년도", example = "2024") @RequestParam(required = false)
-          Integer detectYyyy,
-      @Parameter(description = "시작일", example = "20260101") @RequestParam String strtDttm,
+      @Parameter(description = "변화탐지년도", example = "2022-2024") @RequestParam(required = false)
+          String detectYear,
+      @Parameter(description = "시작일", example = "20220101") @RequestParam String strtDttm,
      @Parameter(description = "종료일", example = "20261201") @RequestParam String endDttm,
      @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
          int page,
      @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
          int size) {
    LabelWorkDto.LabelWorkMngSearchReq searchReq = new LabelWorkMngSearchReq();
-    searchReq.setDetectYyyy(detectYyyy);
+    searchReq.setDetectYear(detectYear);
    searchReq.setStrtDttm(strtDttm);
    searchReq.setEndDttm(endDttm);
    searchReq.setPage(page);
    searchReq.setSize(size);
    return ApiResponseDto.ok(labelWorkService.labelWorkMngList(searchReq));
  }
+
+  @Operation(summary = "라벨링작업 관리 > 작업 배정 정보조회", description = "작업 배정 정보조회")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "조회 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = LabelWorkMngDetail.class))),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @GetMapping("/label-work-mng-detail/{uuid}")
+  public ApiResponseDto<LabelWorkMngDetail> labelWorkMngDetail(
+      @Parameter(description = "uuid") @PathVariable UUID uuid) {
+    return ApiResponseDto.ok(labelWorkService.findLabelWorkMngDetail(uuid));
+  }
 }
--- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java
@@ -1,10 +1,12 @@
 package com.kamco.cd.kamcoback.label.dto;

+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.kamco.cd.kamcoback.common.utils.enums.Enums;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.ZonedDateTime;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -14,6 +16,15 @@ import org.springframework.data.domain.Pageable;

 public class LabelWorkDto {

+  @Getter
+  @Setter
+  @AllArgsConstructor
+  public static class ChangeDetectYear {
+
+    private String code;
+    private String name;
+  }
+
  @Schema(name = "LabelWorkMng", description = "라벨작업관리")
  @Getter
  @Setter
@@ -21,8 +32,9 @@ public class LabelWorkDto {
  @AllArgsConstructor
  public static class LabelWorkMng {

-    private int compareYyyy;
-    private int targetYyyy;
+    private UUID uuid;
+    private Integer compareYyyy;
+    private Integer targetYyyy;
    private int stage;
    @JsonFormatDttm private ZonedDateTime createdDttm;
    private Long detectionTotCnt;
@@ -32,6 +44,14 @@ public class LabelWorkDto {
    private Long labelCompleteTotCnt;
    @JsonFormatDttm private ZonedDateTime labelStartDttm;

+    @JsonProperty("detectYear")
+    public String getDetectYear() {
+      if (compareYyyy == null || targetYyyy == null) {
+        return null;
+      }
+      return compareYyyy + "-" + targetYyyy;
+    }
+
    public String getLabelState() {

      String mngState = "PENDING";
@@ -65,6 +85,20 @@ public class LabelWorkDto {
    }
  }

+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  public static class LabelWorkMngDetail {
+
+    private String detectionYear;
+    private Integer stage;
+    @JsonFormatDttm private ZonedDateTime createdDttm;
+    private Long labelTotCnt;
+    private Long labeler;
+    private Long reviewer;
+  }
+
  @Schema(name = "LabelWorkMngSearchReq", description = "라벨작업관리 검색 요청")
  @Getter
  @Setter
@@ -80,7 +114,7 @@ public class LabelWorkDto {
    private int size = 20;

    @Schema(description = "변화탐지년도", example = "2024")
-    private Integer detectYyyy;
+    private String detectYear;

    @Schema(description = "시작일", example = "20260101")
    private String strtDttm;
--- a/src/main/java/com/kamco/cd/kamcoback/label/service/LabelWorkService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/label/service/LabelWorkService.java
@@ -1,24 +1,52 @@
 package com.kamco.cd.kamcoback.label.service;

 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
+import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.ChangeDetectYear;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
+import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
 import com.kamco.cd.kamcoback.postgres.core.LabelWorkCoreService;
+import java.util.List;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
+@RequiredArgsConstructor
+@Transactional(rollbackFor = Exception.class)
 public class LabelWorkService {

  private final LabelWorkCoreService labelWorkCoreService;

-  public LabelWorkService(LabelWorkCoreService labelWorkCoreService) {
-    this.labelWorkCoreService = labelWorkCoreService;
-  }
-
+  /**
+   * 라벨링작업 관리 목록조회
+   *
+   * @param searchReq
+   * @return
+   */
  public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq) {
-
    return labelWorkCoreService.labelWorkMngList(searchReq);
  }
+
+  /**
+   * 작업배정 정보 조회
+   *
+   * @param uuid
+   * @return
+   */
+  public LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid) {
+    return labelWorkCoreService.findLabelWorkMngDetail(uuid);
+  }
+
+  /**
+   * 변화탐지 셀렉트박스 조회
+   *
+   * @return
+   */
+  public List<ChangeDetectYear> getChangeDetectYear() {
+    return labelWorkCoreService.getChangeDetectYear();
+  }
 }