라벨링작업 관리 목록조회 수정

This commit is contained in:
2026-01-05 13:36:07 +09:00
parent 877de7f17e
commit 03d8114897
12 changed files with 430 additions and 171 deletions

View File

@@ -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;

View File

@@ -67,23 +67,17 @@ public class WorkerStatsDto {
private Boolean isStagnated;
// 레거시 필드 (기존 호환성 유지)
@Deprecated
private Long doneCnt; // completed로 대체
@Deprecated private Long doneCnt; // completed로 대체
@Deprecated
private Long skipCnt; // skipped로 대체
@Deprecated private Long skipCnt; // skipped로 대체
@Deprecated
private Long remainingCnt; // remaining으로 대체
@Deprecated private Long remainingCnt; // remaining으로 대체
@Deprecated
private Long day3AgoDoneCnt; // history.day3Ago로 대체
@Deprecated private Long day3AgoDoneCnt; // history.day3Ago로 대체
@Deprecated
private Long day2AgoDoneCnt; // history.day2Ago로 대체
@Deprecated private Long day2AgoDoneCnt; // history.day2Ago로 대체
@Deprecated
private Long day1AgoDoneCnt; // history.day1Ago로 대체
@Deprecated private Long day1AgoDoneCnt; // history.day1Ago로 대체
}
@Getter
@@ -107,7 +101,6 @@ public class WorkerStatsDto {
private Long average;
}
@Getter
@Setter
@Builder