diff --git a/src/main/java/osm/surveyor/task/city/model/MapperTask.java b/src/main/java/osm/surveyor/task/city/model/MapperTask.java index cde08de..058926e 100644 --- a/src/main/java/osm/surveyor/task/city/model/MapperTask.java +++ b/src/main/java/osm/surveyor/task/city/model/MapperTask.java @@ -1,10 +1,16 @@ package osm.surveyor.task.city.model; +import java.util.Date; + +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.IdClass; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotBlank; import org.springframework.format.annotation.NumberFormat; @@ -16,18 +22,46 @@ @Entity @IdClass(MapperTaskPK.class) public class MapperTask { - - @Id - private String username; // MapperTaskPK.username + @Id + //@GenericGenerator(name = "UuidGenerator", strategy = "osm.surveyor.task.util.UuidGenerator") + //@GeneratedValue(generator = "UuidGenerator") + @Column(name = "current_id") + private String currentId; + + @NotBlank + @Column(name = "pre_id") + private String preId; + @Id @NumberFormat private String meshcode; // MapperTaskPK.meshcode - @Enumerated(EnumType.ORDINAL) - private Operation operation = Operation.NOP; - + /** + * ステータス + */ @Enumerated(EnumType.ORDINAL) private Status status = Status.PREPARATION; + /** + * インポート実行者 + */ + private String username; + + /** + * 検証者 + */ + private String validator; + + /** + * 操作内容 + */ + @Enumerated(EnumType.ORDINAL) + private Operation operation = Operation.NOP; + + /** + * 更新日時 + */ + @Temporal(TemporalType.TIMESTAMP) + Date updateTime; } diff --git a/src/main/java/osm/surveyor/task/city/model/Task.java b/src/main/java/osm/surveyor/task/city/model/Task.java index b39a5a3..862829c 100644 --- a/src/main/java/osm/surveyor/task/city/model/Task.java +++ b/src/main/java/osm/surveyor/task/city/model/Task.java @@ -1,9 +1,10 @@ package osm.surveyor.task.city.model; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.IdClass; -import javax.validation.constraints.NotBlank; import org.springframework.format.annotation.NumberFormat; @@ -25,10 +26,8 @@ @NumberFormat private String meshcode; // TaskPK.meshcode - @NotBlank private String version; - @NotBlank private String path; private String point; @@ -38,4 +37,10 @@ public void setLine(JsonGeometryLine p) { this.line = p.toString(); } + + /** + * ステータス + */ + @Enumerated(EnumType.ORDINAL) + private Status status = Status.PREPARATION; }