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-02 17:58:25 +09:00
parent 23494e13a3
commit d72e9de61e
7 changed files with 313 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java
View File

@@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.label;
import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
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.TargetUser;
import com.kamco.cd.kamcoback.label.service.LabelAllocateService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,35 +27,10 @@ public class LabelAllocateApiController {
@PostMapping("/allocate")
public ApiResponseDto<Void> labelAllocate(@RequestBody LabelAllocateDto dto) {
// 도엽별 카운트 쿼리
// List<Sheet> sheets =
// List.of(
// new Sheet("1", 261),
// new Sheet("2", 500),
// new Sheet("3", 350),
// new Sheet("4", 250),
// new Sheet("5", 380),
// new Sheet("6", 459));
// 사용자별 할당 입력한 값
// List<TargetUser> targets =
// List.of(new TargetUser("A", 1000), new TargetUser("B", 500), new TargetUser("C", 700));
// LabelAllocateService.allocateSheetCount(new ArrayList<>(sheets), new
// ArrayList<>(targets));
// targets.forEach(
// t -> {
// log.info("[" + t.getUserId() + "]");
// t.getAssigned()
// .forEach(
// u -> {
// log.info(" - 도엽: " + u.getSheetId() + " (" + u.getCount() + ")");
// });
// });
List<TargetUser> targets =
List.of(new TargetUser("1", 1000), new TargetUser("2", 400), new TargetUser("3", 440));
labelAllocateService.allocateAsc(targets);
List.of(new TargetUser("1234567", 1000), new TargetUser("2345678", 400), new TargetUser("3456789", 440));
List<TargetInspector> inspectors = List.of(new TargetInspector("9876543", 1000), new TargetInspector("8765432", 340), new TargetInspector("98765432", 500));
labelAllocateService.allocateAsc(targets, inspectors);
return ApiResponseDto.ok(null);
}

106
src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java
View File

@@ -1,22 +1,80 @@
package com.kamco.cd.kamcoback.label.dto;
import java.util.ArrayList;
import java.util.List;
import com.kamco.cd.kamcoback.common.utils.enums.CodeExpose;
import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
import java.time.ZonedDateTime;
import java.util.UUID;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
public class LabelAllocateDto {
@CodeExpose
@Getter
@AllArgsConstructor
public static class Sheet {
public enum LabelMngState implements EnumType {
PENDING("작업대기"),
ASSIGNED("작업할당"),
STOP("중단"),
LABEL_ING("라벨진행중"),
LABEL_COMPLETE("라벨완료"),
INSPECT_REQ("검수요청"),
INSPECT_ING("검수진행중"),
INSPECT_COMPLETE("검수완료");
private final String sheetId;
private int count;
private String desc;
public void decrease(int amount) {
this.count -= amount;
@Override
public String getId() {
return name();
}
@Override
public String getText() {
return desc;
}
}
@CodeExpose
@Getter
@AllArgsConstructor
public enum LabelState implements EnumType {
ASSIGNED("배정"),
SKIP("스킵"),
COMPLETE("완료");
private String desc;
@Override
public String getId() {
return name();
}
@Override
public String getText() {
return desc;
}
}
@CodeExpose
@Getter
@AllArgsConstructor
public enum InspectState implements EnumType {
UNCONFIRM("미확인"),
EXCEPT("제외"),
COMPLETE("완료");
private String desc;
@Override
public String getId() {
return name();
}
@Override
public String getText() {
return desc;
}
}
@@ -25,22 +83,36 @@ public class LabelAllocateDto {
private final String userId;
private final int demand;
private final List<Sheet> assigned = new ArrayList<>();
private int allocated = 0;
@Setter private int shortage = 0;
public TargetUser(String userId, int demand) {
this.userId = userId;
this.demand = demand;
}
}
public int getRemainDemand() {
return demand - allocated;
}
@Getter
@AllArgsConstructor
public static class TargetInspector {
public void assign(String sheetId, int count) {
assigned.add(new Sheet(sheetId, count));
allocated += count;
}
private final String inspectorUid;
private int userCount;
}
@Getter
@Setter
@AllArgsConstructor
public static class Basic {
private UUID assignmentUid;
private Long inferenceGeomUid;
private String workerUid;
private String inspectorUid;
private String workState;
private Character stagnationYn;
private String assignGroupId;
private Long learnGeomUid;
private Long analUid;
private ZonedDateTime createdDttm;
private ZonedDateTime updatedDttm;
}
}

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

@@ -1,12 +1,12 @@
package com.kamco.cd.kamcoback.label.service;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.Sheet;
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.TargetUser;
import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
import jakarta.transaction.Transactional;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -20,91 +20,30 @@ public class LabelAllocateService {
this.labelAllocateCoreService = labelAllocateCoreService;
}
/**
* 도엽 count 수와 할당된 count 수를 비교해서 많은 수부터 먼저 배정하고 나머지를 분배 배정하는 로직
*
* @param sheets
* @param targetUsers
*/
public static void allocateSheetCount(List<Sheet> sheets, List<TargetUser> targetUsers) {
// 1️⃣ 실제 도엽 기준 할당
allocateSheets(sheets, targetUsers);
// 2️⃣ 전체 부족분 비율 계산
distributeShortage(targetUsers); // 항상 마지막에 한 번만 호출해야함
}
public static void allocateSheets(List<Sheet> sheets, List<TargetUser> targets) {
// 도엽 큰 것부터 (선택 사항)
sheets.sort(Comparator.comparingInt(Sheet::getCount).reversed());
for (TargetUser target : targets) {
Iterator<Sheet> it = sheets.iterator();
while (it.hasNext() && target.getRemainDemand() > 0) {
Sheet sheet = it.next();
int assignable = Math.min(sheet.getCount(), target.getRemainDemand());
if (assignable > 0) {
target.assign(sheet.getSheetId(), assignable);
sheet.decrease(assignable);
}
if (sheet.getCount() == 0) {
it.remove();
}
}
}
}
public static void distributeShortage(List<TargetUser> targets) {
int totalDemand = targets.stream().mapToInt(TargetUser::getDemand).sum();
int totalAllocated = targets.stream().mapToInt(t -> t.getAllocated()).sum();
int shortage = totalDemand - totalAllocated;
if (shortage <= 0) {
return;
}
int distributed = 0;
for (int i = 0; i < targets.size(); i++) {
TargetUser t = targets.get(i);
// 마지막 타겟이 나머지 가져가게 (반올림 오차 방지)
int share;
if (i == targets.size() - 1) {
share = shortage - distributed;
} else {
double ratio = (double) t.getDemand() / totalDemand;
share = (int) Math.round(shortage * ratio);
distributed += share;
}
t.setShortage(share);
}
}
/**
* 도엽 기준 asc sorting 해서 할당 수만큼 배정하는 로직
*
* @param targetUsers
*/
@Transactional
public void allocateAsc(List<TargetUser> targetUsers) {
public void allocateAsc(List<TargetUser> targetUsers, List<TargetInspector> targetInspectors) {
Long lastId = null;
//geom 잔여건수 != 프론트에서 넘어 온 총 건수 -> return
Long chargeCnt = labelAllocateCoreService.findLabelUnAssignedCnt(3L); //TODO
Long totalDemand = targetUsers.stream().mapToLong(TargetUser::getDemand).sum();
if (!Objects.equals(chargeCnt, totalDemand)) {
log.info("chargeCnt != totalDemand");
return;
}
//라벨러에게 건수만큼 할당
for (TargetUser target : targetUsers) {
int remaining = target.getDemand();
while (remaining > 0) {
int batchSize = Math.min(remaining, 500);
int batchSize = Math.min(remaining, 100);
List<Long> ids = labelAllocateCoreService.fetchNextIds(lastId, batchSize);
if (ids.isEmpty()) {
@@ -112,11 +51,29 @@ public class LabelAllocateService {
}
labelAllocateCoreService.assignOwner(
ids, Long.valueOf(target.getUserId())); // TODO : userId를 숫자값을 가져올지 사번을 가져올지 고민
ids, target.getUserId());
remaining -= ids.size();
lastId = ids.get(ids.size() - 1);
}
}
//검수자에게 userCount명 만큼 할당
List<LabelAllocateDto.Basic> list = labelAllocateCoreService.findAssignedLabelerList(3L);
int reviewerIndex = 0;
int count = 0;
log.info("list : " + list.size());
for (LabelAllocateDto.Basic labeler : list) {
TargetInspector inspector = targetInspectors.get(reviewerIndex);
labelAllocateCoreService.assignInspector(labeler.getAssignmentUid(), inspector.getInspectorUid());
count++;
if (count == inspector.getUserCount()) {
reviewerIndex++;
count = 0;
}
}
}
}