diff --git a/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java b/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java index 083ee2f..e5ee3e8 100644 --- a/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java @@ -1,5 +1,9 @@ package com.ntlab.irisserver.resources; +import com.ntlab.irisserver.entities.Drawing; +import com.ntlab.irisserver.entities.Game; +import com.ntlab.irisserver.entities.Room; +import com.ntlab.irisserver.models.RoomManager; import com.ntlab.irisserver.utils.Base64Decode; import org.apache.catalina.core.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -7,6 +11,7 @@ import org.springframework.stereotype.Component; import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; import java.io.IOException; @Component @@ -19,6 +24,7 @@ this.applicationContext = applicationContext; } + // お絵描きの終了判定 @GET @Path("/{rid}/game/drawings") public String getDrawings(@PathParam("rid") String rid) { @@ -26,32 +32,35 @@ return null; } + // 絵のデータ取得 @GET @Path("/{rid}/game/drawings/{dno}") - public String getDrawing(@PathParam("rid") String rid, @PathParam("dno") int dno ) { + @Produces(MediaType.APPLICATION_JSON) + public Drawing getDrawing(@PathParam("rid") String rid, @PathParam("dno") int dno ) { + RoomManager roomManager = RoomManager.getInstance(); + Room room = roomManager.getRoom(rid); + Game game = room.getGame(); + // まだgameのメソッドが出来ていないのでコメントアウト + // Drawing drawing = game.getDrawing(dno); + // return drawing; + return null; } + // 描いた絵を送る @PUT @Path("/{rid}/game/drawings/{dno}") public String putDrawing(@PathParam("rid") String rid, @PathParam("dno") int dno, @FormParam("drawing") String drawing ) { + RoomManager roomManager = RoomManager.getInstance(); + Room room = roomManager.getRoom(rid); + Game game = room.getGame(); + + // まだgameのメソッドが出来ていないのでコメントアウト + // game.putDrawing(dno, drawing); String path1 = ""; String path = ""; - try { - path1 = applicationContext.getResource("file:").getFile(); - // 下記が本物だけど上手くいかない。。。 - //path1 = applicationContext.getResource("file:").getFile().getAbsolutePath() +"/apache-tomcat-9.0.10"+ "/webapps"; - System.out.println("0"+ path1.toString()); - System.out.println("!!!クライアントから届いたBASE64の文字列!!!:" + drawing.toString()); - path = Base64Decode.saveAsFile(rid, dno, path1, drawing); - - } catch (IOException e) { - e.printStackTrace(); - throw new WebApplicationException(500); - } - // いったんnullにしとく return null; }