MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

라벨 재할당 로직 수정, 배치로 재배치는 나중에

Browse Source
This commit is contained in:
Gina(박가연)
2026-01-07 14:24:20 +09:00
parent fd249ae2ac
commit c8773dabdd
8 changed files with 243 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
View File

@@ -7,12 +7,14 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.MoveUserList;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.MoveInfo;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.TargetUser;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse;
import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
@@ -73,6 +75,9 @@ public class LabelAllocateService {
labelAllocateCoreService.assignOwner(sub, target.getUserId(), analUid);
index = end;
// 라벨러 유저 테이블에 insert
labelAllocateCoreService.insertLabelerUser(analUid, target.getUserId(), target.getDemand());
}
// 검수자 할당 테이블에 insert. TODO: 익일 배치로 라벨링 완료된 내역을 검수자에게 할당해야 함
@@ -116,31 +121,51 @@ public class LabelAllocateService {
}
public ApiResponseDto.ResponseObj allocateMove(
Integer stage,
List<TargetUser> targetUsers,
Integer compareYyyy,
Integer targetYyyy,
String userId) {
Long lastId = null;
Integer totalCnt, String uuid, List<String> targetUsers, String userId) {
Long chargeCnt = targetUsers.stream().mapToLong(TargetUser::getDemand).sum();
if (chargeCnt <= 0) {
return new ApiResponseDto.ResponseObj(ApiResponseCode.BAD_REQUEST, "이관할 데이터를 입력해주세요.");
Map<String, Integer> result = new LinkedHashMap<>();
int userCount = targetUsers.size();
if (userCount <= 0) {
return new ApiResponseDto.ResponseObj(ApiResponseCode.BAD_REQUEST, "재할당할 라벨러를 선택해주세요.");
}
List<Long> allIds =
labelAllocateCoreService.fetchNextMoveIds(
lastId, chargeCnt, compareYyyy, targetYyyy, stage, userId);
int index = 0;
for (TargetUser target : targetUsers) {
int end = index + target.getDemand();
List<Long> sub = allIds.subList(index, end);
int base = totalCnt / userCount;
int remainder = totalCnt % userCount;
labelAllocateCoreService.assignOwnerMove(sub, target.getUserId());
index = end;
for (int i = 0; i < userCount; i++) {
int assignCount = base;
// 마지막 사람에게 나머지 몰아주기
if (i == userCount - 1) {
assignCount += remainder;
}
result.put(targetUsers.get(i), assignCount);
// TODO: 재할당 테이블에 update 까지만 하고 나머지는 배치에서 처리하기?
labelAllocateCoreService.assignOwnerReAllocate(
uuid, userId, targetUsers.get(i), (long) assignCount);
}
// Long lastId = null;
// Long chargeCnt = targetUsers.stream().mapToLong(TargetUser::getDemand).sum();
//
// if (chargeCnt <= 0) {
// return new ApiResponseDto.ResponseObj(ApiResponseCode.BAD_REQUEST, "이관할 데이터를 입력해주세요.");
// }
//
// List<Long> allIds =
// labelAllocateCoreService.fetchNextMoveIds(
// lastId, chargeCnt, compareYyyy, targetYyyy, stage, userId);
// int index = 0;
// for (TargetUser target : targetUsers) {
// int end = index + target.getDemand();
// List<Long> sub = allIds.subList(index, end);
//
// labelAllocateCoreService.assignOwnerMove(sub, target.getUserId());
// index = end;
// }
return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "이관을 완료하였습니다.");
}
@@ -161,7 +186,7 @@ public class LabelAllocateService {
}
}
public List<MoveUserList> moveAvailUserList(String userId, String uuid) {
public MoveInfo moveAvailUserList(String userId, String uuid) {
return labelAllocateCoreService.moveAvailUserList(userId, uuid);
}
}