diff --git a/src/main/java/com/ntlab/irisserver/entities/Drawing.java b/src/main/java/com/ntlab/irisserver/entities/Drawing.java index 225da01..fb14640 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Drawing.java +++ b/src/main/java/com/ntlab/irisserver/entities/Drawing.java @@ -10,13 +10,16 @@ public class Drawing { @JsonProperty("drawing") - private String drawing; + private String drawingPath; - public Drawing(String drawing) { - this.drawing = drawing; - } + private Boolean isDrawn = false; - //getter - public String getDrawing() {return this.drawing;} + // getter + public String getDrawing() {return this.drawingPath;} + public Boolean getIsDrawn() {return this.isDrawn;} + + // setter + public void setDrawing(String drawing) {this.drawingPath = drawing;} + public void setIsDrawn(Boolean isDrawn) {this.isDrawn = isDrawn;} } diff --git a/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java b/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java index 7b3aeed..2e6b9bd 100644 --- a/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java @@ -54,19 +54,23 @@ @Produces(MediaType.APPLICATION_JSON) public String putDrawing(@PathParam("rid") String rid, @PathParam("dno") int dno, @FormParam("drawing") String drawingStr ) { String pathDirectory = ""; - String path = ""; + String drawingPath = ""; try { pathDirectory = applicationContext.getResource("file:").getFile().getAbsolutePath() + "/apache-tomcat-9.0.10/webapps"; System.out.println("保存前のディレクトリのパス:" + pathDirectory.toString()); System.out.println("クライアントから届いたBASE64の文字列"+ drawingStr.toString()); // utilsのBase64Decodeにデコードしてもらって、そのついでに保存してもらう - path = Base64Decode.saveAsFile(rid, dno, pathDirectory, drawingStr); - Drawing drawing = new Drawing(path); + drawingPath = Base64Decode.saveAsFile(rid, dno, pathDirectory, drawingStr); RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); Game game = room.getGame(); + + // 絵の情報を上書き + Drawing drawing = game.getDrawing(dno); + drawing.setDrawing(drawingPath); + drawing.setIsDrawn(true); game.putDrawing(dno, drawing); } catch (IOException e) { @@ -74,7 +78,7 @@ throw new WebApplicationException(500); } - System.out.println("画像データの追加完了。これがパス:" + path); + System.out.println("画像データの追加完了。これがパス:" + drawingPath); return "画像保存完了"; }