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

라벨링툴 목록 기준년도 asc,비교년도 asc 기준으로 sorting, 변화탐지 cog API 수정

Browse Source
This commit is contained in:
Gina(박가연)
2026-01-20 18:35:45 +09:00
parent 6d423534f1
commit cc5b3f3096
5 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java
View File

@@ -153,6 +153,10 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
.groupBy(mapInkx5kEntity.geom)
.fetchOne();
if (data == null) {
return null;
}
ObjectMapper mapper = new ObjectMapper();
String geoJson = Objects.requireNonNull(data).getBbox();
JsonNode jsonNode;

14
src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java
View File

@@ -95,8 +95,14 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
labelingAssignmentEntity.workState,
labelingAssignmentEntity.assignGroupId,
mapInkx5kEntity.mapidNm,
mapSheetAnalDataInferenceGeomEntity.pnu))
mapSheetAnalDataInferenceGeomEntity.pnu,
mapSheetAnalInferenceEntity.uuid,
mapSheetAnalInferenceEntity.compareYyyy,
mapSheetAnalInferenceEntity.targetYyyy,
mapSheetAnalInferenceEntity.stage))
.from(labelingAssignmentEntity)
.innerJoin(mapSheetAnalInferenceEntity)
.on(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id))
.innerJoin(mapSheetAnalDataInferenceGeomEntity)
.on(
labelingAssignmentEntity.inferenceGeomUid.eq(
@@ -107,6 +113,8 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.orderBy(
mapSheetAnalInferenceEntity.targetYyyy.asc(),
mapSheetAnalInferenceEntity.compareYyyy.asc(),
labelingAssignmentEntity.createdDate.asc(),
labelingAssignmentEntity.inferenceGeomUid.asc())
.fetch();
@@ -610,6 +618,8 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
labelingAssignmentEntity.createdDate,
labelingAssignmentEntity.inferenceGeomUid)
.from(labelingAssignmentEntity)
.innerJoin(mapSheetAnalInferenceEntity)
.on(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id))
.where(
labelingAssignmentEntity.workerUid.eq(userId),
stateCondition,
@@ -617,6 +627,8 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
? labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId())
: labelingAssignmentEntity.assignmentUid.eq(UUID.fromString(assignmentUid)))
.orderBy(
mapSheetAnalInferenceEntity.targetYyyy.asc(),
mapSheetAnalInferenceEntity.compareYyyy.asc(),
labelingAssignmentEntity.createdDate.asc(),
labelingAssignmentEntity.inferenceGeomUid.asc())
.limit(1)

10
src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java
View File

@@ -96,8 +96,14 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
labelingAssignmentEntity.inspectState,
labelingAssignmentEntity.assignGroupId,
mapInkx5kEntity.mapidNm,
mapSheetAnalDataInferenceGeomEntity.pnu))
mapSheetAnalDataInferenceGeomEntity.pnu,
mapSheetAnalInferenceEntity.uuid,
mapSheetAnalInferenceEntity.compareYyyy,
mapSheetAnalInferenceEntity.targetYyyy,
mapSheetAnalInferenceEntity.stage))
.from(labelingAssignmentEntity)
.innerJoin(mapSheetAnalInferenceEntity)
.on(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id))
.innerJoin(mapSheetAnalDataInferenceGeomEntity)
.on(
labelingAssignmentEntity.inferenceGeomUid.eq(
@@ -110,6 +116,8 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.orderBy(
mapSheetAnalInferenceEntity.targetYyyy.asc(),
mapSheetAnalInferenceEntity.compareYyyy.asc(),
labelingAssignmentEntity.createdDate.asc(),
labelingAssignmentEntity.inferenceGeomUid.asc())
.fetch();

14
src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataLabelDto.java
View File

@@ -35,6 +35,10 @@ public class TrainingDataLabelDto {
private String mapSheetNum;
private String mapIdNm;
private Long pnu;
private UUID stageUuid;
private Integer compareYyyy;
private Integer targetYyyy;
private Integer stage;
public LabelingListDto(
UUID assignmentUid,
@@ -43,7 +47,11 @@ public class TrainingDataLabelDto {
String workState,
String mapSheetNum,
String mapIdNm,
Long pnu) {
Long pnu,
UUID stageUuid,
Integer compareYyyy,
Integer targetYyyy,
Integer stage) {
this.assignmentUid = assignmentUid;
this.inferenceGeomUid = inferenceGeomUid;
this.workerUid = workerUid;
@@ -51,6 +59,10 @@ public class TrainingDataLabelDto {
this.mapSheetNum = mapSheetNum;
this.mapIdNm = mapIdNm;
this.pnu = pnu;
this.stageUuid = stageUuid;
this.compareYyyy = compareYyyy;
this.targetYyyy = targetYyyy;
this.stage = stage;
}
}

14
src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataReviewDto.java
View File

@@ -35,6 +35,10 @@ public class TrainingDataReviewDto {
private String mapSheetNum;
private String mapIdNm;
private Long pnu;
private UUID stageUuid;
private Integer compareYyyy;
private Integer targetYyyy;
private Integer stage;
public ReviewListDto(
UUID operatorUid,
@@ -43,7 +47,11 @@ public class TrainingDataReviewDto {
String inspectState,
String mapSheetNum,
String mapIdNm,
Long pnu) {
Long pnu,
UUID stageUuid,
Integer compareYyyy,
Integer targetYyyy,
Integer stage) {
this.operatorUid = operatorUid;
this.inferenceGeomUid = inferenceGeomUid;
this.inspectorUid = inspectorUid;
@@ -51,6 +59,10 @@ public class TrainingDataReviewDto {
this.mapSheetNum = mapSheetNum;
this.mapIdNm = mapIdNm;
this.pnu = pnu;
this.stageUuid = stageUuid;
this.compareYyyy = compareYyyy;
this.targetYyyy = targetYyyy;
this.stage = stage;
}
}