From 91ebcc9551042740d946c0ac050389abd9b14769 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Tue, 6 Jan 2026 12:12:35 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EB=B2=A8=EC=9E=91=EC=97=85=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=AA=A9=EB=A1=9D=20API=20=EB=82=A0=EC=A7=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EC=97=90=EB=9F=AC=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=EB=B3=80=ED=99=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../label/LabelWorkerApiController.java | 9 ++++---- .../cd/kamcoback/label/dto/LabelWorkDto.java | 9 ++++---- .../label/service/LabelAllocateService.java | 22 +------------------ .../label/LabelWorkRepositoryImpl.java | 21 ++++-------------- .../log/ErrorLogRepositoryImpl.java | 12 +++++----- 5 files changed, 22 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java b/src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java index 275305fe..e8bef564 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java @@ -16,6 +16,7 @@ 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.time.LocalDate; import java.util.List; import java.util.UUID; import lombok.RequiredArgsConstructor; @@ -71,10 +72,10 @@ public class LabelWorkerApiController { public ApiResponseDto> labelWorkMngList( @Parameter(description = "변화탐지년도", example = "2022-2024") @RequestParam(required = false) String detectYear, - @Parameter(description = "시작일", example = "20220101") @RequestParam(required = false) - String strtDttm, - @Parameter(description = "종료일", example = "20261201") @RequestParam(required = false) - String endDttm, + @Parameter(description = "시작일", example = "2022-01-01") @RequestParam(required = false) + LocalDate strtDttm, + @Parameter(description = "종료일", example = "2026-12-01") @RequestParam(required = false) + LocalDate endDttm, @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0") int page, @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20") diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java index 7ab01364..cde2b946 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java @@ -5,6 +5,7 @@ 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.LocalDate; import java.time.ZonedDateTime; import java.util.UUID; import lombok.AllArgsConstructor; @@ -120,11 +121,11 @@ public class LabelWorkDto { @Schema(description = "변화탐지년도", example = "2024") private String detectYear; - @Schema(description = "시작일", example = "20260101") - private String strtDttm; + @Schema(description = "시작일", example = "2026-01-01") + private LocalDate strtDttm; - @Schema(description = "종료일", example = "20261201") - private String endDttm; + @Schema(description = "종료일", example = "2026-12-01") + private LocalDate endDttm; public Pageable toPageable() { diff --git a/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java b/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java index 8b6b82b9..a0dfadf2 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java @@ -74,31 +74,11 @@ public class LabelAllocateService { index = end; } - // 검수자에게 userCount명 만큼 할당 - List list = labelAllocateCoreService.findAssignedLabelerList(analUid); - + // 검수자 할당 테이블에 insert. TODO: 익일 배치로 라벨링 완료된 내역을 검수자에게 할당해야 함 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 assignmentUids = - // list.subList(from, - // to).stream().map(LabelAllocateDto.Basic::getAssignmentUid).toList(); - // - // labelAllocateCoreService.assignInspectorBulk(assignmentUids, - // inspector.getInspectorUid()); - // - // from = to; - // } - return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "배정이 완료되었습니다."); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java index bee35325..8979cebe 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java @@ -114,21 +114,13 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport whereSubBuilder.and( mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id)); - if (searchReq.getStrtDttm() != null - && !searchReq.getStrtDttm().isEmpty() - && searchReq.getEndDttm() != null - && !searchReq.getEndDttm().isEmpty()) { + if (searchReq.getStrtDttm() != null && searchReq.getEndDttm() != null) { ZoneId zoneId = ZoneId.of("Asia/Seoul"); - ZonedDateTime start = - LocalDate.parse(searchReq.getStrtDttm(), DateTimeFormatter.BASIC_ISO_DATE) - .atStartOfDay(zoneId); + ZonedDateTime start = searchReq.getStrtDttm().atStartOfDay(zoneId); - ZonedDateTime end = - LocalDate.parse(searchReq.getEndDttm(), DateTimeFormatter.BASIC_ISO_DATE) - .plusDays(1) - .atStartOfDay(zoneId); + ZonedDateTime end = searchReq.getEndDttm().plusDays(1).atStartOfDay(zoneId); whereSubBuilder.and( mapSheetAnalDataInferenceGeomEntity @@ -402,12 +394,7 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport } public NumberExpression caseSumExpression(BooleanExpression condition) { - NumberExpression sumExp = - new CaseBuilder() - .when(condition) - .then(1L) - .otherwise(0L) - .sum(); + NumberExpression sumExp = new CaseBuilder().when(condition).then(1L).otherwise(0L).sum(); return sumExp; } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/ErrorLogRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/ErrorLogRepositoryImpl.java index de42f7c9..03cc0869 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/ErrorLogRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/ErrorLogRepositoryImpl.java @@ -15,7 +15,7 @@ import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.StringExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.List; import java.util.Objects; @@ -98,12 +98,14 @@ public class ErrorLogRepositoryImpl extends QuerydslRepositorySupport if (Objects.isNull(startDate) || Objects.isNull(endDate)) { return null; } - LocalDateTime startDateTime = startDate.atStartOfDay(); - LocalDateTime endDateTime = endDate.plusDays(1).atStartOfDay(); + + ZoneId zoneId = ZoneId.of("Asia/Seoul"); + ZonedDateTime startDateTime = startDate.atStartOfDay(zoneId); + ZonedDateTime endDateTime = endDate.plusDays(1).atStartOfDay(zoneId); return auditLogEntity .createdDate - .goe(ZonedDateTime.from(startDateTime)) - .and(auditLogEntity.createdDate.lt(ZonedDateTime.from(endDateTime))); + .goe(startDateTime) + .and(auditLogEntity.createdDate.lt(endDateTime)); } private BooleanExpression eventStatusEqFailed() {