diff --git a/src/main/java/osm/surveyor/task/city/model/MapperTask.java b/src/main/java/osm/surveyor/task/city/model/MapperTask.java new file mode 100644 index 0000000..cde08de --- /dev/null +++ b/src/main/java/osm/surveyor/task/city/model/MapperTask.java @@ -0,0 +1,33 @@ +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 org.springframework.format.annotation.NumberFormat; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@IdClass(MapperTaskPK.class) +public class MapperTask { + + @Id + private String username; // MapperTaskPK.username + + @Id + @NumberFormat + private String meshcode; // MapperTaskPK.meshcode + + @Enumerated(EnumType.ORDINAL) + private Operation operation = Operation.NOP; + + @Enumerated(EnumType.ORDINAL) + private Status status = Status.PREPARATION; + +} diff --git a/src/main/java/osm/surveyor/task/city/model/MapperTaskPK.java b/src/main/java/osm/surveyor/task/city/model/MapperTaskPK.java new file mode 100644 index 0000000..6c55bd3 --- /dev/null +++ b/src/main/java/osm/surveyor/task/city/model/MapperTaskPK.java @@ -0,0 +1,36 @@ +package osm.surveyor.task.city.model; + +import java.io.Serializable; + +import javax.persistence.Embeddable; + +import lombok.Getter; +import lombok.Setter; + +@SuppressWarnings("serial") +@Getter +@Setter +@Embeddable +public class MapperTaskPK implements Serializable { + private String username; + private String meshcode; + + public MapperTaskPK() { + } + + public boolean equals(Object obj) { + if (obj instanceof MapperTaskPK) { + if (((MapperTaskPK)obj).getUsername().equals(this.username)) { + if (((MapperTaskPK)obj).getMeshcode().equals(this.meshcode)) { + return true; + } + } + } + return false; + } + + public int hashCode() { + String s = this.username + this.meshcode; + return s.hashCode(); + } +} diff --git a/src/main/java/osm/surveyor/task/city/model/Operation.java b/src/main/java/osm/surveyor/task/city/model/Operation.java new file mode 100644 index 0000000..da1f020 --- /dev/null +++ b/src/main/java/osm/surveyor/task/city/model/Operation.java @@ -0,0 +1,18 @@ +package osm.surveyor.task.city.model; + +/** + * マッパーの操作 + * @author hayashi + * + */ +public enum Operation { + NOP, // ノーオペ + RESERVE, // 予約 + CANCEL, // 取消 + DONE, // インポート済み + VALID, // 検証 + OK, // 検証済み + NG, // 検証不良 + END, // 完了 + VIEW // 参照 +} diff --git a/src/main/java/osm/surveyor/task/city/model/Status.java b/src/main/java/osm/surveyor/task/city/model/Status.java new file mode 100644 index 0000000..07c226e --- /dev/null +++ b/src/main/java/osm/surveyor/task/city/model/Status.java @@ -0,0 +1,11 @@ +package osm.surveyor.task.city.model; + +public enum Status { + PREPARATION, // preparation 準備中 + ACCEPTING, // Accepting 受付中 + RESERVED, // 予約済み + IMPORTED, // インポート済み + OK, // 検証済み + NG, // 不良 + END // 完了 +} diff --git a/src/main/java/osm/surveyor/task/util/UuidGenerator.java b/src/main/java/osm/surveyor/task/util/UuidGenerator.java new file mode 100644 index 0000000..8f39927 --- /dev/null +++ b/src/main/java/osm/surveyor/task/util/UuidGenerator.java @@ -0,0 +1,18 @@ +package osm.surveyor.task.util; + +import java.io.Serializable; +import java.util.UUID; + +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.id.IdentityGenerator; + +public class UuidGenerator extends IdentityGenerator{ + + /** + * UUIDを生成し返却する + */ + @Override + public Serializable generate(SharedSessionContractImplementor session, Object obj) { + return UUID.randomUUID().toString(); + } +} diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 6006d16..10daa54 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -6,3 +6,6 @@ typeMismatch.citycode = Must be 5 digit Number. typeMismatch.lat = Must be Number. typeMismatch.lng = Must be Number. +PREPARATION = Preparation +status = status +meshcode = meshcode \ No newline at end of file diff --git a/src/main/resources/messages_ja.properties b/src/main/resources/messages_ja.properties index 6597b4f..4f0a860 100644 --- a/src/main/resources/messages_ja.properties +++ b/src/main/resources/messages_ja.properties @@ -6,3 +6,6 @@ typeMismatch.citycode = 5桁の数字が必須です typeMismatch.lat = 数字を入力してください typeMismatch.lng = 数字を入力してください +PREPARATION = 準備中 +status = ステータス +meshcode = 地域基準メッシュ \ No newline at end of file diff --git a/src/main/resources/templates/cities.html b/src/main/resources/templates/cities.html index ec01c9a..9978258 100644 --- a/src/main/resources/templates/cities.html +++ b/src/main/resources/templates/cities.html @@ -70,16 +70,6 @@ タスク - - - - 編集 - - - - - 削除 - diff --git a/src/main/resources/templates/tasks.html b/src/main/resources/templates/tasks.html index e9c2912..e1ae7c8 100644 --- a/src/main/resources/templates/tasks.html +++ b/src/main/resources/templates/tasks.html @@ -48,8 +48,8 @@ - - + + @@ -57,7 +57,7 @@ - +
statusmeshcodeステータス地域メッシュ version file operation
準備中