diff --git a/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java b/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java index 131f279..13190ca 100644 --- a/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java @@ -1,18 +1,12 @@ 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; import org.springframework.beans.BeansException; import org.springframework.stereotype.Component; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import java.io.IOException; @Component @@ -38,11 +32,23 @@ @GET @Path("/{rid}/game/drawings/{dno}") @Produces(MediaType.APPLICATION_JSON) - public Drawing getDrawing(@PathParam("rid") String rid, @PathParam("dno") int dno ) { + public String getDrawing(@PathParam("rid") String rid, @PathParam("dno") int dno ) { + String path = ""; + String path1 = ""; + String fileName = ""; - // いったんnullにしとく - return null; + try { + path1 = applicationContext.getResource("file:").getFile().getAbsolutePath() + "/apache-tomcat-9.0.10/webapps/irisdata"; + fileName= rid + "-" + dno + ".png"; + path = path1 + fileName; + System.out.println("生成されたパス:" + path.toString()); + } catch (IOException e) { + e.printStackTrace(); + throw new WebApplicationException(500); + } + + return path; } // 描いた絵を送る @@ -65,8 +71,7 @@ } System.out.println("画像デーをが追加しました。これがパス:" + path); - return "画像のサーバー保存完了"; + return "画像保存完了"; } - }