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

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java
#	src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
This commit is contained in:
DanielLee
2026-01-05 13:37:44 +09:00
15 changed files with 830 additions and 163 deletions

View File

@@ -92,13 +92,20 @@ public class LabelAllocateApiController {
}, },
defaultValue = "NAME_ASC")) defaultValue = "NAME_ASC"))
@RequestParam(required = false) @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 설정 // type이 null이면 기본값으로 LABELER 설정
String workerType = (type == null || type.isEmpty()) ? RoleType.LABELER.name() : type; String workerType = (type == null || type.isEmpty()) ? RoleType.LABELER.name() : type;
return ApiResponseDto.ok( return ApiResponseDto.ok(
labelAllocateService.getWorkerStatistics(null, workerType, search, sort)); labelAllocateService.getWorkerStatistics(
null, workerType, search, sort, page, size));
} }
@Operation(summary = "라벨링작업 관리 > 작업 배정", description = "라벨링작업 관리 > 작업 배정") @Operation(summary = "라벨링작업 관리 > 작업 배정", description = "라벨링작업 관리 > 작업 배정")

View File

@@ -1,9 +1,10 @@
package com.kamco.cd.kamcoback.label; 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.config.api.ApiResponseDto;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto; 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.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.dto.LabelWorkDto.LabelWorkMngSearchReq;
import com.kamco.cd.kamcoback.label.service.LabelWorkService; import com.kamco.cd.kamcoback.label.service.LabelWorkService;
import io.swagger.v3.oas.annotations.Operation; 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.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;
import java.util.UUID;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.GetMapping; 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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +34,24 @@ public class LabelWorkerApiController {
private final LabelWorkService labelWorkService; 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 = "라벨링작업 관리 > 목록 조회") @Operation(summary = "라벨링작업 관리 > 목록 조회", description = "라벨링작업 관리 > 목록 조회")
@ApiResponses( @ApiResponses(
value = { value = {
@@ -39,26 +61,45 @@ public class LabelWorkerApiController {
content = content =
@Content( @Content(
mediaType = "application/json", mediaType = "application/json",
schema = @Schema(implementation = CommonCodeDto.Basic.class))), schema = @Schema(implementation = Page.class))),
@ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
}) })
@GetMapping("/label-work-mng-list") @GetMapping("/label-work-mng-list")
public ApiResponseDto<Page<LabelWorkMng>> labelWorkMngList( public ApiResponseDto<Page<LabelWorkMng>> labelWorkMngList(
@Parameter(description = "변화탐지년도", example = "2024") @RequestParam(required = false) @Parameter(description = "변화탐지년도", example = "2022-2024") @RequestParam(required = false)
Integer detectYyyy, String detectYear,
@Parameter(description = "시작일", example = "20260101") @RequestParam String strtDttm, @Parameter(description = "시작일", example = "20220101") @RequestParam String strtDttm,
@Parameter(description = "종료일", example = "20261201") @RequestParam String endDttm, @Parameter(description = "종료일", example = "20261201") @RequestParam String endDttm,
@Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0") @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
int page, int page,
@Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20") @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
int size) { int size) {
LabelWorkDto.LabelWorkMngSearchReq searchReq = new LabelWorkMngSearchReq(); LabelWorkDto.LabelWorkMngSearchReq searchReq = new LabelWorkMngSearchReq();
searchReq.setDetectYyyy(detectYyyy); searchReq.setDetectYear(detectYear);
searchReq.setStrtDttm(strtDttm); searchReq.setStrtDttm(strtDttm);
searchReq.setEndDttm(endDttm); searchReq.setEndDttm(endDttm);
searchReq.setPage(page); searchReq.setPage(page);
searchReq.setSize(size); searchReq.setSize(size);
return ApiResponseDto.ok(labelWorkService.labelWorkMngList(searchReq)); 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));
}
} }

View File

@@ -8,7 +8,11 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
public class LabelAllocateDto { public class LabelAllocateDto {
@@ -171,6 +175,9 @@ public class LabelAllocateDto {
private Long analUid; private Long analUid;
private ZonedDateTime createdDttm; private ZonedDateTime createdDttm;
private ZonedDateTime updatedDttm; private ZonedDateTime updatedDttm;
private String inspectState;
private ZonedDateTime workStatDttm;
private ZonedDateTime inspectStatDttm;
} }
@Getter @Getter
@@ -210,7 +217,7 @@ public class LabelAllocateDto {
private Double percent; private Double percent;
private Integer ranking; private Integer ranking;
private ZonedDateTime createdDttm; private ZonedDateTime createdDttm;
private String inspectorName; private String ownerName;
} }
@Getter @Getter
@@ -256,4 +263,42 @@ public class LabelAllocateDto {
private Long geoUid; private Long geoUid;
private Long mapSheetNum; private Long mapSheetNum;
} }
@Getter
@Setter
@AllArgsConstructor
public static class LabelingStatDto {
private String workDate;
private Long dailyTotalCnt;
private Long totalCnt;
private Long assignedCnt;
private Long skipCnt;
private Long completeCnt;
private Long remainCnt;
}
@Schema(name = "searchReq", description = "일자별 작업 목록 요청")
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public static class searchReq {
// 페이징 파라미터
private int page = 0;
private int size = 20;
private String sort;
public Pageable toPageable() {
if (sort != null && !sort.isEmpty()) {
String[] sortParams = sort.split(",");
String property = sortParams[0];
Sort.Direction direction =
sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
return PageRequest.of(page, size, Sort.by(direction, property));
}
return PageRequest.of(page, size);
}
}
} }

View File

