diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java index 4606ba34..c21cf6e8 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java @@ -106,15 +106,6 @@ public class MapSheetLearnEntity { @Column(name = "running_model_type") private String runningModelType; - @Column(name = "m1_model_batch_id") - private Long m1ModelBatchId; - - @Column(name = "m2_model_batch_id") - private Long m2ModelBatchId; - - @Column(name = "m3_model_batch_id") - private Long m3ModelBatchId; - @Column(name = "detect_end_cnt") private Long detectEndCnt; @@ -124,26 +115,76 @@ public class MapSheetLearnEntity { @Column(name = "model_target_path") private String modelTargetPath; + @Column(name = "stage") + private Integer stage; + + /* ===================== M1 ===================== */ + + @Column(name = "m1_model_batch_id") + private Long m1ModelBatchId; + @Column(name = "m1_model_start_dttm") private ZonedDateTime m1ModelStartDttm; - @Column(name = "m2_model_start_dttm") - private ZonedDateTime m2ModelStartDttm; - - @Column(name = "m3_model_start_dttm") - private ZonedDateTime m3ModelStartDttm; - @Column(name = "m1_model_end_dttm") private ZonedDateTime m1ModelEndDttm; + @Column(name = "m1_pending_jobs", nullable = false) + private int m1PendingJobs = 0; + + @Column(name = "m1_running_jobs", nullable = false) + private int m1RunningJobs = 0; + + @Column(name = "m1_completed_jobs", nullable = false) + private int m1CompletedJobs = 0; + + @Column(name = "m1_failed_jobs", nullable = false) + private int m1FailedJobs = 0; + + /* ===================== M2 ===================== */ + + @Column(name = "m2_model_batch_id") + private Long m2ModelBatchId; + + @Column(name = "m2_model_start_dttm") + private ZonedDateTime m2ModelStartDttm; + @Column(name = "m2_model_end_dttm") private ZonedDateTime m2ModelEndDttm; + @Column(name = "m2_pending_jobs", nullable = false) + private int m2PendingJobs = 0; + + @Column(name = "m2_running_jobs", nullable = false) + private int m2RunningJobs = 0; + + @Column(name = "m2_completed_jobs", nullable = false) + private int m2CompletedJobs = 0; + + @Column(name = "m2_failed_jobs", nullable = false) + private int m2FailedJobs = 0; + + /* ===================== M3 ===================== */ + @Column(name = "m3_model_batch_id") + private Long m3ModelBatchId; + + @Column(name = "m3_model_start_dttm") + private ZonedDateTime m3ModelStartDttm; + @Column(name = "m3_model_end_dttm") private ZonedDateTime m3ModelEndDttm; - @Column(name = "stage") - private Integer stage; + @Column(name = "m3_pending_jobs", nullable = false) + private int m3PendingJobs = 0; + + @Column(name = "m3_running_jobs", nullable = false) + private int m3RunningJobs = 0; + + @Column(name = "m3_completed_jobs", nullable = false) + private int m3CompletedJobs = 0; + + @Column(name = "m3_failed_jobs", nullable = false) + private int m3FailedJobs = 0; public InferenceResultDto.ResultList toDto() { return new InferenceResultDto.ResultList(