feat/infer_dev_260107 #1
@@ -395,6 +395,10 @@ public class InferenceResultDto {
|
|||||||
@Schema(description = "모델3 버전")
|
@Schema(description = "모델3 버전")
|
||||||
private String modelVer3;
|
private String modelVer3;
|
||||||
|
|
||||||
|
@Schema(description = "탑지 도엽 수")
|
||||||
|
@JsonIgnore
|
||||||
|
private Long totalJobs;
|
||||||
|
|
||||||
public InferenceStatusDetailDto(
|
public InferenceStatusDetailDto(
|
||||||
Long detectingCnt,
|
Long detectingCnt,
|
||||||
Integer m1PendingJobs,
|
Integer m1PendingJobs,
|
||||||
@@ -425,7 +429,8 @@ public class InferenceResultDto {
|
|||||||
String mapSheetScope,
|
String mapSheetScope,
|
||||||
String modelVer1,
|
String modelVer1,
|
||||||
String modelVer2,
|
String modelVer2,
|
||||||
String modelVer3) {
|
String modelVer3,
|
||||||
|
Long totalJobs) {
|
||||||
this.detectingCnt = detectingCnt;
|
this.detectingCnt = detectingCnt;
|
||||||
this.m1PendingJobs = m1PendingJobs;
|
this.m1PendingJobs = m1PendingJobs;
|
||||||
this.m2PendingJobs = m2PendingJobs;
|
this.m2PendingJobs = m2PendingJobs;
|
||||||
@@ -456,12 +461,13 @@ public class InferenceResultDto {
|
|||||||
this.modelVer1 = modelVer1;
|
this.modelVer1 = modelVer1;
|
||||||
this.modelVer2 = modelVer2;
|
this.modelVer2 = modelVer2;
|
||||||
this.modelVer3 = modelVer3;
|
this.modelVer3 = modelVer3;
|
||||||
|
this.totalJobs = totalJobs;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Schema(description = "진행률")
|
@Schema(description = "진행률")
|
||||||
@JsonProperty("progress")
|
@JsonProperty("progress")
|
||||||
private int getProgress() {
|
private int getProgress() {
|
||||||
long tiles = this.detectingCnt; // 도엽수
|
long tiles = this.totalJobs == null ? 0L : this.totalJobs; // 도엽수
|
||||||
int models = 3; // 모델 개수
|
int models = 3; // 모델 개수
|
||||||
int completed =
|
int completed =
|
||||||
this.m1CompletedJobs
|
this.m1CompletedJobs
|
||||||
|
|||||||
@@ -113,6 +113,8 @@ public class InferenceResultCoreService {
|
|||||||
mapSheetLearnEntity.setCreatedUid(userUtil.getId());
|
mapSheetLearnEntity.setCreatedUid(userUtil.getId());
|
||||||
mapSheetLearnEntity.setMapSheetCnt(mapSheetName);
|
mapSheetLearnEntity.setMapSheetCnt(mapSheetName);
|
||||||
mapSheetLearnEntity.setDetectingCnt(0L);
|
mapSheetLearnEntity.setDetectingCnt(0L);
|
||||||
|
mapSheetLearnEntity.setTotalJobs((long) detectingCnt);
|
||||||
|
|
||||||
// 회차는 국유인 반영할때 update로 변경됨
|
// 회차는 국유인 반영할때 update로 변경됨
|
||||||
// mapSheetLearnEntity.setStage(
|
// mapSheetLearnEntity.setStage(
|
||||||
// mapSheetLearnRepository.getLearnStage(req.getCompareYyyy(), req.getTargetYyyy()));
|
// mapSheetLearnRepository.getLearnStage(req.getCompareYyyy(), req.getTargetYyyy()));
|
||||||
|
|||||||
@@ -196,6 +196,9 @@ public class MapSheetLearnEntity {
|
|||||||
@Column(name = "uid", nullable = false)
|
@Column(name = "uid", nullable = false)
|
||||||
private String uid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
|
private String uid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
|
||||||
|
|
||||||
|
@Column(name = "total_jobs")
|
||||||
|
private Long totalJobs;
|
||||||
|
|
||||||
public InferenceResultDto.ResultList toDto() {
|
public InferenceResultDto.ResultList toDto() {
|
||||||
return new InferenceResultDto.ResultList(
|
return new InferenceResultDto.ResultList(
|
||||||
this.uuid,
|
this.uuid,
|
||||||
|
|||||||
@@ -230,7 +230,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
|
|||||||
mapSheetLearnEntity.mapSheetScope,
|
mapSheetLearnEntity.mapSheetScope,
|
||||||
m1Model.modelVer.as("model1Ver"),
|
m1Model.modelVer.as("model1Ver"),
|
||||||
m2Model.modelVer.as("model2Ver"),
|
m2Model.modelVer.as("model2Ver"),
|
||||||
m3Model.modelVer.as("model3Ver")))
|
m3Model.modelVer.as("model3Ver"),
|
||||||
|
mapSheetLearnEntity.totalJobs))
|
||||||
.from(mapSheetLearnEntity)
|
.from(mapSheetLearnEntity)
|
||||||
.leftJoin(m1Model)
|
.leftJoin(m1Model)
|
||||||
.on(m1Model.uuid.eq(mapSheetLearnEntity.m1ModelUuid))
|
.on(m1Model.uuid.eq(mapSheetLearnEntity.m1ModelUuid))
|
||||||
|
|||||||
Reference in New Issue
Block a user