모델학습 설정 dto 수정
This commit is contained in:
@@ -108,7 +108,7 @@ public class DatasetCoreService
|
||||
DatasetEntity entity = new DatasetEntity();
|
||||
entity.setTitle(registerReq.getTitle());
|
||||
// entity.setYear(registerReq.getYear());
|
||||
entity.setGroupTitle(LearnDataType.PRODUCTION.getId());
|
||||
entity.setDataType(LearnDataType.PRODUCTION.getId());
|
||||
entity.setCompareYyyy(registerReq.getCompareYear());
|
||||
entity.setTargetYyyy(registerReq.getTargetYyyy());
|
||||
entity.setRoundNo(registerReq.getRoundNo() != null ? registerReq.getRoundNo() : 1L);
|
||||
@@ -207,7 +207,6 @@ public class DatasetCoreService
|
||||
return ModelMngDto.DatasetInfo.builder()
|
||||
.id(entity.getId())
|
||||
.title(entity.getTitle())
|
||||
.groupTitle(entity.getGroupTitle())
|
||||
.totalItems(entity.getTotalItems())
|
||||
.totalSize(totalSizeStr)
|
||||
.classCounts(classCounts)
|
||||
|
||||
@@ -30,11 +30,6 @@ public class DatasetEntity {
|
||||
@Column(name = "dataset_uid", nullable = false)
|
||||
private Long id;
|
||||
|
||||
@Size(max = 200)
|
||||
@NotNull
|
||||
@Column(name = "group_title", nullable = false, length = 200)
|
||||
private String groupTitle;
|
||||
|
||||
@Column(name = "compare_yyyy", nullable = false)
|
||||
private Integer compareYyyy;
|
||||
|
||||
@@ -134,7 +129,6 @@ public class DatasetEntity {
|
||||
return new DatasetDto.Basic(
|
||||
this.id,
|
||||
this.uuid,
|
||||
this.groupTitle,
|
||||
this.title,
|
||||
this.roundNo,
|
||||
this.compareYyyy,
|
||||
|
||||
@@ -46,8 +46,8 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
|
||||
}
|
||||
|
||||
// 구분
|
||||
if (StringUtils.isNotBlank(searchReq.getGroupTitle())) {
|
||||
builder.and(dataset.groupTitle.eq(searchReq.getGroupTitle()));
|
||||
if (StringUtils.isNotBlank(searchReq.getDataType())) {
|
||||
builder.and(dataset.dataType.eq(searchReq.getDataType()));
|
||||
}
|
||||
|
||||
// Entity 직접 조회 (Projections 사용 지양)
|
||||
@@ -85,7 +85,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
|
||||
BooleanBuilder builder = new BooleanBuilder();
|
||||
|
||||
if (StringUtils.isNotBlank(selectType) && !"CURRENT".equals(selectType)) {
|
||||
builder.and(dataset.groupTitle.eq(selectType));
|
||||
builder.and(dataset.dataType.eq(selectType));
|
||||
}
|
||||
|
||||
return queryFactory
|
||||
@@ -94,7 +94,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
|
||||
SelectDataSet.class,
|
||||
dataset.id,
|
||||
dataset.uuid,
|
||||
dataset.groupTitle,
|
||||
dataset.dataType,
|
||||
dataset.title,
|
||||
dataset.roundNo,
|
||||
dataset.memo,
|
||||
@@ -115,7 +115,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
|
||||
.groupBy(
|
||||
dataset.id,
|
||||
dataset.uuid,
|
||||
dataset.groupTitle,
|
||||
dataset.dataType,
|
||||
dataset.title,
|
||||
dataset.roundNo,
|
||||
dataset.memo)
|
||||
@@ -146,7 +146,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
|
||||
}
|
||||
|
||||
if (StringUtils.isNotBlank(selectType) && !"CURRENT".equals(selectType)) {
|
||||
builder.and(dataset.groupTitle.eq(selectType));
|
||||
builder.and(dataset.dataType.eq(selectType));
|
||||
}
|
||||
|
||||
return queryFactory
|
||||
@@ -155,7 +155,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
|
||||
SelectDataSet.class,
|
||||
dataset.id,
|
||||
dataset.uuid,
|
||||
dataset.groupTitle,
|
||||
dataset.dataType,
|
||||
dataset.title,
|
||||
dataset.roundNo,
|
||||
dataset.memo,
|
||||
@@ -167,7 +167,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
|
||||
.groupBy(
|
||||
dataset.id,
|
||||
dataset.uuid,
|
||||
dataset.groupTitle,
|
||||
dataset.dataType,
|
||||
dataset.title,
|
||||
dataset.roundNo,
|
||||
dataset.memo)
|
||||
|
||||
Reference in New Issue
Block a user