diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Position.java b/src/main/java/org/ntlab/acanthus_server/entities/Position.java index ef23208..b76fbfa 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Position.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Position.java @@ -1,5 +1,12 @@ package org.ntlab.acanthus_server.entities; +import com.fasterxml.jackson.annotation.JsonIgnore; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.UUID; + public class Position { - + + } diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java index 911b322..899e920 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java @@ -1,5 +1,7 @@ package org.ntlab.acanthus_server.resources.gallery; +import org.ntlab.acanthus_server.entities.Position; +import org.ntlab.acanthus_server.models.Gallery; import org.springframework.stereotype.Component; import javax.ws.rs.*; @@ -14,17 +16,11 @@ * 指定したレイヤー情報(順番、枚数)を獲得 * @PathParam Integer aid 作品ID */ - @Path("/{aid}/pageMap/0/layers/0") @GET @Produces(MediaType.APPLICATION_JSON) public ArrayList getLayersRest(@PathParam("aid") Integer aid) { return null; - /* if() { - - } - */ -/**/ } } diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java index 8b9bfe6..321f21b 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java @@ -1,11 +1,13 @@ package org.ntlab.acanthus_server.resources.gallery; - import org.springframework.stereotype.Component; +import org.ntlab.acanthus_server.entities.Position; +import org.ntlab.acanthus_server.models.Gallery; +import org.springframework.stereotype.Component; - import javax.ws.rs.*; - import javax.ws.rs.core.MediaType; - import java.util.ArrayList; - import java.util.Optional; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.Collection; @Component @Path("/gallery") @@ -20,7 +22,6 @@ * @Formparam Integer color 色情報 * @Formparam Integer thick 太さ情報 */ - @Path("/{aid}/pageMap/0/layers/0/strokes") @POST @Produces(MediaType.APPLICATION_JSON) @@ -34,11 +35,10 @@ * @PathParam Integer aid 作品のID * @PathParam Integer strokeNo 線番号 */ - @Path("/{aid}/pageMap/0/layers/0/strokes/{strokeNo}/position") @GET @Produces(MediaType.APPLICATION_JSON) - public ArrayList getPositions(@PathParam("aid") Integer aid, @PathParam("strokeNo") Integer strokeNo) { + public String getPositions(@PathParam("aid") Integer aid, @PathParam("strokeNo") Integer strokeNo) { return null; } @@ -48,7 +48,6 @@ * @FormParam Integer x x座標 * @FormParam Integer y y座標 */ - @Path("/{aid}/pageMap/0/layers/0/strokes/{strokeNo}/position") @POST @Produces(MediaType.APPLICATION_JSON)