diff --git a/src/main/java/com/ntlab/irisserver/entities/Turn.java b/src/main/java/com/ntlab/irisserver/entities/Turn.java index 344ac28..d6ec26b 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Turn.java +++ b/src/main/java/com/ntlab/irisserver/entities/Turn.java @@ -17,13 +17,19 @@ @JsonProperty("max") private int max; + @JsonProperty("turnstate") + private int turnstate; + private List questions[] = new ArrayList[16]; //> private List openlist = new ArrayList<>(); //コンストラクタ - public Turn(){max = -1;} + public Turn(){ + max = -1; + turnstate = 0; + } //--------------------------------------------------------- //セッター @@ -34,6 +40,8 @@ public void setMax(int max) {this.max = max;} + public void setTurnstate(int turnstate) {this.turnstate = turnstate;} + //--------------------------------------------------------- //ゲッター @@ -47,6 +55,8 @@ public List[] getQuestionsList() {return questions;} + public int getTurnstate() {return turnstate;} + //--------------------------------------------------------- //questions操作 diff --git a/src/main/java/com/ntlab/irisserver/entities/TurnJson.java b/src/main/java/com/ntlab/irisserver/entities/TurnJson.java index 3f0bc91..909a0b1 100644 --- a/src/main/java/com/ntlab/irisserver/entities/TurnJson.java +++ b/src/main/java/com/ntlab/irisserver/entities/TurnJson.java @@ -16,6 +16,9 @@ @JsonProperty("max") private int max; + @JsonProperty("turnstate") + private int turnstate; + private List openlist = new ArrayList<>(); //コンストラクタ @@ -25,6 +28,7 @@ team = t.getTeam(); max = t.getMax(); openlist = t.getOpenListAll(); + turnstate = t.getTurnstate(); } //--------------------------------------------------------- @@ -38,6 +42,8 @@ public List getOpenListAll() {return openlist;} //リストそのものを返す。 + public int getTurnstate() {return turnstate;} + //--------------------------------------------------------- //セッター @@ -47,6 +53,8 @@ public void setMax(int max) {this.max = max;} + public void setTurnstate(int turnstate) {this.turnstate = turnstate;} + //--------------------------------------------------------- //openlist操作 diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java index f2ad491..1a747dc 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java @@ -52,7 +52,7 @@ @GET //Turnインスタンスの取得 @Path("/{rid}/game/turns/{tno}") @Produces(MediaType.APPLICATION_JSON) - public Turn getTurns(@PathParam("rid") String rid, @PathParam("tno") Integer tno) { + public Turn getTurns(@PathParam("rid") String rid, @PathParam("tno") int tno) { RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); @@ -71,24 +71,26 @@ //------------------------------------------------------------------------ // rooms/{rid}/game/turns/{tno}/hint: - @PUT + @PUT //ヒントと最大数を入力することで諜報員のターンに遷移する @Path("/{rid}/game/turns/{tno}/hint") - public void putHint(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("hint") String hint){ + public void putHint(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("hint") String hint, @FormParam("max") int max){ RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); Game game = room.getGame(); Turn t = game.getTurn(tno); t.setHint(hint); + t.setMax(max); + t.setTurnstate(1); } //------------------------------------------------------------------------ // rooms/{rid}/game/turns/{tno}/max: - - @PUT +/* + @PUT //いらんかも @Path("/{rid}/game/turns/{tno}/max") - public void putMax(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("hint") int max){ + public void putMax(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("max") int max){ RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); @@ -97,7 +99,7 @@ t.setMax(max); } - +*/ //------------------------------------------------------------------------ // rooms/{rid}/game/turns/{tno}/questions: