Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201

2026-01-05 12:41:24 +09:00
parent 040aabe95e 96f5a87b1a
commit 49e4346604
9 changed files with 347 additions and 229 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java
+++ b/src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java
@@ -63,7 +63,7 @@ public class LabelAllocateApiController {
      })
  @GetMapping("/admin/workers")
  public ApiResponseDto<WorkerListResponse> getWorkerStatistics(
-      @Parameter(description = "분석 ID (필수)", required = true, example = "3") @RequestParam
+      @Parameter(description = "분석 ID (선택)", example = "3") @RequestParam(required = false)
          Long analUid,
      @Parameter(
              description = "작업자 유형 (선택) - 미입력 시 LABELER로 조회",
@@ -74,11 +74,9 @@ public class LabelAllocateApiController {
                      defaultValue = "LABELER"))
          @RequestParam(required = false)
          String type,
-      @Parameter(description = "작업자 이름 검색 (부분 일치)", example = "김라벨") @RequestParam(required = false)
-          String searchName,
-      @Parameter(description = "작업자 사번 검색 (부분 일치)", example = "1234567")
+      @Parameter(description = "검색어 (작업자 이름 또는 사번으로 검색, 부분 일치)", example = "김라벨")
          @RequestParam(required = false)
-          String searchEmployeeNo,
+          String search,
      @Parameter(
              description = "정렬 조건 (선택) - 미입력 시 이름 오름차순",
              example = "REMAINING_DESC",
@@ -87,19 +85,27 @@ public class LabelAllocateApiController {
                      allowableValues = {
                        "REMAINING_DESC",
                        "REMAINING_ASC",
+                        "COMPLETED_DESC",
+                        "COMPLETED_ASC",
                        "NAME_ASC",
                        "NAME_DESC"
                      },
                      defaultValue = "NAME_ASC"))
          @RequestParam(required = false)
-          String sort) {
+          String sort,
+      @Parameter(description = "페이지 번호 (0부터 시작)", example = "0")
+          @RequestParam(defaultValue = "0")
+          Integer page,
+      @Parameter(description = "페이지 크기", example = "20")
+          @RequestParam(defaultValue = "20")
+          Integer size) {

    // type이 null이면 기본값으로 LABELER 설정
    String workerType = (type == null || type.isEmpty()) ? RoleType.LABELER.name() : type;

    return ApiResponseDto.ok(
        labelAllocateService.getWorkerStatistics(
-            analUid, workerType, searchName, searchEmployeeNo, sort));
+            analUid, workerType, search, sort, page, size));
  }

  @Operation(summary = "라벨링작업 관리 > 작업 배정", description = "라벨링작업 관리 > 작업 배정")
@@ -122,8 +128,6 @@ public class LabelAllocateApiController {

    return ApiResponseDto.okObject(
        labelAllocateService.allocateAsc(
-            dto.getLabelerAutoType(),
-            dto.getInspectorAutoType(),
            dto.getStage(),
            dto.getLabelers(),
            dto.getInspectors(),
@@ -140,13 +144,13 @@ public class LabelAllocateApiController {
      })
  @GetMapping("/stage-detail")
  public ApiResponseDto<InferenceDetail> findInferenceDetail(
-      @Parameter(description = "비교년도", required = true, example = "2022") @RequestParam
-          Integer compareYyyy,
-      @Parameter(description = "기준년도", required = true, example = "2024") @RequestParam
-          Integer targetYyyy,
-      @Parameter(description = "회차", required = true, example = "4") @RequestParam Integer stage) {
-    return ApiResponseDto.ok(
-        labelAllocateService.findInferenceDetail(compareYyyy, targetYyyy, stage));
+      @Parameter(
+              description = "회차 마스터 key",
+              required = true,
+              example = "8584e8d4-53b3-4582-bde2-28a81495a626")
+          @RequestParam
+          String uuid) {
+    return ApiResponseDto.ok(labelAllocateService.findInferenceDetail(uuid));
  }

  @Operation(
@@ -154,14 +158,14 @@ public class LabelAllocateApiController {
      description = "작업현황 관리 > 라벨러 상세 정보, 작업이관 팝업 내 라벨러 상세 정보 동일")
  @GetMapping("/labeler-detail")
  public ApiResponseDto<LabelerDetail> findLabelerDetail(
-      @RequestParam(defaultValue = "01022223333") String userId,
-      @Parameter(description = "비교년도", required = true, example = "2022") @RequestParam
-          Integer compareYyyy,
-      @Parameter(description = "기준년도", required = true, example = "2024") @RequestParam
-          Integer targetYyyy,
-      @Parameter(description = "회차", required = true, example = "4") @RequestParam Integer stage) {
-    return ApiResponseDto.ok(
-        labelAllocateService.findLabelerDetail(userId, compareYyyy, targetYyyy, stage));
+      @RequestParam(defaultValue = "01022223333", required = true) String userId,
+      @Parameter(
+              description = "회차 마스터 key",
+              required = true,
+              example = "8584e8d4-53b3-4582-bde2-28a81495a626")
+          @RequestParam
+          String uuid) {
+    return ApiResponseDto.ok(labelAllocateService.findLabelerDetail(userId, uuid));
  }

  @Operation(summary = "작업현황 관리 > 상세 > 작업 이관", description = "작업현황 관리 > 상세 > 작업 이관")
--- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java
@@ -87,22 +87,13 @@ public class LabelAllocateDto {
  @AllArgsConstructor
  public static class AllocateDto {

-    //    @Schema(description = "분석 ID", example = "3")
-    //    private Long analUid;
-
    @Schema(description = "비교년도", example = "2022", required = true)
    private Integer compareYyyy;

    @Schema(description = "기준년도", example = "2024", required = true)
    private Integer targetYyyy;

-    @Schema(description = "라벨러 자동/수동여부(AUTO/MANUAL)", example = "AUTO")
-    private String labelerAutoType;
-
-    @Schema(description = "검수자 자동/수동여부(AUTO/MANUAL)", example = "AUTO")
-    private String inspectorAutoType;
-
-    @Schema(description = "회차", example = "4")
+    @Schema(description = "회차", example = "4", required = true)
    private Integer stage;

    @Schema(
@@ -130,22 +121,12 @@ public class LabelAllocateDto {
        description = "검수자 할당 목록",
        example =
            """
-          [
-             {
-               "inspectorUid": "K20251216001",
-               "userCount": 1000
-             },
-             {
-                   "inspectorUid": "01022225555",
-                   "userCount": 340
-                 },
-             {
-               "inspectorUid": "K20251212001",
-               "userCount": 500
-             }
+          ["K20251216001",
+           "01022225555",
+           "K20251212001"
          ]
          """)
-    private List<TargetInspector> inspectors;
+    private List<String> inspectors;
  }

  @Getter
@@ -273,6 +254,6 @@ public class LabelAllocateDto {
  public static class AllocateInfoDto {

    private Long geoUid;
-    private String mapSheetNum;
+    private Long mapSheetNum;
  }
 }
--- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelInspectorDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelInspectorDto.java
@@ -0,0 +1,22 @@
+package com.kamco.cd.kamcoback.label.dto;
+
+import java.time.ZonedDateTime;
+import java.util.UUID;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+public class LabelInspectorDto {
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  public static class Basic {
+
+    private UUID operatorUid;
+    private Long analUid;
+    private String inspectorUid;
+    private ZonedDateTime createdDttm;
+    private ZonedDateTime updatedDttm;
+  }
+}
--- a/src/main/java/com/kamco/cd/kamcoback/label/dto/WorkerStatsDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/WorkerStatsDto.java
@@ -10,6 +10,27 @@ import lombok.Setter;

 public class WorkerStatsDto {

+  @Getter
+  @Setter
+  @Builder
+  @NoArgsConstructor
+  @AllArgsConstructor
+  @Schema(description = "프로젝트 기본 정보 (상단 표시용)")
+  public static class ProjectInfo {
+
+    @Schema(description = "변화탐지년도 (예: 2026-2025)")
+    private String detectionYear;
+
+    @Schema(description = "회차 (예: 8)")
+    private String round;
+
+    @Schema(description = "국유인 반영일 (예: 2026-03-31)")
+    private String reflectionDate;
+
+    @Schema(description = "작업 시작일 (예: 2026-04-06)")
+    private String startDate;
+  }
+
  @Getter
  @Setter
  @Builder
@@ -61,29 +82,74 @@ public class WorkerStatsDto {
  @Schema(description = "작업 진행 현황 정보")
  public static class WorkProgressInfo {

+    // === 라벨링 관련 ===
    @Schema(description = "라벨링 진행률 (완료건+스킵건)/배정건")
    private Double labelingProgressRate;

-    @Schema(description = "작업 상태 (진행중/종료)")
-    private String workStatus;
+    @Schema(description = "라벨링 작업 상태 (진행중/완료)")
+    private String labelingStatus;

-    @Schema(description = "진행률 수치 (완료+스킵)")
-    private Long completedCount;
+    @Schema(description = "라벨링 전체 배정 건수")
+    private Long labelingTotalCount;

-    @Schema(description = "전체 배정 건수")
-    private Long totalAssignedCount;
+    @Schema(description = "라벨링 완료 건수 (LABEL_FIN + TEST_ING + DONE)")
+    private Long labelingCompletedCount;
+
+    @Schema(description = "라벨링 스킵 건수 (SKIP)")
+    private Long labelingSkipCount;
+
+    @Schema(description = "라벨링 남은 작업 건수")
+    private Long labelingRemainingCount;

    @Schema(description = "투입된 라벨러 수")
    private Long labelerCount;

-    @Schema(description = "남은 라벨링 작업 데이터 수")
-    private Long remainingLabelCount;
+    // === 검수(Inspection) 관련 (신규 추가) ===
+    @Schema(description = "검수 진행률 (완료건/대상건)")
+    private Double inspectionProgressRate;
+
+    @Schema(description = "검수 작업 상태 (진행중/완료)")
+    private String inspectionStatus;
+
+    @Schema(description = "검수 전체 대상 건수")
+    private Long inspectionTotalCount;
+
+    @Schema(description = "검수 완료 건수 (DONE)")
+    private Long inspectionCompletedCount;
+
+    @Schema(description = "검수 제외 건수 (라벨링 스킵과 동일)")
+    private Long inspectionSkipCount;
+
+    @Schema(description = "검수 남은 작업 건수")
+    private Long inspectionRemainingCount;

    @Schema(description = "투입된 검수자 수")
    private Long inspectorCount;

-    @Schema(description = "남은 검수 작업 데이터 수")
+    // === 레거시 호환 필드 (Deprecated) ===
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingProgressRate 사용 권장")
+    private Double progressRate;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingTotalCount 사용 권장")
+    private Long totalAssignedCount;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingCompletedCount 사용 권장")
+    private Long completedCount;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingRemainingCount 사용 권장")
+    private Long remainingLabelCount;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] inspectionRemainingCount 사용 권장")
    private Long remainingInspectCount;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingStatus/inspectionStatus 사용 권장")
+    private String workStatus;
  }

  @Getter
@@ -94,10 +160,25 @@ public class WorkerStatsDto {
  @Schema(description = "작업자 목록 응답 (작업 정보 포함)")
  public static class WorkerListResponse {

+    @Schema(description = "프로젝트 기본 정보 (상단 표시용)")
+    private ProjectInfo projectInfo;
+
    @Schema(description = "작업 진행 현황 정보")
    private WorkProgressInfo progressInfo;

    @Schema(description = "작업자 목록")
    private List<WorkerStatistics> workers;
+
+    @Schema(description = "현재 페이지 번호 (0부터 시작)")
+    private Integer currentPage;
+
+    @Schema(description = "페이지 크기")
+    private Integer pageSize;
+
+    @Schema(description = "전체 데이터 수")
+    private Long totalElements;
+
+    @Schema(description = "전체 페이지 수")
+    private Integer totalPages;
  }
 }
--- a/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
@@ -6,7 +6,6 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
-import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.TargetInspector;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.TargetUser;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.DailyHistory;
@@ -16,7 +15,6 @@ import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
-import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,19 +36,15 @@ public class LabelAllocateService {
  /**
   * 도엽 기준 asc sorting 해서 할당 수만큼 배정하는 로직
   *
-   * @param labelerAutoType 라벨러 자동/수동 배정 타입
-   * @param inspectorAutoType 검수자 자동/수동 배정 타입
   * @param stage 회차
   * @param targetUsers 라벨러 목록
   * @param targetInspectors 검수자 목록
   */
  @Transactional
  public ApiResponseDto.ResponseObj allocateAsc(
-      String labelerAutoType,
-      String inspectorAutoType,
      Integer stage,
      List<TargetUser> targetUsers,
-      List<TargetInspector> targetInspectors,
+      List<String> targetInspectors,
      Integer compareYyyy,
      Integer targetYyyy) {
    Long lastId = null;
@@ -70,35 +64,45 @@ public class LabelAllocateService {

    List<AllocateInfoDto> allIds =
        labelAllocateCoreService.fetchNextIds(lastId, chargeCnt, compareYyyy, targetYyyy, stage);
+
+    // MapSheetAnalInferenceEntity analUid 가져오기
+    Long analUid =
+        labelAllocateCoreService.findMapSheetAnalInferenceUid(compareYyyy, targetYyyy, stage);
+
    int index = 0;
    for (TargetUser target : targetUsers) {
      int end = index + target.getDemand();
      List<AllocateInfoDto> sub = allIds.subList(index, end);

-      labelAllocateCoreService.assignOwner(sub, target.getUserId(), compareYyyy, targetYyyy, stage);
+      labelAllocateCoreService.assignOwner(sub, target.getUserId(), analUid);
      index = end;
    }

    // 검수자에게 userCount명 만큼 할당
-    List<LabelAllocateDto.Basic> list =
-        labelAllocateCoreService.findAssignedLabelerList(compareYyyy, targetYyyy, stage);
-    int from = 0;
+    List<LabelAllocateDto.Basic> list = labelAllocateCoreService.findAssignedLabelerList(analUid);

-    for (TargetInspector inspector : targetInspectors) {
-      int to = Math.min(from + inspector.getUserCount(), list.size());
-
-      if (from >= to) {
-        break;
-      }
-
-      List<UUID> assignmentUids =
-          list.subList(from, to).stream().map(LabelAllocateDto.Basic::getAssignmentUid).toList();
-
-      labelAllocateCoreService.assignInspectorBulk(assignmentUids, inspector.getInspectorUid());
-
-      from = to;
+    for (String inspector : targetInspectors) {
+      labelAllocateCoreService.insertInspector(analUid, inspector);
    }

+    //    int from = 0;
+    //    for (TargetInspector inspector : targetInspectors) {
+    //      int to = Math.min(from + inspector.getUserCount(), list.size());
+    //
+    //      if (from >= to) {
+    //        break;
+    //      }
+    //
+    //      List<UUID> assignmentUids =
+    //          list.subList(from,
+    // to).stream().map(LabelAllocateDto.Basic::getAssignmentUid).toList();
+    //
+    //      labelAllocateCoreService.assignInspectorBulk(assignmentUids,
+    // inspector.getInspectorUid());
+    //
+    //      from = to;
+    //    }
+
    return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "배정이 완료되었습니다.");
  }

@@ -107,21 +111,23 @@ public class LabelAllocateService {
  }

  /**
-   * 작업자 목록 및 3일치 통계 조회
+   * 작업자 통계 조회
   *
   * @param analUid 분석 ID
   * @param workerType 작업자 유형 (LABELER/INSPECTOR)
-   * @param searchName 이름 검색
-   * @param searchEmployeeNo 사번 검색
+   * @param search 검색어 (이름 또는 사번)
   * @param sortType 정렬 조건
+   * @param page 페이지 번호 (0부터 시작)
+   * @param size 페이지 크기
   * @return 작업자 목록 및 통계
   */
  public WorkerListResponse getWorkerStatistics(
      Long analUid,
      String workerType,
-      String searchName,
-      String searchEmployeeNo,
-      String sortType) {
+      String search,
+      String sortType,
+      Integer page,
+      Integer size) {

    // 작업 진행 현황 조회
    var progressInfo = labelAllocateCoreService.findWorkProgressInfo(analUid);
@@ -129,7 +135,7 @@ public class LabelAllocateService {
    // 작업자 통계 조회
    List<WorkerStatistics> workers =
        labelAllocateCoreService.findWorkerStatistics(
-            analUid, workerType, searchName, searchEmployeeNo, sortType);
+            analUid, workerType, search, sortType);

    // 각 작업자별 3일치 처리량 조회
    LocalDate today = LocalDate.now();
@@ -162,12 +168,27 @@ public class LabelAllocateService {
      }
    }

-    return WorkerListResponse.builder().progressInfo(progressInfo).workers(workers).build();
+    // 페이징 처리
+    long totalElements = workers.size();
+    int totalPages = (int) Math.ceil((double) totalElements / size);
+    int fromIndex = page * size;
+    int toIndex = Math.min(fromIndex + size, workers.size());
+
+    List<WorkerStatistics> pagedWorkers =
+        (fromIndex < workers.size()) ? workers.subList(fromIndex, toIndex) : List.of();
+
+    return WorkerListResponse.builder()
+        .progressInfo(progressInfo)
+        .workers(pagedWorkers)
+        .currentPage(page)
+        .pageSize(size)
+        .totalElements(totalElements)
+        .totalPages(totalPages)
+        .build();
  }

-  public InferenceDetail findInferenceDetail(
-      Integer compareYyyy, Integer targetYyyy, Integer stage) {
-    return labelAllocateCoreService.findInferenceDetail(compareYyyy, targetYyyy, stage);
+  public InferenceDetail findInferenceDetail(String uuid) {
+    return labelAllocateCoreService.findInferenceDetail(uuid);
  }

  public ApiResponseDto.ResponseObj allocateMove(
@@ -199,8 +220,7 @@ public class LabelAllocateService {
    return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "이관을 완료하였습니다.");
  }

-  public LabelerDetail findLabelerDetail(
-      String userId, Integer compareYyyy, Integer targetYyyy, Integer stage) {
-    return labelAllocateCoreService.findLabelerDetail(userId, compareYyyy, targetYyyy, stage);
+  public LabelerDetail findLabelerDetail(String userId, String uuid) {
+    return labelAllocateCoreService.findLabelerDetail(userId, uuid);
  }
 }