@@ -1,10 +1,12 @@
package com.kamco.cd.kamcoback.label.dto; 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.enums.Enums;
import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm; import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.UUID;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@@ -14,6 +16,15 @@ import org.springframework.data.domain.Pageable;
public class LabelWorkDto { public class LabelWorkDto {
@Getter
@Setter
@AllArgsConstructor
public static class ChangeDetectYear {
private String code;
private String name;
}
@Schema(name = "LabelWorkMng", description = "라벨작업관리") @Schema(name = "LabelWorkMng", description = "라벨작업관리")
@Getter @Getter
@Setter @Setter
@@ -21,8 +32,9 @@ public class LabelWorkDto {
@AllArgsConstructor @AllArgsConstructor
public static class LabelWorkMng { public static class LabelWorkMng {
private int compareYyyy; private UUID uuid;
private int targetYyyy; private Integer compareYyyy;
private Integer targetYyyy;
private int stage; private int stage;
@JsonFormatDttm private ZonedDateTime createdDttm; @JsonFormatDttm private ZonedDateTime createdDttm;
private Long detectionTotCnt; private Long detectionTotCnt;
@@ -32,6 +44,14 @@ public class LabelWorkDto {
private Long labelCompleteTotCnt; private Long labelCompleteTotCnt;
@JsonFormatDttm private ZonedDateTime labelStartDttm; @JsonFormatDttm private ZonedDateTime labelStartDttm;
@JsonProperty("detectYear")
public String getDetectYear() {
if (compareYyyy == null || targetYyyy == null) {
return null;
}
return compareYyyy + "-" + targetYyyy;
}
public String getLabelState() { public String getLabelState() {
String mngState = "PENDING"; 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 = "라벨작업관리 검색 요청") @Schema(name = "LabelWorkMngSearchReq", description = "라벨작업관리 검색 요청")
@Getter @Getter
@Setter @Setter
@@ -80,7 +114,7 @@ public class LabelWorkDto {
private int size = 20; private int size = 20;
@Schema(description = "변화탐지년도", example = "2024") @Schema(description = "변화탐지년도", example = "2024")
private Integer detectYyyy; private String detectYear;
@Schema(description = "시작일", example = "20260101") @Schema(description = "시작일", example = "20260101")
private String strtDttm; private String strtDttm;

View File

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

View File

@@ -8,8 +8,11 @@ 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.LabelerDetail;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.TargetUser; 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.LabelAllocateDto.UserList;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.DailyHistory;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse; import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService; import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
import java.time.LocalDate;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -21,6 +24,8 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional @Transactional
public class LabelAllocateService { public class LabelAllocateService {
private static final int STAGNATION_THRESHOLD = 10; // 정체 판단 기준 (3일 평균 처리량)
private static final int BATCH_SIZE = 100; // 배정 배치 크기
private final LabelAllocateCoreService labelAllocateCoreService; private final LabelAllocateCoreService labelAllocateCoreService;
@@ -112,13 +117,17 @@ public class LabelAllocateService {
* @param workerType 작업자 유형 (LABELER/INSPECTOR) * @param workerType 작업자 유형 (LABELER/INSPECTOR)
* @param search 검색어 (이름 또는 사번) * @param search 검색어 (이름 또는 사번)
* @param sortType 정렬 조건 * @param sortType 정렬 조건
* @param page 페이지 번호 (0부터 시작)
* @param size 페이지 크기
* @return 작업자 목록 및 통계 * @return 작업자 목록 및 통계
*/ */
public WorkerListResponse getWorkerStatistics( public WorkerListResponse getWorkerStatistics(
Long analUid, Long analUid,
String workerType, String workerType,
String search, String search,
String sortType) { String sortType,
Integer page,
Integer size) {
// 프로젝트 정보 조회 (analUid가 있을 때만) // 프로젝트 정보 조회 (analUid가 있을 때만)
var projectInfo = labelAllocateCoreService.findProjectInfo(analUid); var projectInfo = labelAllocateCoreService.findProjectInfo(analUid);
@@ -126,9 +135,59 @@ public class LabelAllocateService {
// 작업 진행 현황 조회 // 작업 진행 현황 조회
var progressInfo = labelAllocateCoreService.findWorkProgressInfo(analUid); var progressInfo = labelAllocateCoreService.findWorkProgressInfo(analUid);
// 작업자 통계 조회
List<WorkerStatistics> workers =
labelAllocateCoreService.findWorkerStatistics(
analUid, workerType, search, sortType);
// 각 작업자별 3일치 처리량 조회
LocalDate today = LocalDate.now();
for (WorkerStatistics worker : workers) {
Long day1Count =
labelAllocateCoreService.findDailyProcessedCount(
worker.getWorkerId(), workerType, today.minusDays(1), analUid);
Long day2Count =
labelAllocateCoreService.findDailyProcessedCount(
worker.getWorkerId(), workerType, today.minusDays(2), analUid);
Long day3Count =
labelAllocateCoreService.findDailyProcessedCount(
worker.getWorkerId(), workerType, today.minusDays(3), analUid);
long average = (day1Count + day2Count + day3Count) / 3;
DailyHistory history =
DailyHistory.builder()
.day1Ago(day1Count)
.day2Ago(day2Count)
.day3Ago(day3Count)
.average(average)
.build();
worker.setHistory(history);
// 정체 여부 판단 (3일 평균이 STAGNATION_THRESHOLD 미만일 때)
if (average < STAGNATION_THRESHOLD) {
worker.setIsStagnated(true);
}
}
// 페이징 처리
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() return WorkerListResponse.builder()
.projectInfo(projectInfo) .projectInfo(projectInfo)
.progressInfo(progressInfo) .progressInfo(progressInfo)
.workers(pagedWorkers)
.currentPage(page)
.pageSize(size)
.totalElements(totalElements)
.totalPages(totalPages)
.build(); .build();
} }

View File

@@ -1,24 +1,52 @@
package com.kamco.cd.kamcoback.label.service; package com.kamco.cd.kamcoback.label.service;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto; 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.LabelWorkMng;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
import com.kamco.cd.kamcoback.postgres.core.LabelWorkCoreService; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor
@Transactional(rollbackFor = Exception.class)
public class LabelWorkService { public class LabelWorkService {
private final LabelWorkCoreService labelWorkCoreService; private final LabelWorkCoreService labelWorkCoreService;
public LabelWorkService(LabelWorkCoreService labelWorkCoreService) { /**
this.labelWorkCoreService = labelWorkCoreService; * 라벨링작업 관리 목록조회
} *
* @param searchReq
* @return
*/
public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq) { public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq) {
return labelWorkCoreService.labelWorkMngList(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();
}
} }

View File

@@ -4,7 +4,9 @@ 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.AllocateInfoDto;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail; 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.LabelerDetail;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.searchReq;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo; import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo; import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics; import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
@@ -14,6 +16,7 @@ import java.time.LocalDate;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
@@ -54,12 +57,8 @@ public class LabelAllocateCoreService {
} }
public List<WorkerStatistics> findWorkerStatistics( public List<WorkerStatistics> findWorkerStatistics(
Long analUid, Long analUid, String workerType, String search, String sortType) {
String workerType, return labelAllocateRepository.findWorkerStatistics(analUid, workerType, search, sortType);
String search,
String sortType) {
return labelAllocateRepository.findWorkerStatistics(
analUid, workerType, search, sortType);
} }
public WorkProgressInfo findWorkProgressInfo(Long analUid) { public WorkProgressInfo findWorkProgressInfo(Long analUid) {
@@ -100,4 +99,18 @@ public class LabelAllocateCoreService {
public void insertInspector(Long analUid, String inspector) { public void insertInspector(Long analUid, String inspector) {
labelAllocateRepository.insertInspector(analUid, inspector); labelAllocateRepository.insertInspector(analUid, inspector);
} }
public Page<LabelingStatDto> findLabelerDailyStat(
searchReq searchReq, String uuid, String userId) {
return labelAllocateRepository.findLabelerDailyStat(searchReq, uuid, userId);
}
public Page<LabelingStatDto> findInspectorDailyStat(
searchReq searchReq, String uuid, String userId) {
return labelAllocateRepository.findInspectorDailyStat(searchReq, uuid, userId);
}
public LabelerDetail findInspectorDetail(String userId, String uuid) {
return labelAllocateRepository.findInspectorDetail(userId, uuid);
}
} }

View File

@@ -1,8 +1,13 @@
package com.kamco.cd.kamcoback.postgres.core; package com.kamco.cd.kamcoback.postgres.core;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto; 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.LabelWorkMng;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
import com.kamco.cd.kamcoback.postgres.repository.label.LabelWorkRepository; import com.kamco.cd.kamcoback.postgres.repository.label.LabelWorkRepository;
import com.kamco.cd.kamcoback.postgres.repository.members.MembersRepository;
import java.util.List;
import java.util.UUID;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -12,8 +17,40 @@ import org.springframework.stereotype.Service;
public class LabelWorkCoreService { public class LabelWorkCoreService {
private final LabelWorkRepository labelWorkRepository; private final LabelWorkRepository labelWorkRepository;
private final MembersRepository membersRepository;
/**
* 변화탐지 년도 셀렉트박스 조회
*
* @return
*/
public List<ChangeDetectYear> getChangeDetectYear() {
return labelWorkRepository.findChangeDetectYearList().stream()
.map(
e ->
new ChangeDetectYear(
e.getCompareYyyy() + "-" + e.getTargetYyyy(),
e.getCompareYyyy() + "-" + e.getTargetYyyy()))
.toList();
}
/**
* 라벨링작업 관리 목록 조회
*
* @param searchReq
* @return
*/
public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq) { public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq) {
return labelWorkRepository.labelWorkMngList(searchReq); return labelWorkRepository.labelWorkMngList(searchReq);
} }
/**
* 작업배정 정보 조회
*
* @param uuid
* @return
*/
public LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid) {
return labelWorkRepository.findLabelWorkMngDetail(uuid);
}
} }

View File

@@ -6,6 +6,7 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import java.time.ZonedDateTime;
import java.util.UUID; import java.util.UUID;
@Entity @Entity
@@ -40,6 +41,15 @@ public class LabelingAssignmentEntity extends CommonDateEntity {
@Column(name = "anal_uid") @Column(name = "anal_uid")
private Long analUid; private Long analUid;
@Column(name = "inspect_state")
private String inspectState;
@Column(name = "work_stat_dttm")
private ZonedDateTime workStatDttm;
@Column(name = "inspect_stat_dttm")
private ZonedDateTime inspectStatDttm;
public LabelAllocateDto.Basic toDto() { public LabelAllocateDto.Basic toDto() {
return new LabelAllocateDto.Basic( return new LabelAllocateDto.Basic(
this.assignmentUid, this.assignmentUid,
@@ -52,6 +62,9 @@ public class LabelingAssignmentEntity extends CommonDateEntity {
this.learnGeomUid, this.learnGeomUid,
this.analUid, this.analUid,
super.getCreatedDate(), super.getCreatedDate(),
super.getModifiedDate()); super.getModifiedDate(),
this.inspectState,
this.workStatDttm,
this.inspectStatDttm);
} }
} }

View File

@@ -36,20 +36,29 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
String sql = String sql =
""" """
INSERT INTO tb_map_sheet_anal_inference ( INSERT INTO tb_map_sheet_anal_inference (
compare_yyyy, stage,
target_yyyy, compare_yyyy,
stage, target_yyyy,
anal_title, anal_title,
detecting_cnt detecting_cnt,
) created_dttm,
SELECT updated_dttm
r.input1 AS compare_yyyy, )
r.input2 AS target_yyyy, SELECT
r.stage, r.stage,
CONCAT(r.stage ,'_', r.input1 ,'_', r.input2) AS anal_title, r.input1 AS compare_yyyy,
count(*) r.input2 AS target_yyyy,
FROM inference_results r CONCAT(r.stage, '_', r.input1, '_', r.input2) AS anal_title,
GROUP BY r.stage, r.input1, r.input2; COUNT(*) AS detecting_cnt,
now(),
now()
FROM inference_results r
GROUP BY r.stage, r.input1, r.input2
ON CONFLICT (stage, compare_yyyy, target_yyyy)
DO UPDATE SET
detecting_cnt = EXCLUDED.detecting_cnt,
anal_title = EXCLUDED.anal_title,
updated_dttm = now()
"""; """;
return em.createNativeQuery(sql).executeUpdate(); return em.createNativeQuery(sql).executeUpdate();
@@ -69,30 +78,42 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
String sql = String sql =
""" """
INSERT INTO tb_map_sheet_anal_data_inference ( INSERT INTO tb_map_sheet_anal_data_inference (
anal_uid,
stage, stage,
compare_yyyy, compare_yyyy,
target_yyyy, target_yyyy,
map_sheet_num, map_sheet_num,
created_dttm, detecting_cnt,
updated_dttm,
file_created_yn, file_created_yn,
detecting_cnt created_dttm,
updated_dttm
) )
SELECT SELECT
ai.id AS anal_uid,
r.stage, r.stage,
r.input1 AS compare_yyyy, r.input1 AS compare_yyyy,
r.input2 AS target_yyyy, r.input2 AS target_yyyy,
r.map_id AS map_sheet_num, r.map_id AS map_sheet_num,
now() AS created_dttm, COUNT(*) AS detecting_cnt,
now() AS updated_dttm, false AS file_created_yn,
false AS file_created_yn, now(),
count(*) AS detecting_cnt now()
FROM inference_results r FROM inference_results r
GROUP BY r.stage, r.input1, r.input2, r.map_id JOIN tb_map_sheet_anal_inference ai
ON ai.stage = r.stage
AND ai.compare_yyyy = r.input1
AND ai.target_yyyy = r.input2
GROUP BY
ai.id,
r.stage,
r.input1,
r.input2,
r.map_id
ON CONFLICT (stage, compare_yyyy, target_yyyy, map_sheet_num) ON CONFLICT (stage, compare_yyyy, target_yyyy, map_sheet_num)
DO UPDATE SET DO UPDATE SET
updated_dttm = now(), anal_uid = EXCLUDED.anal_uid,
detecting_cnt = EXCLUDED.detecting_cnt detecting_cnt = EXCLUDED.detecting_cnt,
updated_dttm = now()
"""; """;
return em.createNativeQuery(sql).executeUpdate(); return em.createNativeQuery(sql).executeUpdate();
@@ -111,46 +132,70 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
String sql = String sql =
""" """
INSERT INTO tb_map_sheet_anal_data_inference_geom ( INSERT INTO tb_map_sheet_anal_data_inference_geom (
uuid, stage, cd_prob, compare_yyyy, target_yyyy, map_sheet_num, uuid,
class_before_cd, class_before_prob, class_after_cd, class_after_prob, stage,
geom, area, data_uid, created_dttm, updated_dttm, cd_prob,
file_created_yn compare_yyyy,
target_yyyy,
map_sheet_num,
class_before_cd,
class_before_prob,
class_after_cd,
class_after_prob,
geom,
area,
data_uid,
file_created_yn,
created_dttm,
updated_dttm
) )
SELECT SELECT
x.uuid, x.stage, x.cd_prob, x.compare_yyyy, x.target_yyyy, x.map_sheet_num, x.uuid,
x.class_before_cd, x.class_before_prob, x.class_after_cd, x.class_after_prob, x.stage,
x.geom, x.area, x.data_uid, x.created_dttm, x.updated_dttm, x.cd_prob,
false AS file_created_yn x.compare_yyyy,
x.target_yyyy,
x.map_sheet_num,
x.class_before_cd,
x.class_before_prob,
x.class_after_cd,
x.class_after_prob,
x.geom,
x.area,
x.data_uid,
false,
x.created_dttm,
x.updated_dttm
FROM ( FROM (
SELECT DISTINCT ON (r.uuid) SELECT DISTINCT ON (r.uuid)
r.uuid, r.uuid,
r.stage, r.stage,
r.cd_prob, r.cd_prob,
r.input1 AS compare_yyyy, r.input1 AS compare_yyyy,
r.input2 AS target_yyyy, r.input2 AS target_yyyy,
r.map_id AS map_sheet_num, r.map_id AS map_sheet_num,
r.before_class AS class_before_cd, r.before_class AS class_before_cd,
r.before_probability AS class_before_prob, r.before_probability AS class_before_prob,
r.after_class AS class_after_cd, r.after_class AS class_after_cd,
r.after_probability AS class_after_prob, r.after_probability AS class_after_prob,
CASE CASE
WHEN r.geometry IS NULL THEN NULL WHEN r.geometry IS NULL THEN NULL
WHEN left(r.geometry, 2) = '01' WHEN LEFT(r.geometry, 2) = '01'
THEN ST_SetSRID(ST_GeomFromWKB(decode(r.geometry, 'hex')), 5186) THEN ST_SetSRID(ST_GeomFromWKB(decode(r.geometry, 'hex')), 5186)
ELSE ST_GeomFromText(r.geometry, 5186) ELSE ST_GeomFromText(r.geometry, 5186)
END AS geom, END AS geom,
r.area, r.area,
di.data_uid, di.data_uid,
r.created_dttm, r.created_dttm,
r.updated_dttm r.updated_dttm
FROM inference_results r FROM inference_results r
JOIN tb_map_sheet_anal_data_inference di JOIN tb_map_sheet_anal_data_inference di
ON di.stage = r.stage ON di.stage = r.stage
AND di.compare_yyyy = r.input1 AND di.compare_yyyy = r.input1
AND di.target_yyyy = r.input2 AND di.target_yyyy = r.input2
AND di.map_sheet_num = r.map_id AND di.map_sheet_num = r.map_id
ORDER BY r.uuid, r.updated_dttm DESC NULLS LAST, r.uid DESC ORDER BY r.uuid, r.updated_dttm DESC NULLS LAST, r.uid DESC
) x ) x
ON CONFLICT (uuid) ON CONFLICT (uuid)
DO UPDATE SET DO UPDATE SET

View File

@@ -1,8 +1,10 @@
package com.kamco.cd.kamcoback.postgres.repository.label; package com.kamco.cd.kamcoback.postgres.repository.label;
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.AllocateInfoDto;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail; 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.LabelerDetail;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo; import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo; import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
@@ -11,6 +13,7 @@ import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.springframework.data.domain.Page;
public interface LabelAllocateRepositoryCustom { public interface LabelAllocateRepositoryCustom {
@@ -54,4 +57,12 @@ public interface LabelAllocateRepositoryCustom {
Long findMapSheetAnalInferenceUid(Integer compareYyyy, Integer targetYyyy, Integer stage); Long findMapSheetAnalInferenceUid(Integer compareYyyy, Integer targetYyyy, Integer stage);
void insertInspector(Long analUid, String inspector); void insertInspector(Long analUid, String inspector);
Page<LabelingStatDto> findLabelerDailyStat(
LabelAllocateDto.searchReq searchReq, String uuid, String userId);
Page<LabelingStatDto> findInspectorDailyStat(
LabelAllocateDto.searchReq searchReq, String uuid, String userId);
LabelerDetail findInspectorDetail(String userId, String uuid);
} }

View File

@@ -13,6 +13,7 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo; import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo; import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
@@ -20,6 +21,7 @@ import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity; import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity; import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity;
import com.kamco.cd.kamcoback.postgres.entity.QMemberEntity; import com.kamco.cd.kamcoback.postgres.entity.QMemberEntity;
import com.querydsl.core.types.Expression;
import com.querydsl.core.types.Projections; import com.querydsl.core.types.Projections;
import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.core.types.dsl.CaseBuilder;
@@ -43,6 +45,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@Slf4j @Slf4j
@@ -192,10 +197,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
@Override @Override
public List<WorkerStatistics> findWorkerStatistics( public List<WorkerStatistics> findWorkerStatistics(
Long analUid, Long analUid, String workerType, String search, String sortType) {
String workerType,
String search,
String sortType) {
// 작업자 유형에 따른 필드 선택 // 작업자 유형에 따른 필드 선택
StringExpression workerIdField = StringExpression workerIdField =
@@ -211,8 +213,8 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
// 검색 조건 (이름 또는 사번으로 검색) // 검색 조건 (이름 또는 사번으로 검색)
BooleanExpression searchCondition = null; BooleanExpression searchCondition = null;
if (search != null && !search.isEmpty()) { if (search != null && !search.isEmpty()) {
searchCondition = memberEntity.name.contains(search) searchCondition =
.or(memberEntity.employeeNo.contains(search)); memberEntity.name.contains(search).or(memberEntity.employeeNo.contains(search));
} }
// 완료, 스킵, 남은 작업 계산 // 완료, 스킵, 남은 작업 계산
@@ -242,7 +244,8 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
.sum(); .sum();
// 기본 통계 조회 쿼리 // 기본 통계 조회 쿼리
BooleanExpression analUidCondition = analUid != null ? labelingAssignmentEntity.analUid.eq(analUid) : null; BooleanExpression analUidCondition =
analUid != null ? labelingAssignmentEntity.analUid.eq(analUid) : null;
var baseQuery = var baseQuery =
queryFactory queryFactory
@@ -313,7 +316,8 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
@Override @Override
public WorkProgressInfo findWorkProgressInfo(Long analUid) { public WorkProgressInfo findWorkProgressInfo(Long analUid) {
BooleanExpression analUidCondition = analUid != null ? labelingAssignmentEntity.analUid.eq(analUid) : null; BooleanExpression analUidCondition =
analUid != null ? labelingAssignmentEntity.analUid.eq(analUid) : null;
// 전체 배정 건수 // 전체 배정 건수
Long totalAssigned = Long totalAssigned =
@@ -339,9 +343,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
queryFactory queryFactory
.select(labelingAssignmentEntity.count()) .select(labelingAssignmentEntity.count())
.from(labelingAssignmentEntity) .from(labelingAssignmentEntity)
.where( .where(analUidCondition, labelingAssignmentEntity.workState.eq("SKIP"))
analUidCondition,
labelingAssignmentEntity.workState.eq("SKIP"))
.fetchOne(); .fetchOne();
// 투입된 라벨러 수 // 투입된 라벨러 수
@@ -349,9 +351,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
queryFactory queryFactory
.select(labelingAssignmentEntity.workerUid.countDistinct()) .select(labelingAssignmentEntity.workerUid.countDistinct())
.from(labelingAssignmentEntity) .from(labelingAssignmentEntity)
.where( .where(analUidCondition, labelingAssignmentEntity.workerUid.isNotNull())
analUidCondition,
labelingAssignmentEntity.workerUid.isNotNull())
.fetchOne(); .fetchOne();
// === 검수 통계 === // === 검수 통계 ===
@@ -360,9 +360,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
queryFactory queryFactory
.select(labelingAssignmentEntity.count()) .select(labelingAssignmentEntity.count())
.from(labelingAssignmentEntity) .from(labelingAssignmentEntity)
.where( .where(analUidCondition, labelingAssignmentEntity.workState.eq("DONE"))
analUidCondition,
labelingAssignmentEntity.workState.eq("DONE"))
.fetchOne(); .fetchOne();
// 투입된 검수자 수 // 투입된 검수자 수
@@ -370,9 +368,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
queryFactory queryFactory
.select(labelingAssignmentEntity.inspectorUid.countDistinct()) .select(labelingAssignmentEntity.inspectorUid.countDistinct())
.from(labelingAssignmentEntity) .from(labelingAssignmentEntity)
.where( .where(analUidCondition, labelingAssignmentEntity.inspectorUid.isNotNull())
analUidCondition,
labelingAssignmentEntity.inspectorUid.isNotNull())
.fetchOne(); .fetchOne();
// 남은 작업 건수 계산 // 남은 작업 건수 계산
@@ -432,7 +428,8 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
? labelingAssignmentEntity.inspectorUid.eq(workerId) ? labelingAssignmentEntity.inspectorUid.eq(workerId)
: labelingAssignmentEntity.workerUid.eq(workerId); : labelingAssignmentEntity.workerUid.eq(workerId);
BooleanExpression analUidCondition = analUid != null ? labelingAssignmentEntity.analUid.eq(analUid) : null; BooleanExpression analUidCondition =
analUid != null ? labelingAssignmentEntity.analUid.eq(analUid) : null;
Long count = Long count =
queryFactory queryFactory
@@ -586,7 +583,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
completeCnt, completeCnt,
percent, percent,
Expressions.constant(0), // TODO: 순위, 꼭 해야할지? Expressions.constant(0), // TODO: 순위, 꼭 해야할지?
labelingAssignmentEntity.createdDate.min(), labelingAssignmentEntity.workStatDttm.min(),
inspector.name.min())) inspector.name.min()))
.from(worker) .from(worker)
.innerJoin(labelingAssignmentEntity) .innerJoin(labelingAssignmentEntity)
@@ -633,17 +630,17 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
return null; return null;
} }
var result = queryFactory var result =
.select( queryFactory
mapSheetAnalEntity.compareYyyy, .select(
mapSheetAnalEntity.targetYyyy, mapSheetAnalEntity.compareYyyy,
mapSheetAnalEntity.analTitle, mapSheetAnalEntity.targetYyyy,
mapSheetAnalEntity.gukyuinApplyDttm, mapSheetAnalEntity.analTitle,
mapSheetAnalEntity.analStrtDttm mapSheetAnalEntity.gukyuinApplyDttm,
) mapSheetAnalEntity.analStrtDttm)
.from(mapSheetAnalEntity) .from(mapSheetAnalEntity)
.where(mapSheetAnalEntity.id.eq(analUid)) .where(mapSheetAnalEntity.id.eq(analUid))
.fetchOne(); .fetchOne();
if (result == null) { if (result == null) {
return null; return null;
@@ -656,9 +653,8 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
ZonedDateTime analStrtDttm = result.get(mapSheetAnalEntity.analStrtDttm); ZonedDateTime analStrtDttm = result.get(mapSheetAnalEntity.analStrtDttm);
// 변화탐지년도 생성 // 변화탐지년도 생성
String detectionYear = (compareYyyy != null && targetYyyy != null) String detectionYear =
? compareYyyy + "-" + targetYyyy (compareYyyy != null && targetYyyy != null) ? compareYyyy + "-" + targetYyyy : null;
: null;
// 회차 추출 (예: "8회차" → "8") // 회차 추출 (예: "8회차" → "8")
String round = extractRoundFromTitle(analTitle); String round = extractRoundFromTitle(analTitle);
@@ -671,10 +667,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
.build(); .build();
} }
/** /** 제목에서 회차 숫자 추출 예: "8회차", "제8회차" → "8" */
* 제목에서 회차 숫자 추출
* 예: "8회차", "제8회차" → "8"
*/
private String extractRoundFromTitle(String title) { private String extractRoundFromTitle(String title) {
if (title == null || title.isEmpty()) { if (title == null || title.isEmpty()) {
return null; return null;
@@ -686,13 +679,253 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
return matcher.find() ? matcher.group(1) : null; return matcher.find() ? matcher.group(1) : null;
} }
/** /** ZonedDateTime을 "yyyy-MM-dd" 형식으로 변환 */
* ZonedDateTime을 "yyyy-MM-dd" 형식으로 변환
*/
private String formatDate(ZonedDateTime dateTime) { private String formatDate(ZonedDateTime dateTime) {
if (dateTime == null) { if (dateTime == null) {
return null; return null;
} }
return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
} }
@Override
public Page<LabelingStatDto> findLabelerDailyStat(
LabelAllocateDto.searchReq searchReq, String uuid, String userId) {
// 날짜 포맷
Expression<String> workDate =
Expressions.stringTemplate(
"TO_CHAR({0}, 'YYYY-MM-DD')", labelingAssignmentEntity.workStatDttm);
// 날짜별 전체 건수
Expression<Long> dailyTotalCnt = Expressions.numberTemplate(Long.class, "COUNT(*)");
// ⭐ 전체 기간 총 건수 (윈도우 함수)
Expression<Long> totalCnt = Expressions.numberTemplate(Long.class, "SUM(COUNT(*)) OVER ()");
// 상태별 카운트 (Postgres FILTER 사용)
Expression<Long> assignedCnt =
Expressions.numberTemplate(
Long.class,
"COUNT(*) FILTER (WHERE {0} = 'ASSIGNED')",
labelingAssignmentEntity.workState);
Expression<Long> skipCnt =
Expressions.numberTemplate(
Long.class, "COUNT(*) FILTER (WHERE {0} = 'SKIP')", labelingAssignmentEntity.workState);
Expression<Long> completeCnt =
Expressions.numberTemplate(
Long.class,
"COUNT(*) FILTER (WHERE {0} = 'COMPLETE')",
labelingAssignmentEntity.workState);
Expression<Long> remainCnt =
Expressions.numberTemplate(Long.class, "({0} - {1} - {2})", totalCnt, skipCnt, completeCnt);
// analUid로 분석 정보 조회
MapSheetAnalInferenceEntity analEntity =
queryFactory
.selectFrom(mapSheetAnalInferenceEntity)
.where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid)))
.fetchOne();
if (Objects.isNull(analEntity)) {
throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: ");
}
Pageable pageable = searchReq.toPageable();
List<LabelingStatDto> foundContent =
queryFactory
.select(
Projections.constructor(
LabelingStatDto.class,
workDate,
dailyTotalCnt,
totalCnt, // ⭐ 전체 일자 배정 건수
assignedCnt,
skipCnt,
completeCnt,
remainCnt))
.from(labelingAssignmentEntity)
.where(
labelingAssignmentEntity.workerUid.eq(userId),
labelingAssignmentEntity.analUid.eq(analEntity.getId()))
.groupBy(workDate)
.orderBy(labelingAssignmentEntity.workStatDttm.min().asc())
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.fetch();
Long countQuery =
queryFactory
.select(workDate)
.from(labelingAssignmentEntity)
.where(
labelingAssignmentEntity.workerUid.eq(userId),
labelingAssignmentEntity.analUid.eq(analEntity.getId()))
.distinct()
.fetch()
.stream()
.count();
return new PageImpl<>(foundContent, pageable, countQuery);
}
@Override
public Page<LabelingStatDto> findInspectorDailyStat(
searchReq searchReq, String uuid, String userId) {
// 날짜 포맷
Expression<String> workDate =
Expressions.stringTemplate(
"TO_CHAR({0}, 'YYYY-MM-DD')", labelingAssignmentEntity.inspectStatDttm);
// 날짜별 전체 건수
Expression<Long> dailyTotalCnt = Expressions.numberTemplate(Long.class, "COUNT(*)");
// ⭐ 전체 기간 총 건수 (윈도우 함수)
Expression<Long> totalCnt = Expressions.numberTemplate(Long.class, "SUM(COUNT(*)) OVER ()");
// 상태별 카운트 (Postgres FILTER 사용)
Expression<Long> assignedCnt =
Expressions.numberTemplate(
Long.class,
"COUNT(*) FILTER (WHERE {0} = 'UNCONFIRM')",
labelingAssignmentEntity.inspectState);
Expression<Long> skipCnt =
Expressions.numberTemplate(
Long.class,
"COUNT(*) FILTER (WHERE {0} = 'EXCEPT')",
labelingAssignmentEntity.inspectState);
Expression<Long> completeCnt =
Expressions.numberTemplate(
Long.class,
"COUNT(*) FILTER (WHERE {0} = 'COMPLETE')",
labelingAssignmentEntity.inspectState);
Expression<Long> remainCnt =
Expressions.numberTemplate(Long.class, "({0} - {1} - {2})", totalCnt, skipCnt, completeCnt);
// analUid로 분석 정보 조회
MapSheetAnalInferenceEntity analEntity =
queryFactory
.selectFrom(mapSheetAnalInferenceEntity)
.where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid)))
.fetchOne();
if (Objects.isNull(analEntity)) {
throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: ");
}
Pageable pageable = searchReq.toPageable();
List<LabelingStatDto> foundContent =
queryFactory
.select(
Projections.constructor(
LabelingStatDto.class,
workDate,
dailyTotalCnt,
totalCnt, // ⭐ 전체 일자 배정 건수
assignedCnt,
skipCnt,
completeCnt,
remainCnt))
.from(labelingAssignmentEntity)
.where(
labelingAssignmentEntity.inspectorUid.eq(userId),
labelingAssignmentEntity.analUid.eq(analEntity.getId()))
.groupBy(workDate)
.orderBy(labelingAssignmentEntity.inspectStatDttm.min().asc())
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.fetch();
Long countQuery =
queryFactory
.select(workDate)
.from(labelingAssignmentEntity)
.where(
labelingAssignmentEntity.inspectorUid.eq(userId),
labelingAssignmentEntity.analUid.eq(analEntity.getId()))
.distinct()
.fetch()
.stream()
.count();
return new PageImpl<>(foundContent, pageable, countQuery);
}
@Override
public LabelerDetail findInspectorDetail(String userId, String uuid) {
NumberExpression<Long> assignedCnt =
new CaseBuilder()
.when(labelingAssignmentEntity.inspectState.eq(InspectState.UNCONFIRM.getId()))
.then(1L)
.otherwise((Long) null)
.count();
NumberExpression<Long> skipCnt =
new CaseBuilder()
.when(labelingAssignmentEntity.inspectState.eq(InspectState.EXCEPT.getId()))
.then(1L)
.otherwise((Long) null)
.count();
NumberExpression<Long> completeCnt =
new CaseBuilder()
.when(labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()))
.then(1L)
.otherwise((Long) null)
.count();
NumberExpression<Double> percent =
new CaseBuilder()
.when(completeCnt.eq(0L))
.then(0.0)
.otherwise(
Expressions.numberTemplate(
Double.class,
"round({0} / {1}, 2)",
labelingAssignmentEntity.count(),
completeCnt));
// analUid로 분석 정보 조회
MapSheetAnalInferenceEntity analEntity =
queryFactory
.selectFrom(mapSheetAnalInferenceEntity)
.where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid)))
.fetchOne();
if (Objects.isNull(analEntity)) {
throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: ");
}
QMemberEntity inspector = QMemberEntity.memberEntity;
QMemberEntity worker = new QMemberEntity("worker");
return queryFactory
.select(
Projections.constructor(
LabelerDetail.class,
inspector.userRole,
inspector.name,
inspector.employeeNo,
assignedCnt,
skipCnt,
completeCnt,
percent,
Expressions.constant(0), // TODO: 순위, 꼭 해야할지?
labelingAssignmentEntity.inspectStatDttm.min(),
worker.name.min()))
.from(inspector)
.innerJoin(labelingAssignmentEntity)
.on(
inspector.employeeNo.eq(labelingAssignmentEntity.inspectorUid),
labelingAssignmentEntity.analUid.eq(analEntity.getId()))
.leftJoin(worker)
.on(labelingAssignmentEntity.workerUid.eq(worker.employeeNo))
.where(inspector.employeeNo.eq(userId))
.groupBy(inspector.userRole, inspector.name, inspector.employeeNo)
.fetchOne();
}
} }

