[KC-108] 모델 조회 수정 id->uuid 변경

This commit is contained in:
2026-01-12 09:43:12 +09:00
parent 05938f301c
commit 7d430f22ee
2 changed files with 52 additions and 38 deletions

View File

@@ -19,7 +19,9 @@ import org.springframework.data.domain.Pageable;
public class InferenceResultDto {
/** 목록조회 dto */
/**
* 목록조회 dto
*/
@Getter
@Setter
@AllArgsConstructor
@@ -31,14 +33,20 @@ public class InferenceResultDto {
private String status;
private String mapSheetCnt;
private Long detectingCnt;
@JsonFormatDttm private ZonedDateTime startTime;
@JsonFormatDttm private ZonedDateTime endTime;
@JsonFormatDttm private ZonedDateTime elapsedTime;
@JsonFormatDttm
private ZonedDateTime startTime;
@JsonFormatDttm
private ZonedDateTime endTime;
@JsonFormatDttm
private ZonedDateTime elapsedTime;
private Boolean applyYn;
@JsonFormatDttm private ZonedDateTime applyDttm;
@JsonFormatDttm
private ZonedDateTime applyDttm;
}
/** 목록조회 검색 조건 dto */
/**
* 목록조회 검색 조건 dto
*/
@Getter
@Setter
@NoArgsConstructor
@@ -60,7 +68,9 @@ public class InferenceResultDto {
}
}
/** 탐지 데이터 옵션 dto */
/**
* 탐지 데이터 옵션 dto
*/
@Getter
@AllArgsConstructor
public enum MapSheetScope implements EnumType {
@@ -81,7 +91,9 @@ public class InferenceResultDto {
}
}
/** 분석대상 도엽 enum */
/**
* 분석대상 도엽 enum
*/
@Getter
@AllArgsConstructor
public enum DetectOption implements EnumType {
@@ -101,7 +113,9 @@ public class InferenceResultDto {
}
}
/** 변화탐지 실행 정보 저장 요청 정보 */
/**
* 변화탐지 실행 정보 저장 요청 정보
*/
@Getter
@Setter
@NoArgsConstructor
@@ -112,17 +126,17 @@ public class InferenceResultDto {
@NotBlank
private String title;
@Schema(description = "M1", example = "2")
@Schema(description = "M1", example = "785a845b-1b16-46c5-bf12-6c3258523c2a")
@NotNull
private Long model1Uuid;
private UUID model1Uuid;
@Schema(description = "M2", example = "4")
@Schema(description = "M2", example = "4ca57bab-5c68-419e-83bf-7fae0b254b47")
@NotNull
private Long model2Uuid;
private UUID model2Uuid;
@Schema(description = "M3", example = "7")
@Schema(description = "M3", example = "6b0ce3af-0070-463b-8b7b-4d5e837a472e")
@NotNull
private Long model3Uuid;
private UUID model3Uuid;
@Schema(description = "비교년도", example = "2023")
@NotNull
@@ -140,13 +154,13 @@ public class InferenceResultDto {
@Schema(description = "탐지 데이터 옵션 - 추론제외(EXCL), 이전 년도 도엽 사용(PREV)", example = "EXCL")
@NotBlank
@EnumValid(
enumClass = DetectOption.class,
message = "탐지 데이터 옵션은 '추론제외', '이전 년도 도엽 사용' 만 사용 가능합니다.")
enumClass = DetectOption.class,
message = "탐지 데이터 옵션은 '추론제외', '이전 년도 도엽 사용' 만 사용 가능합니다.")
private String detectOption;
@Schema(
description = "5k 도협 번호 목록",
example = "[\"37914034\",\"37914024\",\"37914023\",\"37914014\",\"37914005\",\"37914004\"]")
description = "5k 도협 번호 목록",
example = "[\"37914034\",\"37914024\",\"37914023\",\"37914014\",\"37914005\",\"37914004\"]")
@NotNull
private List<String> mapSheetNum;
}

View File

@@ -25,9 +25,9 @@ public class MapSheetLearnEntity {
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tb_map_sheet_learn_id_gen")
@SequenceGenerator(
name = "tb_map_sheet_learn_id_gen",
sequenceName = "tb_map_sheet_learn_uid",
allocationSize = 1)
name = "tb_map_sheet_learn_id_gen",
sequenceName = "tb_map_sheet_learn_uid",
allocationSize = 1)
@Column(name = "id", nullable = false)
private Long id;
@@ -44,14 +44,14 @@ public class MapSheetLearnEntity {
@Column(name = "status", length = 10)
private String status;
@Column(name = "m1_model_uid")
private Long m1ModelUid;
@Column(name = "m1_model_uuid")
private UUID m1ModelUuid;
@Column(name = "m2_model_uid")
private Long m2ModelUid;
@Column(name = "m2_model_uuid")
private UUID m2ModelUuid;
@Column(name = "m3_model_uid")
private Long m3ModelUid;
@Column(name = "m3_model_uuid")
private UUID m3ModelUuid;
@Column(name = "compare_yyyy")
private Integer compareYyyy;
@@ -105,15 +105,15 @@ public class MapSheetLearnEntity {
public InferenceResultDto.ResultList toDto() {
return new InferenceResultDto.ResultList(
this.uuid,
this.title,
this.status,
this.mapSheetCnt,
this.detectingCnt,
this.inferStartDttm,
this.inferEndDttm,
this.elapsedTime,
this.applyYn,
this.applyDttm);
this.uuid,
this.title,
this.status,
this.mapSheetCnt,
this.detectingCnt,
this.inferStartDttm,
this.inferEndDttm,
this.elapsedTime,
this.applyYn,
this.applyDttm);
}
}