라벨러 목록조회 임시커밋
This commit is contained in:
@@ -5,9 +5,12 @@ import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
|
|||||||
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
|
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
|
||||||
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.TargetInspector;
|
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.TargetUser;
|
||||||
|
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse;
|
||||||
import com.kamco.cd.kamcoback.label.service.LabelAllocateService;
|
import com.kamco.cd.kamcoback.label.service.LabelAllocateService;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
import io.swagger.v3.oas.annotations.media.Content;
|
import io.swagger.v3.oas.annotations.media.Content;
|
||||||
|
import io.swagger.v3.oas.annotations.media.ExampleObject;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
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;
|
||||||
@@ -23,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Tag(name = "라벨링 작업 관리", description = "라벨링 작업 관리")
|
@Tag(name = "라벨링 작업 관리", description = "라벨링 작업 배정 및 통계 조회 API")
|
||||||
@RequestMapping({"/api/label"})
|
@RequestMapping({"/api/label"})
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@RestController
|
@RestController
|
||||||
@@ -31,7 +34,7 @@ public class LabelAllocateApiController {
|
|||||||
|
|
||||||
private final LabelAllocateService labelAllocateService;
|
private final LabelAllocateService labelAllocateService;
|
||||||
|
|
||||||
@Operation(summary = "배정 가능한 사용자 목록 조회", description = "배정 가능한 사용자 목록 조회")
|
@Operation(summary = "배정 가능한 사용자 목록 조회", description = "라벨링 작업 배정을 위한 활성 상태의 사용자 목록을 조회합니다.")
|
||||||
@ApiResponses(
|
@ApiResponses(
|
||||||
value = {
|
value = {
|
||||||
@ApiResponse(
|
@ApiResponse(
|
||||||
@@ -40,16 +43,222 @@ public class LabelAllocateApiController {
|
|||||||
content =
|
content =
|
||||||
@Content(
|
@Content(
|
||||||
mediaType = "application/json",
|
mediaType = "application/json",
|
||||||
schema = @Schema(implementation = CommonCodeDto.Basic.class))),
|
schema = @Schema(implementation = CommonCodeDto.Basic.class),
|
||||||
|
examples =
|
||||||
|
@ExampleObject(
|
||||||
|
name = "사용자 목록 응답",
|
||||||
|
value =
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"data": [
|
||||||
|
{
|
||||||
|
"userRole": "LABELER",
|
||||||
|
"employeeNo": "1234567",
|
||||||
|
"name": "김라벨"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userRole": "LABELER",
|
||||||
|
"employeeNo": "2345678",
|
||||||
|
"name": "이작업"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
"""))),
|
||||||
@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("/avail-user")
|
@GetMapping("/avail-user")
|
||||||
public ApiResponseDto<List<LabelAllocateDto.UserList>> availUserList(
|
public ApiResponseDto<List<LabelAllocateDto.UserList>> availUserList(
|
||||||
@RequestParam @Schema() String role) {
|
@Parameter(description = "사용자 역할 (LABELER: 라벨러, INSPECTOR: 검수자)", example = "LABELER")
|
||||||
|
@RequestParam
|
||||||
|
@Schema()
|
||||||
|
String role) {
|
||||||
return ApiResponseDto.ok(labelAllocateService.availUserList(role));
|
return ApiResponseDto.ok(labelAllocateService.availUserList(role));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(
|
||||||
|
summary = "작업자 목록 및 3일치 통계 조회",
|
||||||
|
description =
|
||||||
|
"""
|
||||||
|
학습데이터 제작 현황 조회 API입니다.
|
||||||
|
""")
|
||||||
|
@ApiResponses(
|
||||||
|
value = {
|
||||||
|
@ApiResponse(
|
||||||
|
responseCode = "200",
|
||||||
|
description = "조회 성공",
|
||||||
|
content =
|
||||||
|
@Content(
|
||||||
|
mediaType = "application/json",
|
||||||
|
schema = @Schema(implementation = WorkerListResponse.class),
|
||||||
|
examples = {
|
||||||
|
@ExampleObject(
|
||||||
|
name = "라벨러 조회 예시",
|
||||||
|
description = "라벨러 작업자들의 통계 정보",
|
||||||
|
value =
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"data": {
|
||||||
|
"progressInfo": {
|
||||||
|
"labelingProgressRate": 79.34,
|
||||||
|
"workStatus": "진행중",
|
||||||
|
"completedCount": 6554,
|
||||||
|
"totalAssignedCount": 8258,
|
||||||
|
"labelerCount": 5,
|
||||||
|
"remainingLabelCount": 1704,
|
||||||
|
"inspectorCount": 3,
|
||||||
|
"remainingInspectCount": 890
|
||||||
|
},
|
||||||
|
"workers": [
|
||||||
|
{
|
||||||
|
"workerId": "1234567",
|
||||||
|
"workerName": "김라벨",
|
||||||
|
"workerType": "LABELER",
|
||||||
|
"totalAssigned": 1500,
|
||||||
|
"completed": 1100,
|
||||||
|
"skipped": 50,
|
||||||
|
"remaining": 350,
|
||||||
|
"history": {
|
||||||
|
"day1Ago": 281,
|
||||||
|
"day2Ago": 302,
|
||||||
|
"day3Ago": 294,
|
||||||
|
"average": 292
|
||||||
|
},
|
||||||
|
"isStagnated": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"workerId": "2345678",
|
||||||
|
"workerName": "이작업",
|
||||||
|
"workerType": "LABELER",
|
||||||
|
"totalAssigned": 2000,
|
||||||
|
"completed": 1850,
|
||||||
|
"skipped": 100,
|
||||||
|
"remaining": 50,
|
||||||
|
"history": {
|
||||||
|
"day1Ago": 5,
|
||||||
|
"day2Ago": 3,
|
||||||
|
"day3Ago": 8,
|
||||||
|
"average": 5
|
||||||
|
},
|
||||||
|
"isStagnated": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"""),
|
||||||
|
@ExampleObject(
|
||||||
|
name = "검수자 조회 예시",
|
||||||
|
description = "검수자 작업자들의 통계 정보",
|
||||||
|
value =
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"data": {
|
||||||
|
"progressInfo": {
|
||||||
|
"labelingProgressRate": 79.34,
|
||||||
|
"workStatus": "진행중",
|
||||||
|
"completedCount": 6554,
|
||||||
|
"totalAssignedCount": 8258,
|
||||||
|
"labelerCount": 5,
|
||||||
|
"remainingLabelCount": 1704,
|
||||||
|
"inspectorCount": 3,
|
||||||
|
"remainingInspectCount": 890
|
||||||
|
},
|
||||||
|
"workers": [
|
||||||
|
{
|
||||||
|
"workerId": "9876543",
|
||||||
|
"workerName": "박검수",
|
||||||
|
"workerType": "INSPECTOR",
|
||||||
|
"totalAssigned": 1200,
|
||||||
|
"completed": 980,
|
||||||
|
"skipped": 20,
|
||||||
|
"remaining": 200,
|
||||||
|
"history": {
|
||||||
|
"day1Ago": 150,
|
||||||
|
"day2Ago": 145,
|
||||||
|
"day3Ago": 155,
|
||||||
|
"average": 150
|
||||||
|
},
|
||||||
|
"isStagnated": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""")
|
||||||
|
})),
|
||||||
|
@ApiResponse(
|
||||||
|
responseCode = "404",
|
||||||
|
description = "데이터를 찾을 수 없음",
|
||||||
|
content =
|
||||||
|
@Content(
|
||||||
|
examples =
|
||||||
|
@ExampleObject(
|
||||||
|
value =
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"error": {
|
||||||
|
"code": "NOT_FOUND",
|
||||||
|
"message": "해당 분석 ID의 데이터를 찾을 수 없습니다."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"""))),
|
||||||
|
@ApiResponse(
|
||||||
|
responseCode = "500",
|
||||||
|
description = "서버 오류",
|
||||||
|
content =
|
||||||
|
@Content(
|
||||||
|
examples =
|
||||||
|
@ExampleObject(
|
||||||
|
value =
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"error": {
|
||||||
|
"code": "INTERNAL_SERVER_ERROR",
|
||||||
|
"message": "서버에 문제가 발생 하였습니다."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""")))
|
||||||
|
})
|
||||||
|
@GetMapping("/admin/workers")
|
||||||
|
public ApiResponseDto<WorkerListResponse> getWorkerStatistics(
|
||||||
|
@Parameter(description = "분석 ID (필수)", required = true, example = "3") @RequestParam
|
||||||
|
Long analUid,
|
||||||
|
@Parameter(
|
||||||
|
description = "작업자 유형 (선택) - 미입력 시 LABELER로 조회",
|
||||||
|
example = "LABELER",
|
||||||
|
schema =
|
||||||
|
@Schema(
|
||||||
|
allowableValues = {"LABELER", "INSPECTOR"},
|
||||||
|
defaultValue = "LABELER"))
|
||||||
|
@RequestParam(required = false)
|
||||||
|
String type,
|
||||||
|
@Parameter(description = "작업자 이름 검색 (부분 일치)", example = "김라벨") @RequestParam(required = false)
|
||||||
|
String searchName,
|
||||||
|
@Parameter(description = "작업자 사번 검색 (부분 일치)", example = "1234567")
|
||||||
|
@RequestParam(required = false)
|
||||||
|
String searchEmployeeNo,
|
||||||
|
@Parameter(
|
||||||
|
description = "정렬 조건 (선택) - 미입력 시 이름 오름차순",
|
||||||
|
example = "REMAINING_DESC",
|
||||||
|
schema =
|
||||||
|
@Schema(
|
||||||
|
allowableValues = {
|
||||||
|
"REMAINING_DESC",
|
||||||
|
"REMAINING_ASC",
|
||||||
|
"NAME_ASC",
|
||||||
|
"NAME_DESC"
|
||||||
|
},
|
||||||
|
defaultValue = "NAME_ASC"))
|
||||||
|
@RequestParam(required = false)
|
||||||
|
String sort) {
|
||||||
|
|
||||||
|
// type이 null이면 전체 조회 (일단 LABELER로 기본 설정)
|
||||||
|
String workerType = (type == null || type.isEmpty()) ? "LABELER" : type;
|
||||||
|
|
||||||
|
return ApiResponseDto.ok(
|
||||||
|
labelAllocateService.getWorkerStatistics(
|
||||||
|
analUid, workerType, searchName, searchEmployeeNo, sort));
|
||||||
|
}
|
||||||
|
|
||||||
// 라벨링 수량 할당하는 로직 테스트
|
// 라벨링 수량 할당하는 로직 테스트
|
||||||
@PostMapping("/allocate")
|
@PostMapping("/allocate")
|
||||||
public ApiResponseDto<Void> labelAllocate(@RequestBody LabelAllocateDto dto) {
|
public ApiResponseDto<Void> labelAllocate(@RequestBody LabelAllocateDto dto) {
|
||||||
|
|||||||
@@ -4,15 +4,20 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
|
|||||||
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.TargetInspector;
|
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.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.WorkerStatistics;
|
||||||
import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
|
import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
|
||||||
import jakarta.transaction.Transactional;
|
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;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
|
@Transactional(readOnly = true)
|
||||||
public class LabelAllocateService {
|
public class LabelAllocateService {
|
||||||
|
|
||||||
private final LabelAllocateCoreService labelAllocateCoreService;
|
private final LabelAllocateCoreService labelAllocateCoreService;
|
||||||
@@ -24,7 +29,8 @@ public class LabelAllocateService {
|
|||||||
/**
|
/**
|
||||||
* 도엽 기준 asc sorting 해서 할당 수만큼 배정하는 로직
|
* 도엽 기준 asc sorting 해서 할당 수만큼 배정하는 로직
|
||||||
*
|
*
|
||||||
* @param targetUsers
|
* @param targetUsers 라벨러 타겟 목록
|
||||||
|
* @param targetInspectors 검수자 타겟 목록
|
||||||
*/
|
*/
|
||||||
@Transactional
|
@Transactional
|
||||||
public void allocateAsc(List<TargetUser> targetUsers, List<TargetInspector> targetInspectors) {
|
public void allocateAsc(List<TargetUser> targetUsers, List<TargetInspector> targetInspectors) {
|
||||||
@@ -80,4 +86,63 @@ public class LabelAllocateService {
|
|||||||
public List<UserList> availUserList(String role) {
|
public List<UserList> availUserList(String role) {
|
||||||
return labelAllocateCoreService.availUserList(role);
|
return labelAllocateCoreService.availUserList(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 작업자 목록 및 3일치 통계 조회
|
||||||
|
*
|
||||||
|
* @param analUid 분석 ID
|
||||||
|
* @param workerType 작업자 유형 (LABELER/INSPECTOR)
|
||||||
|
* @param searchName 이름 검색
|
||||||
|
* @param searchEmployeeNo 사번 검색
|
||||||
|
* @param sortType 정렬 조건
|
||||||
|
* @return 작업자 목록 및 통계
|
||||||
|
*/
|
||||||
|
public WorkerListResponse getWorkerStatistics(
|
||||||
|
Long analUid,
|
||||||
|
String workerType,
|
||||||
|
String searchName,
|
||||||
|
String searchEmployeeNo,
|
||||||
|
String sortType) {
|
||||||
|
|
||||||
|
// 작업 진행 현황 조회
|
||||||
|
var progressInfo = labelAllocateCoreService.findWorkProgressInfo(analUid);
|
||||||
|
|
||||||
|
// 작업자 통계 조회
|
||||||
|
List<WorkerStatistics> workers =
|
||||||
|
labelAllocateCoreService.findWorkerStatistics(
|
||||||
|
analUid, workerType, searchName, searchEmployeeNo, 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일 평균이 특정 기준 미만일 때 - 예: 10건 미만)
|
||||||
|
if (average < 10) {
|
||||||
|
worker.setIsStagnated(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return WorkerListResponse.builder().progressInfo(progressInfo).workers(workers).build();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,11 @@ package com.kamco.cd.kamcoback.postgres.core;
|
|||||||
|
|
||||||
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
|
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
|
||||||
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.WorkProgressInfo;
|
||||||
|
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.repository.label.LabelAllocateRepository;
|
import com.kamco.cd.kamcoback.postgres.repository.label.LabelAllocateRepository;
|
||||||
|
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;
|
||||||
@@ -40,4 +43,23 @@ public class LabelAllocateCoreService {
|
|||||||
public List<UserList> availUserList(String role) {
|
public List<UserList> availUserList(String role) {
|
||||||
return labelAllocateRepository.availUserList(role);
|
return labelAllocateRepository.availUserList(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<WorkerStatistics> findWorkerStatistics(
|
||||||
|
Long analUid,
|
||||||
|
String workerType,
|
||||||
|
String searchName,
|
||||||
|
String searchEmployeeNo,
|
||||||
|
String sortType) {
|
||||||
|
return labelAllocateRepository.findWorkerStatistics(
|
||||||
|
analUid, workerType, searchName, searchEmployeeNo, sortType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WorkProgressInfo findWorkProgressInfo(Long analUid) {
|
||||||
|
return labelAllocateRepository.findWorkProgressInfo(analUid);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long findDailyProcessedCount(
|
||||||
|
String workerId, String workerType, LocalDate date, Long analUid) {
|
||||||
|
return labelAllocateRepository.findDailyProcessedCount(workerId, workerType, date, analUid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +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.UserList;
|
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
|
||||||
|
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
|
||||||
|
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 java.time.LocalDate;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@@ -18,4 +21,14 @@ public interface LabelAllocateRepositoryCustom {
|
|||||||
void assignInspector(UUID assignmentUid, String userId);
|
void assignInspector(UUID assignmentUid, String userId);
|
||||||
|
|
||||||
List<UserList> availUserList(String role);
|
List<UserList> availUserList(String role);
|
||||||
|
|
||||||
|
// 작업자 통계 조회
|
||||||
|
List<WorkerStatistics> findWorkerStatistics(
|
||||||
|
Long analUid, String workerType, String searchName, String searchEmployeeNo, String sortType);
|
||||||
|
|
||||||
|
// 작업 진행 현황 조회
|
||||||
|
WorkProgressInfo findWorkProgressInfo(Long analUid);
|
||||||
|
|
||||||
|
// 작업자별 일일 처리량 조회
|
||||||
|
Long findDailyProcessedCount(String workerId, String workerType, LocalDate date, Long analUid);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,38 +8,39 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity;
|
|||||||
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
|
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
|
||||||
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.UserList;
|
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
|
||||||
|
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
|
||||||
|
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.MapSheetAnalDataGeomEntity;
|
|
||||||
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalEntity;
|
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalEntity;
|
||||||
import com.querydsl.core.types.Projections;
|
import com.querydsl.core.types.Projections;
|
||||||
import com.querydsl.core.types.dsl.Expressions;
|
import com.querydsl.core.types.dsl.BooleanExpression;
|
||||||
|
import com.querydsl.core.types.dsl.CaseBuilder;
|
||||||
|
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.impl.JPAQueryFactory;
|
import com.querydsl.jpa.impl.JPAQueryFactory;
|
||||||
import jakarta.persistence.EntityManager;
|
import jakarta.persistence.EntityManager;
|
||||||
import jakarta.persistence.EntityNotFoundException;
|
import jakarta.persistence.EntityNotFoundException;
|
||||||
import jakarta.persistence.PersistenceContext;
|
import jakarta.persistence.PersistenceContext;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.time.LocalTime;
|
||||||
|
import java.time.ZoneId;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
|
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Repository
|
@Repository
|
||||||
public class LabelAllocateRepositoryImpl extends QuerydslRepositorySupport
|
@RequiredArgsConstructor
|
||||||
implements LabelAllocateRepositoryCustom {
|
public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCustom {
|
||||||
|
|
||||||
private final JPAQueryFactory queryFactory;
|
private final JPAQueryFactory queryFactory;
|
||||||
private final StringExpression NULL_STRING = Expressions.stringTemplate("cast(null as text)");
|
|
||||||
|
|
||||||
@PersistenceContext private EntityManager em;
|
@PersistenceContext private EntityManager em;
|
||||||
|
|
||||||
public LabelAllocateRepositoryImpl(JPAQueryFactory queryFactory) {
|
|
||||||
super(MapSheetAnalDataGeomEntity.class);
|
|
||||||
this.queryFactory = queryFactory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Long> fetchNextIds(Long lastId, int batchSize) {
|
public List<Long> fetchNextIds(Long lastId, int batchSize) {
|
||||||
|
|
||||||
@@ -150,4 +151,232 @@ public class LabelAllocateRepositoryImpl extends QuerydslRepositorySupport
|
|||||||
.orderBy(memberEntity.name.asc())
|
.orderBy(memberEntity.name.asc())
|
||||||
.fetch();
|
.fetch();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<WorkerStatistics> findWorkerStatistics(
|
||||||
|
Long analUid,
|
||||||
|
String workerType,
|
||||||
|
String searchName,
|
||||||
|
String searchEmployeeNo,
|
||||||
|
String sortType) {
|
||||||
|
|
||||||
|
// 작업자 유형에 따른 필드 선택
|
||||||
|
StringExpression workerIdField =
|
||||||
|
"INSPECTOR".equals(workerType)
|
||||||
|
? labelingAssignmentEntity.inspectorUid
|
||||||
|
: labelingAssignmentEntity.workerUid;
|
||||||
|
|
||||||
|
BooleanExpression workerCondition =
|
||||||
|
"INSPECTOR".equals(workerType)
|
||||||
|
? labelingAssignmentEntity.inspectorUid.isNotNull()
|
||||||
|
: labelingAssignmentEntity.workerUid.isNotNull();
|
||||||
|
|
||||||
|
// 검색 조건
|
||||||
|
BooleanExpression searchCondition = null;
|
||||||
|
if (searchName != null && !searchName.isEmpty()) {
|
||||||
|
searchCondition = memberEntity.name.contains(searchName);
|
||||||
|
}
|
||||||
|
if (searchEmployeeNo != null && !searchEmployeeNo.isEmpty()) {
|
||||||
|
BooleanExpression empCondition = memberEntity.employeeNo.contains(searchEmployeeNo);
|
||||||
|
searchCondition = searchCondition == null ? empCondition : searchCondition.and(empCondition);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 완료, 스킵, 남은 작업 계산
|
||||||
|
NumberExpression<Long> completedSum =
|
||||||
|
new CaseBuilder()
|
||||||
|
.when(labelingAssignmentEntity.workState.eq("DONE"))
|
||||||
|
.then(1L)
|
||||||
|
.otherwise(0L)
|
||||||
|
.sum();
|
||||||
|
|
||||||
|
NumberExpression<Long> skippedSum =
|
||||||
|
new CaseBuilder()
|
||||||
|
.when(labelingAssignmentEntity.workState.eq("SKIP"))
|
||||||
|
.then(1L)
|
||||||
|
.otherwise(0L)
|
||||||
|
.sum();
|
||||||
|
|
||||||
|
NumberExpression<Long> remainingSum =
|
||||||
|
new CaseBuilder()
|
||||||
|
.when(
|
||||||
|
labelingAssignmentEntity
|
||||||
|
.workState
|
||||||
|
.notIn("DONE", "SKIP")
|
||||||
|
.and(labelingAssignmentEntity.workState.isNotNull()))
|
||||||
|
.then(1L)
|
||||||
|
.otherwise(0L)
|
||||||
|
.sum();
|
||||||
|
|
||||||
|
// 기본 통계 조회 쿼리
|
||||||
|
var baseQuery =
|
||||||
|
queryFactory
|
||||||
|
.select(
|
||||||
|
workerIdField,
|
||||||
|
memberEntity.name,
|
||||||
|
workerIdField.count(),
|
||||||
|
completedSum,
|
||||||
|
skippedSum,
|
||||||
|
remainingSum,
|
||||||
|
labelingAssignmentEntity.stagnationYn.max())
|
||||||
|
.from(labelingAssignmentEntity)
|
||||||
|
.leftJoin(memberEntity)
|
||||||
|
.on(
|
||||||
|
"INSPECTOR".equals(workerType)
|
||||||
|
? memberEntity.employeeNo.eq(labelingAssignmentEntity.inspectorUid)
|
||||||
|
: memberEntity.employeeNo.eq(labelingAssignmentEntity.workerUid))
|
||||||
|
.where(labelingAssignmentEntity.analUid.eq(analUid), workerCondition, searchCondition)
|
||||||
|
.groupBy(workerIdField, memberEntity.name);
|
||||||
|
|
||||||
|
// 정렬 조건 적용
|
||||||
|
if (sortType != null) {
|
||||||
|
switch (sortType) {
|
||||||
|
case "REMAINING_DESC":
|
||||||
|
baseQuery.orderBy(remainingSum.desc());
|
||||||
|
break;
|
||||||
|
case "REMAINING_ASC":
|
||||||
|
baseQuery.orderBy(remainingSum.asc());
|
||||||
|
break;
|
||||||
|
case "NAME_ASC":
|
||||||
|
baseQuery.orderBy(memberEntity.name.asc());
|
||||||
|
break;
|
||||||
|
case "NAME_DESC":
|
||||||
|
baseQuery.orderBy(memberEntity.name.desc());
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
baseQuery.orderBy(memberEntity.name.asc());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
baseQuery.orderBy(memberEntity.name.asc());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 결과를 DTO로 변환
|
||||||
|
return baseQuery.fetch().stream()
|
||||||
|
.map(
|
||||||
|
tuple -> {
|
||||||
|
Character maxStagnationYn = tuple.get(labelingAssignmentEntity.stagnationYn.max());
|
||||||
|
return WorkerStatistics.builder()
|
||||||
|
.workerId(tuple.get(workerIdField))
|
||||||
|
.workerName(tuple.get(memberEntity.name))
|
||||||
|
.workerType(workerType)
|
||||||
|
.totalAssigned(tuple.get(workerIdField.count()))
|
||||||
|
.completed(tuple.get(completedSum))
|
||||||
|
.skipped(tuple.get(skippedSum))
|
||||||
|
.remaining(tuple.get(remainingSum))
|
||||||
|
.history(null) // 3일 이력은 Service에서 채움
|
||||||
|
.isStagnated(maxStagnationYn != null && maxStagnationYn == 'Y')
|
||||||
|
.build();
|
||||||
|
})
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public WorkProgressInfo findWorkProgressInfo(Long analUid) {
|
||||||
|
// 전체 배정 건수
|
||||||
|
Long totalAssigned =
|
||||||
|
queryFactory
|
||||||
|
.select(labelingAssignmentEntity.count())
|
||||||
|
.from(labelingAssignmentEntity)
|
||||||
|
.where(labelingAssignmentEntity.analUid.eq(analUid))
|
||||||
|
.fetchOne();
|
||||||
|
|
||||||
|
// 완료 + 스킵 건수
|
||||||
|
Long completedCount =
|
||||||
|
queryFactory
|
||||||
|
.select(labelingAssignmentEntity.count())
|
||||||
|
.from(labelingAssignmentEntity)
|
||||||
|
.where(
|
||||||
|
labelingAssignmentEntity.analUid.eq(analUid),
|
||||||
|
labelingAssignmentEntity.workState.in("DONE", "SKIP"))
|
||||||
|
.fetchOne();
|
||||||
|
|
||||||
|
// 투입된 라벨러 수 (고유한 worker_uid 수)
|
||||||
|
Long labelerCount =
|
||||||
|
queryFactory
|
||||||
|
.select(labelingAssignmentEntity.workerUid.countDistinct())
|
||||||
|
.from(labelingAssignmentEntity)
|
||||||
|
.where(
|
||||||
|
labelingAssignmentEntity.analUid.eq(analUid),
|
||||||
|
labelingAssignmentEntity.workerUid.isNotNull())
|
||||||
|
.fetchOne();
|
||||||
|
|
||||||
|
// 남은 라벨링 작업 데이터 수
|
||||||
|
Long remainingLabelCount =
|
||||||
|
queryFactory
|
||||||
|
.select(labelingAssignmentEntity.count())
|
||||||
|
.from(labelingAssignmentEntity)
|
||||||
|
.where(
|
||||||
|
labelingAssignmentEntity.analUid.eq(analUid),
|
||||||
|
labelingAssignmentEntity.workerUid.isNotNull(),
|
||||||
|
labelingAssignmentEntity.workState.notIn("DONE", "SKIP"))
|
||||||
|
.fetchOne();
|
||||||
|
|
||||||
|
// 투입된 검수자 수 (고유한 inspector_uid 수)
|
||||||
|
Long inspectorCount =
|
||||||
|
queryFactory
|
||||||
|
.select(labelingAssignmentEntity.inspectorUid.countDistinct())
|
||||||
|
.from(labelingAssignmentEntity)
|
||||||
|
.where(
|
||||||
|
labelingAssignmentEntity.analUid.eq(analUid),
|
||||||
|
labelingAssignmentEntity.inspectorUid.isNotNull())
|
||||||
|
.fetchOne();
|
||||||
|
|
||||||
|
// 남은 검수 작업 데이터 수
|
||||||
|
Long remainingInspectCount =
|
||||||
|
queryFactory
|
||||||
|
.select(labelingAssignmentEntity.count())
|
||||||
|
.from(labelingAssignmentEntity)
|
||||||
|
.where(
|
||||||
|
labelingAssignmentEntity.analUid.eq(analUid),
|
||||||
|
labelingAssignmentEntity.inspectorUid.isNotNull(),
|
||||||
|
labelingAssignmentEntity.workState.notIn("DONE"))
|
||||||
|
.fetchOne();
|
||||||
|
|
||||||
|
// 진행률 계산
|
||||||
|
double progressRate = 0.0;
|
||||||
|
if (totalAssigned != null && totalAssigned > 0) {
|
||||||
|
progressRate =
|
||||||
|
(completedCount != null ? completedCount.doubleValue() : 0.0) / totalAssigned * 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 작업 상태 판단 (간단하게 진행률 100%면 종료, 아니면 진행중)
|
||||||
|
String workStatus = (progressRate >= 100.0) ? "종료" : "진행중";
|
||||||
|
|
||||||
|
return WorkProgressInfo.builder()
|
||||||
|
.labelingProgressRate(progressRate)
|
||||||
|
.workStatus(workStatus)
|
||||||
|
.completedCount(completedCount != null ? completedCount : 0L)
|
||||||
|
.totalAssignedCount(totalAssigned != null ? totalAssigned : 0L)
|
||||||
|
.labelerCount(labelerCount != null ? labelerCount : 0L)
|
||||||
|
.remainingLabelCount(remainingLabelCount != null ? remainingLabelCount : 0L)
|
||||||
|
.inspectorCount(inspectorCount != null ? inspectorCount : 0L)
|
||||||
|
.remainingInspectCount(remainingInspectCount != null ? remainingInspectCount : 0L)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long findDailyProcessedCount(
|
||||||
|
String workerId, String workerType, LocalDate date, Long analUid) {
|
||||||
|
|
||||||
|
// 해당 날짜의 시작과 끝 시간
|
||||||
|
ZonedDateTime startOfDay = date.atStartOfDay(ZoneId.systemDefault());
|
||||||
|
ZonedDateTime endOfDay = date.atTime(LocalTime.MAX).atZone(ZoneId.systemDefault());
|
||||||
|
|
||||||
|
BooleanExpression workerCondition =
|
||||||
|
"INSPECTOR".equals(workerType)
|
||||||
|
? labelingAssignmentEntity.inspectorUid.eq(workerId)
|
||||||
|
: labelingAssignmentEntity.workerUid.eq(workerId);
|
||||||
|
|
||||||
|
Long count =
|
||||||
|
queryFactory
|
||||||
|
.select(labelingAssignmentEntity.count())
|
||||||
|
.from(labelingAssignmentEntity)
|
||||||
|
.where(
|
||||||
|
labelingAssignmentEntity.analUid.eq(analUid),
|
||||||
|
workerCondition,
|
||||||
|
labelingAssignmentEntity.workState.in("DONE", "SKIP"),
|
||||||
|
labelingAssignmentEntity.modifiedDate.between(startOfDay, endOfDay))
|
||||||
|
.fetchOne();
|
||||||
|
|
||||||
|
return count != null ? count : 0L;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user