View File

@@ -2,9 +2,17 @@ package com.kamco.cd.kamcoback.postgres.repository.label;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity;
import java.util.List;
import java.util.UUID;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
public interface LabelWorkRepositoryCustom { public interface LabelWorkRepositoryCustom {
List<MapSheetAnalInferenceEntity> findChangeDetectYearList();
public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq); public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq);
LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid);
} }

View File

@@ -1,22 +1,29 @@
package com.kamco.cd.kamcoback.postgres.repository.label; package com.kamco.cd.kamcoback.postgres.repository.label;
import static com.kamco.cd.kamcoback.postgres.entity.QLabelingAssignmentEntity.labelingAssignmentEntity;
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity.mapSheetAnalDataInferenceEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity.mapSheetAnalDataInferenceEntity;
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataGeomEntity; import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataGeomEntity;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Projections; import com.querydsl.core.types.Projections;
import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.core.types.dsl.CaseBuilder;
import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.core.types.dsl.NumberExpression;
import com.querydsl.core.types.dsl.StringExpression; import com.querydsl.core.types.dsl.StringExpression;
import com.querydsl.jpa.JPAExpressions;
import com.querydsl.jpa.impl.JPAQueryFactory; import com.querydsl.jpa.impl.JPAQueryFactory;
import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext; import jakarta.persistence.PersistenceContext;
import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import java.util.UUID;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
@@ -39,20 +46,59 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
this.queryFactory = queryFactory; this.queryFactory = queryFactory;
} }
/**
* 변화탐지 년도 셀렉트박스 조회
*
* @return
*/
@Override
public List<MapSheetAnalInferenceEntity> findChangeDetectYearList() {
return queryFactory
.selectFrom(mapSheetAnalInferenceEntity)
.where(
mapSheetAnalInferenceEntity.id.in(
JPAExpressions.select(mapSheetAnalInferenceEntity.id.min())
.from(mapSheetAnalInferenceEntity)
.groupBy(
mapSheetAnalInferenceEntity.compareYyyy,
mapSheetAnalInferenceEntity.targetYyyy)))
.orderBy(
mapSheetAnalInferenceEntity.compareYyyy.asc(),
mapSheetAnalInferenceEntity.targetYyyy.asc())
.fetch();
}
/**
* 라벨링 작업관리 목록 조회
*
* @param searchReq
* @return
*/
@Override @Override
public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq) { public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq) {
Pageable pageable = PageRequest.of(searchReq.getPage(), searchReq.getSize()); Pageable pageable = PageRequest.of(searchReq.getPage(), searchReq.getSize());
BooleanBuilder whereBuilder = new BooleanBuilder(); BooleanBuilder whereBuilder = new BooleanBuilder();
BooleanBuilder whereSubDataBuilder = new BooleanBuilder();
BooleanBuilder whereSubBuilder = new BooleanBuilder(); BooleanBuilder whereSubBuilder = new BooleanBuilder();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); if (StringUtils.isNotBlank(searchReq.getDetectYear())) {
String[] years = searchReq.getDetectYear().split("-");
if (searchReq.getDetectYyyy() != null) { if (years.length == 2) {
whereBuilder.and(mapSheetAnalDataInferenceEntity.targetYyyy.eq(searchReq.getDetectYyyy())); Integer compareYear = Integer.valueOf(years[0]);
Integer targetYear = Integer.valueOf(years[1]);
whereBuilder.and(
mapSheetAnalDataInferenceEntity
.compareYyyy
.eq(compareYear)
.and(mapSheetAnalDataInferenceEntity.targetYyyy.eq(targetYear)));
}
} }
// mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id) whereSubDataBuilder.and(
mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid));
whereSubBuilder.and( whereSubBuilder.and(
mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id)); mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id));
@@ -61,15 +107,10 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
&& !searchReq.getStrtDttm().isEmpty() && !searchReq.getStrtDttm().isEmpty()
&& searchReq.getEndDttm() != null && searchReq.getEndDttm() != null
&& !searchReq.getEndDttm().isEmpty()) { && !searchReq.getEndDttm().isEmpty()) {
// whereSubBuilder.and(mapSheetAnalDataInferenceGeomEntity.labelStateDttm.isNotNull());
whereSubBuilder.and( whereSubBuilder.and(
Expressions.stringTemplate( Expressions.stringTemplate(
"to_char({0}, 'YYYYMMDD')", mapSheetAnalDataInferenceGeomEntity.labelStateDttm) "to_char({0}, 'YYYYMMDD')", mapSheetAnalDataInferenceGeomEntity.labelStateDttm)
.between(searchReq.getStrtDttm(), searchReq.getEndDttm())); .between(searchReq.getStrtDttm(), searchReq.getEndDttm()));
// whereBuilder.and(mapSheetAnalDataInferenceGeomEntity.labelStateDttm.min().isNotNull());
} }
List<LabelWorkMng> foundContent = List<LabelWorkMng> foundContent =
@@ -77,9 +118,10 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
.select( .select(
Projections.constructor( Projections.constructor(
LabelWorkMng.class, LabelWorkMng.class,
mapSheetAnalDataInferenceEntity.compareYyyy, mapSheetAnalInferenceEntity.uuid,
mapSheetAnalDataInferenceEntity.targetYyyy, mapSheetAnalInferenceEntity.compareYyyy,
mapSheetAnalDataInferenceEntity.stage, mapSheetAnalInferenceEntity.targetYyyy,
mapSheetAnalInferenceEntity.stage,
mapSheetAnalDataInferenceEntity.createdDttm.min(), mapSheetAnalDataInferenceEntity.createdDttm.min(),
mapSheetAnalDataInferenceGeomEntity.dataUid.count(), mapSheetAnalDataInferenceGeomEntity.dataUid.count(),
mapSheetAnalDataInferenceGeomEntity.dataUid.count(), mapSheetAnalDataInferenceGeomEntity.dataUid.count(),
@@ -99,17 +141,21 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
mapSheetAnalDataInferenceGeomEntity.labelStateDttm.min())) mapSheetAnalDataInferenceGeomEntity.labelStateDttm.min()))
.from(mapSheetAnalDataInferenceEntity) .from(mapSheetAnalInferenceEntity)
.innerJoin(mapSheetAnalDataInferenceEntity)
.on(whereSubDataBuilder)
.innerJoin(mapSheetAnalDataInferenceGeomEntity) .innerJoin(mapSheetAnalDataInferenceGeomEntity)
.on(whereSubBuilder) .on(whereSubBuilder)
.where(whereBuilder) .where(whereBuilder)
.groupBy( .groupBy(
mapSheetAnalDataInferenceEntity.compareYyyy, mapSheetAnalInferenceEntity.uuid,
mapSheetAnalDataInferenceEntity.targetYyyy, mapSheetAnalInferenceEntity.compareYyyy,
mapSheetAnalDataInferenceEntity.stage) mapSheetAnalInferenceEntity.targetYyyy,
mapSheetAnalInferenceEntity.stage)
.orderBy( .orderBy(
mapSheetAnalDataInferenceEntity.targetYyyy.desc(), mapSheetAnalInferenceEntity.targetYyyy.desc(),
mapSheetAnalDataInferenceEntity.stage.desc()) mapSheetAnalInferenceEntity.compareYyyy.desc(),
mapSheetAnalInferenceEntity.stage.desc())
.offset(pageable.getOffset()) .offset(pageable.getOffset())
.limit(pageable.getPageSize()) .limit(pageable.getPageSize())
.fetch(); .fetch();
@@ -131,8 +177,62 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
*/ */
Long countQuery = foundContent.stream().count(); Long total =
queryFactory
.select(mapSheetAnalInferenceEntity.uuid.countDistinct())
.from(mapSheetAnalInferenceEntity)
.innerJoin(mapSheetAnalDataInferenceEntity)
.on(whereSubDataBuilder)
.innerJoin(mapSheetAnalDataInferenceGeomEntity)
.on(whereSubBuilder)
.where(whereBuilder)
.fetchOne();
return new PageImpl<>(foundContent, pageable, countQuery); return new PageImpl<>(foundContent, pageable, total);
}
/**
* 작업배정 상세조회
*
* @param uuid
* @return
*/
@Override
public LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid) {
NumberExpression<Long> labelTotCnt = mapSheetAnalDataInferenceGeomEntity.geoUid.count();
NumberExpression<Long> labelerCnt = labelingAssignmentEntity.workerUid.count();
NumberExpression<Long> reviewerCnt = labelingAssignmentEntity.inspectorUid.count();
return queryFactory
.select(
Projections.constructor(
LabelWorkMngDetail.class,
mapSheetAnalInferenceEntity
.compareYyyy
.stringValue()
.concat("-")
.concat(mapSheetAnalInferenceEntity.targetYyyy.stringValue()),
mapSheetAnalInferenceEntity.stage,
mapSheetAnalInferenceEntity.createdDttm,
labelTotCnt,
labelerCnt,
reviewerCnt))
.from(mapSheetAnalInferenceEntity)
.leftJoin(mapSheetAnalDataInferenceEntity)
.on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
.leftJoin(mapSheetAnalDataInferenceGeomEntity)
.on(mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid))
.leftJoin(labelingAssignmentEntity)
.on(
mapSheetAnalDataInferenceGeomEntity.geoUid.eq(
labelingAssignmentEntity.inferenceGeomUid))
.where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
.groupBy(
mapSheetAnalInferenceEntity.compareYyyy,
mapSheetAnalInferenceEntity.targetYyyy,
mapSheetAnalInferenceEntity.stage,
mapSheetAnalInferenceEntity.createdDttm)
.fetchOne();
} }
} }