From b4ae6e148dcbf54e75ab13d9acc41480480349b4 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 5 Jan 2026 11:46:21 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EB=B2=A8=ED=95=A0=EB=8B=B9=20?= =?UTF-8?q?=EA=B2=80=EC=88=98=EC=9E=90=20insert=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../label/LabelAllocateApiController.java | 32 ++--- .../kamcoback/label/dto/LabelAllocateDto.java | 31 +--- .../label/dto/LabelInspectorDto.java | 22 +++ .../label/service/LabelAllocateService.java | 62 ++++---- .../core/LabelAllocateCoreService.java | 36 +++-- .../entity/LabelingInspectorEntity.java | 33 +++++ .../label/LabelAllocateRepositoryCustom.java | 23 ++- .../label/LabelAllocateRepositoryImpl.java | 135 ++++++++---------- 8 files changed, 190 insertions(+), 184 deletions(-) create mode 100644 src/main/java/com/kamco/cd/kamcoback/label/dto/LabelInspectorDto.java create mode 100644 src/main/java/com/kamco/cd/kamcoback/postgres/entity/LabelingInspectorEntity.java diff --git a/src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java b/src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java index 6869b636..3f2133f7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java @@ -122,8 +122,6 @@ public class LabelAllocateApiController { return ApiResponseDto.okObject( labelAllocateService.allocateAsc( - dto.getLabelerAutoType(), - dto.getInspectorAutoType(), dto.getStage(), dto.getLabelers(), dto.getInspectors(), @@ -140,13 +138,13 @@ public class LabelAllocateApiController { }) @GetMapping("/stage-detail") public ApiResponseDto findInferenceDetail( - @Parameter(description = "비교년도", required = true, example = "2022") @RequestParam - Integer compareYyyy, - @Parameter(description = "기준년도", required = true, example = "2024") @RequestParam - Integer targetYyyy, - @Parameter(description = "회차", required = true, example = "4") @RequestParam Integer stage) { - return ApiResponseDto.ok( - labelAllocateService.findInferenceDetail(compareYyyy, targetYyyy, stage)); + @Parameter( + description = "회차 마스터 key", + required = true, + example = "8584e8d4-53b3-4582-bde2-28a81495a626") + @RequestParam + String uuid) { + return ApiResponseDto.ok(labelAllocateService.findInferenceDetail(uuid)); } @Operation( @@ -154,14 +152,14 @@ public class LabelAllocateApiController { description = "작업현황 관리 > 라벨러 상세 정보, 작업이관 팝업 내 라벨러 상세 정보 동일") @GetMapping("/labeler-detail") public ApiResponseDto findLabelerDetail( - @RequestParam(defaultValue = "01022223333") String userId, - @Parameter(description = "비교년도", required = true, example = "2022") @RequestParam - Integer compareYyyy, - @Parameter(description = "기준년도", required = true, example = "2024") @RequestParam - Integer targetYyyy, - @Parameter(description = "회차", required = true, example = "4") @RequestParam Integer stage) { - return ApiResponseDto.ok( - labelAllocateService.findLabelerDetail(userId, compareYyyy, targetYyyy, stage)); + @RequestParam(defaultValue = "01022223333", required = true) String userId, + @Parameter( + description = "회차 마스터 key", + required = true, + example = "8584e8d4-53b3-4582-bde2-28a81495a626") + @RequestParam + String uuid) { + return ApiResponseDto.ok(labelAllocateService.findLabelerDetail(userId, uuid)); } @Operation(summary = "작업현황 관리 > 상세 > 작업 이관", description = "작업현황 관리 > 상세 > 작업 이관") diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java index c0dd75a6..f5a060a8 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java @@ -87,22 +87,13 @@ public class LabelAllocateDto { @AllArgsConstructor public static class AllocateDto { - // @Schema(description = "분석 ID", example = "3") - // private Long analUid; - @Schema(description = "비교년도", example = "2022", required = true) private Integer compareYyyy; @Schema(description = "기준년도", example = "2024", required = true) private Integer targetYyyy; - @Schema(description = "라벨러 자동/수동여부(AUTO/MANUAL)", example = "AUTO") - private String labelerAutoType; - - @Schema(description = "검수자 자동/수동여부(AUTO/MANUAL)", example = "AUTO") - private String inspectorAutoType; - - @Schema(description = "회차", example = "4") + @Schema(description = "회차", example = "4", required = true) private Integer stage; @Schema( @@ -130,22 +121,12 @@ public class LabelAllocateDto { description = "검수자 할당 목록", example = """ - [ - { - "inspectorUid": "K20251216001", - "userCount": 1000 - }, - { - "inspectorUid": "01022225555", - "userCount": 340 - }, - { - "inspectorUid": "K20251212001", - "userCount": 500 - } + ["K20251216001", + "01022225555", + "K20251212001" ] """) - private List inspectors; + private List inspectors; } @Getter @@ -273,6 +254,6 @@ public class LabelAllocateDto { public static class AllocateInfoDto { private Long geoUid; - private String mapSheetNum; + private Long mapSheetNum; } } diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelInspectorDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelInspectorDto.java new file mode 100644 index 00000000..89fd8ef7 --- /dev/null +++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelInspectorDto.java @@ -0,0 +1,22 @@ +package com.kamco.cd.kamcoback.label.dto; + +import java.time.ZonedDateTime; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +public class LabelInspectorDto { + + @Getter + @Setter + @AllArgsConstructor + public static class Basic { + + private UUID operatorUid; + private Long analUid; + private String inspectorUid; + private ZonedDateTime createdDttm; + private ZonedDateTime updatedDttm; + } +} diff --git a/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java b/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java index c919a5eb..8a994a1f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java @@ -6,7 +6,6 @@ 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.InferenceDetail; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail; -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.UserList; import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.DailyHistory; @@ -16,7 +15,6 @@ import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService; import java.time.LocalDate; import java.util.List; import java.util.Objects; -import java.util.UUID; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,19 +36,15 @@ public class LabelAllocateService { /** * 도엽 기준 asc sorting 해서 할당 수만큼 배정하는 로직 * - * @param labelerAutoType 라벨러 자동/수동 배정 타입 - * @param inspectorAutoType 검수자 자동/수동 배정 타입 * @param stage 회차 * @param targetUsers 라벨러 목록 * @param targetInspectors 검수자 목록 */ @Transactional public ApiResponseDto.ResponseObj allocateAsc( - String labelerAutoType, - String inspectorAutoType, Integer stage, List targetUsers, - List targetInspectors, + List targetInspectors, Integer compareYyyy, Integer targetYyyy) { Long lastId = null; @@ -70,35 +64,45 @@ public class LabelAllocateService { List allIds = labelAllocateCoreService.fetchNextIds(lastId, chargeCnt, compareYyyy, targetYyyy, stage); + + // MapSheetAnalInferenceEntity analUid 가져오기 + Long analUid = + labelAllocateCoreService.findMapSheetAnalInferenceUid(compareYyyy, targetYyyy, stage); + int index = 0; for (TargetUser target : targetUsers) { int end = index + target.getDemand(); List sub = allIds.subList(index, end); - labelAllocateCoreService.assignOwner(sub, target.getUserId(), compareYyyy, targetYyyy, stage); + labelAllocateCoreService.assignOwner(sub, target.getUserId(), analUid); index = end; } // 검수자에게 userCount명 만큼 할당 - List list = - labelAllocateCoreService.findAssignedLabelerList(compareYyyy, targetYyyy, stage); - int from = 0; + List list = labelAllocateCoreService.findAssignedLabelerList(analUid); - for (TargetInspector inspector : targetInspectors) { - int to = Math.min(from + inspector.getUserCount(), list.size()); - - if (from >= to) { - break; - } - - List assignmentUids = - list.subList(from, to).stream().map(LabelAllocateDto.Basic::getAssignmentUid).toList(); - - labelAllocateCoreService.assignInspectorBulk(assignmentUids, inspector.getInspectorUid()); - - from = to; + for (String inspector : targetInspectors) { + labelAllocateCoreService.insertInspector(analUid, inspector); } + // int from = 0; + // for (TargetInspector inspector : targetInspectors) { + // int to = Math.min(from + inspector.getUserCount(), list.size()); + // + // if (from >= to) { + // break; + // } + // + // List assignmentUids = + // list.subList(from, + // to).stream().map(LabelAllocateDto.Basic::getAssignmentUid).toList(); + // + // labelAllocateCoreService.assignInspectorBulk(assignmentUids, + // inspector.getInspectorUid()); + // + // from = to; + // } + return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "배정이 완료되었습니다."); } @@ -165,9 +169,8 @@ public class LabelAllocateService { return WorkerListResponse.builder().progressInfo(progressInfo).workers(workers).build(); } - public InferenceDetail findInferenceDetail( - Integer compareYyyy, Integer targetYyyy, Integer stage) { - return labelAllocateCoreService.findInferenceDetail(compareYyyy, targetYyyy, stage); + public InferenceDetail findInferenceDetail(String uuid) { + return labelAllocateCoreService.findInferenceDetail(uuid); } public ApiResponseDto.ResponseObj allocateMove( @@ -199,8 +202,7 @@ public class LabelAllocateService { return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "이관을 완료하였습니다."); } - public LabelerDetail findLabelerDetail( - String userId, Integer compareYyyy, Integer targetYyyy, Integer stage) { - return labelAllocateCoreService.findLabelerDetail(userId, compareYyyy, targetYyyy, stage); + public LabelerDetail findLabelerDetail(String userId, String uuid) { + return labelAllocateCoreService.findLabelerDetail(userId, uuid); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java index 3e16eae5..5fd49cf5 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java @@ -26,18 +26,12 @@ public class LabelAllocateCoreService { return labelAllocateRepository.fetchNextIds(lastId, batchSize, compareYyyy, targetYyyy, stage); } - public void assignOwner( - List ids, - String userId, - Integer compareYyyy, - Integer targetYyyy, - Integer stage) { - labelAllocateRepository.assignOwner(ids, userId, compareYyyy, targetYyyy, stage); + public void assignOwner(List ids, String userId, Long analUid) { + labelAllocateRepository.assignOwner(ids, userId, analUid); } - public List findAssignedLabelerList( - Integer compareYyyy, Integer targetYyyy, Integer stage) { - return labelAllocateRepository.findAssignedLabelerList(compareYyyy, targetYyyy, stage).stream() + public List findAssignedLabelerList(Long analUid) { + return labelAllocateRepository.findAssignedLabelerList(analUid).stream() .map(LabelingAssignmentEntity::toDto) .toList(); } @@ -77,13 +71,8 @@ public class LabelAllocateCoreService { labelAllocateRepository.assignInspectorBulk(assignmentUids, inspectorUid); } - public InferenceDetail findInferenceDetail( - Integer compareYyyy, Integer targetYyyy, Integer stage) { - return labelAllocateRepository.findInferenceDetail(compareYyyy, targetYyyy, stage); - } - - public Long findLabelUnCompleteCnt(Long analUid) { - return labelAllocateRepository.findLabelUnCompleteCnt(analUid); + public InferenceDetail findInferenceDetail(String uuid) { + return labelAllocateRepository.findInferenceDetail(uuid); } public List fetchNextMoveIds( @@ -96,8 +85,15 @@ public class LabelAllocateCoreService { labelAllocateRepository.assignOwnerMove(sub, userId); } - public LabelerDetail findLabelerDetail( - String userId, Integer compareYyyy, Integer targetYyyy, Integer stage) { - return labelAllocateRepository.findLabelerDetail(userId, compareYyyy, targetYyyy, stage); + public LabelerDetail findLabelerDetail(String userId, String uuid) { + return labelAllocateRepository.findLabelerDetail(userId, uuid); + } + + public Long findMapSheetAnalInferenceUid(Integer compareYyyy, Integer targetYyyy, Integer stage) { + return labelAllocateRepository.findMapSheetAnalInferenceUid(compareYyyy, targetYyyy, stage); + } + + public void insertInspector(Long analUid, String inspector) { + labelAllocateRepository.insertInspector(analUid, inspector); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/LabelingInspectorEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/LabelingInspectorEntity.java new file mode 100644 index 00000000..5da0a685 --- /dev/null +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/LabelingInspectorEntity.java @@ -0,0 +1,33 @@ +package com.kamco.cd.kamcoback.postgres.entity; + +import com.kamco.cd.kamcoback.label.dto.LabelInspectorDto; +import com.kamco.cd.kamcoback.postgres.CommonDateEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.util.UUID; + +@Entity +@Table(name = "tb_labeling_inspector") +public class LabelingInspectorEntity extends CommonDateEntity { + + @Id + @Column(name = "operator_uid") + private UUID operatorUid; + + @Column(name = "anal_uid") + private Long analUid; + + @Column(name = "inspector_uid") + private String inspectorUid; + + public LabelInspectorDto.Basic toDto() { + return new LabelInspectorDto.Basic( + this.operatorUid, + this.analUid, + this.inspectorUid, + super.getCreatedDate(), + super.getModifiedDate()); + } +} diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java index 22988c98..72a1534e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java @@ -16,15 +16,9 @@ public interface LabelAllocateRepositoryCustom { List fetchNextIds( Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage); - void assignOwner( - List ids, - String userId, - Integer compareYyyy, - Integer targetYyyy, - Integer stage); + void assignOwner(List ids, String userId, Long analUid); - List findAssignedLabelerList( - Integer compareYyyy, Integer targetYyyy, Integer stage); + List findAssignedLabelerList(Long analUid); Long findLabelUnAssignedCnt(Integer stage, Integer compareYyyy, Integer targetYyyy); @@ -44,15 +38,16 @@ public interface LabelAllocateRepositoryCustom { void assignInspectorBulk(List assignmentUids, String inspectorUid); - InferenceDetail findInferenceDetail(Integer compareYyyy, Integer targetYyyy, Integer stage); + InferenceDetail findInferenceDetail(String uuid); - public List fetchNextMoveIds( + List fetchNextMoveIds( Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage); - Long findLabelUnCompleteCnt(Long analUid); - void assignOwnerMove(List sub, String userId); - LabelerDetail findLabelerDetail( - String userId, Integer compareYyyy, Integer targetYyyy, Integer stage); + LabelerDetail findLabelerDetail(String userId, String uuid); + + Long findMapSheetAnalInferenceUid(Integer compareYyyy, Integer targetYyyy, Integer stage); + + void insertInspector(Long analUid, String inspector); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java index 9e52da12..37f54a38 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java @@ -1,9 +1,10 @@ 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.QLabelingInspectorEntity.labelingInspectorEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalEntity.mapSheetAnalEntity; +import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto; @@ -16,8 +17,7 @@ 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.MapSheetAnalDataInferenceEntity; -import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalEntity; +import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity; import com.kamco.cd.kamcoback.postgres.entity.QMemberEntity; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; @@ -73,27 +73,17 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto } @Override - public void assignOwner( - List ids, - String userId, - Integer compareYyyy, - Integer targetYyyy, - Integer stage) { + public void assignOwner(List ids, String userId, Long analUid) { // analUid로 분석 정보 조회 - MapSheetAnalDataInferenceEntity analEntity = + MapSheetAnalInferenceEntity analEntity = queryFactory - .selectFrom(mapSheetAnalDataInferenceEntity) - .where( - mapSheetAnalDataInferenceEntity.compareYyyy.eq(compareYyyy), - mapSheetAnalDataInferenceEntity.targetYyyy.eq(targetYyyy), - mapSheetAnalDataInferenceEntity.stage.eq(stage)) - .orderBy(mapSheetAnalDataInferenceEntity.analUid.asc()) - .limit(1) + .selectFrom(mapSheetAnalInferenceEntity) + .where(mapSheetAnalInferenceEntity.id.eq(analUid)) .fetchOne(); if (Objects.isNull(analEntity)) { - throw new EntityNotFoundException("MapSheetAnalEntity not found for analUid: "); + throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: "); } // data_geom 테이블에 label state 를 ASSIGNED 로 update @@ -125,7 +115,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto .setParameter(3, userId) .setParameter(4, LabelState.ASSIGNED.getId()) .setParameter(5, info.getMapSheetNum()) - .setParameter(6, analEntity.getAnalUid()) + .setParameter(6, analEntity.getId()) .executeUpdate(); } @@ -134,28 +124,22 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto } @Override - public List findAssignedLabelerList( - Integer compareYyyy, Integer targetYyyy, Integer stage) { + public List findAssignedLabelerList(Long analUid) { // analUid로 분석 정보 조회 - MapSheetAnalDataInferenceEntity analEntity = + MapSheetAnalInferenceEntity analEntity = queryFactory - .selectFrom(mapSheetAnalDataInferenceEntity) - .where( - mapSheetAnalDataInferenceEntity.compareYyyy.eq(compareYyyy), - mapSheetAnalDataInferenceEntity.targetYyyy.eq(targetYyyy), - mapSheetAnalDataInferenceEntity.stage.eq(stage)) - .orderBy(mapSheetAnalDataInferenceEntity.analUid.asc()) - .limit(1) + .selectFrom(mapSheetAnalInferenceEntity) + .where(mapSheetAnalInferenceEntity.id.eq(analUid)) .fetchOne(); if (Objects.isNull(analEntity)) { - throw new EntityNotFoundException("MapSheetAnalEntity not found for analUid: "); + throw new EntityNotFoundException("mapSheetAnalInferenceEntity not found for analUid: "); } return queryFactory .selectFrom(labelingAssignmentEntity) .where( - labelingAssignmentEntity.analUid.eq(analEntity.getAnalUid()), + labelingAssignmentEntity.analUid.eq(analEntity.getId()), labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId()), labelingAssignmentEntity.inspectorUid.isNull()) .orderBy(labelingAssignmentEntity.workerUid.asc()) @@ -443,20 +427,18 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto } @Override - public InferenceDetail findInferenceDetail( - Integer compareYyyy, Integer targetYyyy, Integer stage) { + public InferenceDetail findInferenceDetail(String uuid) { // analUid로 분석 정보 조회 - MapSheetAnalDataInferenceEntity analEntity = + MapSheetAnalInferenceEntity analEntity = queryFactory - .selectFrom(mapSheetAnalDataInferenceEntity) - .where( - mapSheetAnalDataInferenceEntity.compareYyyy.eq(compareYyyy), - mapSheetAnalDataInferenceEntity.targetYyyy.eq(targetYyyy), - mapSheetAnalDataInferenceEntity.stage.eq(stage)) - .orderBy(mapSheetAnalDataInferenceEntity.analUid.asc()) - .limit(1) + .selectFrom(mapSheetAnalInferenceEntity) + .where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid))) .fetchOne(); + if (Objects.isNull(analEntity)) { + throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: "); + } + return queryFactory .select( Projections.constructor( @@ -470,7 +452,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto .from(mapSheetAnalEntity) .innerJoin(labelingAssignmentEntity) .on(mapSheetAnalEntity.id.eq(labelingAssignmentEntity.analUid)) - .where(mapSheetAnalEntity.id.eq(analEntity.getAnalUid())) + .where(mapSheetAnalEntity.id.eq(analEntity.getId())) .groupBy( mapSheetAnalEntity.analTitle, mapSheetAnalEntity.gukyuinApplyDttm, @@ -498,30 +480,6 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto .fetch(); } - @Override - public Long findLabelUnCompleteCnt(Long analUid) { - MapSheetAnalEntity entity = - queryFactory - .selectFrom(mapSheetAnalEntity) - .where(mapSheetAnalEntity.id.eq(analUid)) - .fetchOne(); - - if (Objects.isNull(entity)) { - throw new EntityNotFoundException(); - } - - return queryFactory - .select(mapSheetAnalDataInferenceGeomEntity.geoUid.count()) - .from(mapSheetAnalDataInferenceGeomEntity) - .where( - mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(entity.getCompareYyyy()), - mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(entity.getTargetYyyy()), - mapSheetAnalDataInferenceGeomEntity.stage.eq(4), // TODO: 회차 컬럼을 가져와야 할 듯? - mapSheetAnalDataInferenceGeomEntity.labelState.in( - LabelState.ASSIGNED.getId(), LabelState.SKIP.getId())) - .fetchOne(); - } - @Transactional @Override public void assignOwnerMove(List sub, String userId) { @@ -535,8 +493,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto } @Override - public LabelerDetail findLabelerDetail( - String userId, Integer compareYyyy, Integer targetYyyy, Integer stage) { + public LabelerDetail findLabelerDetail(String userId, String uuid) { NumberExpression assignedCnt = new CaseBuilder() .when(labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId())) @@ -570,19 +527,14 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto completeCnt)); // analUid로 분석 정보 조회 - MapSheetAnalDataInferenceEntity analEntity = + MapSheetAnalInferenceEntity analEntity = queryFactory - .selectFrom(mapSheetAnalDataInferenceEntity) - .where( - mapSheetAnalDataInferenceEntity.compareYyyy.eq(compareYyyy), - mapSheetAnalDataInferenceEntity.targetYyyy.eq(targetYyyy), - mapSheetAnalDataInferenceEntity.stage.eq(stage)) - .orderBy(mapSheetAnalDataInferenceEntity.analUid.asc()) - .limit(1) + .selectFrom(mapSheetAnalInferenceEntity) + .where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid))) .fetchOne(); if (Objects.isNull(analEntity)) { - throw new EntityNotFoundException("MapSheetAnalEntity not found for analUid: "); + throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: "); } QMemberEntity worker = QMemberEntity.memberEntity; @@ -606,11 +558,38 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto .innerJoin(labelingAssignmentEntity) .on( worker.employeeNo.eq(labelingAssignmentEntity.workerUid), - labelingAssignmentEntity.analUid.eq(analEntity.getAnalUid())) + labelingAssignmentEntity.analUid.eq(analEntity.getId())) .leftJoin(inspector) .on(labelingAssignmentEntity.inspectorUid.eq(inspector.employeeNo)) .where(worker.employeeNo.eq(userId)) .groupBy(worker.userRole, worker.name, worker.employeeNo) .fetchOne(); } + + @Override + public Long findMapSheetAnalInferenceUid(Integer compareYyyy, Integer targetYyyy, Integer stage) { + return queryFactory + .select(mapSheetAnalInferenceEntity.id) + .from(mapSheetAnalInferenceEntity) + .where( + mapSheetAnalInferenceEntity.compareYyyy.eq(compareYyyy), + mapSheetAnalInferenceEntity.targetYyyy.eq(targetYyyy), + mapSheetAnalInferenceEntity.stage.eq(stage)) + .fetchOne(); + } + + @Override + public void insertInspector(Long analUid, String inspector) { + queryFactory + .insert(labelingInspectorEntity) + .columns( + labelingInspectorEntity.operatorUid, + labelingInspectorEntity.analUid, + labelingInspectorEntity.inspectorUid) + .values(UUID.randomUUID(), analUid, inspector) + .execute(); + + em.flush(); + em.clear(); + } }