diff --git a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java index e233752..c47c540 100644 --- a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java +++ b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java @@ -365,10 +365,10 @@ public class ViidController { @RequestMapping(value = "/Images", method = RequestMethod.POST) @IgnoreLogReq - public VIIDBaseResp images(@RequestBody String req) { + public VIIDBaseResp images(@RequestBody ImageUploadReq req) { log.info("Images:{}", req); return new VIIDBaseResp( - new ResponseStatusObject("1", "/VIID/Faces", "0", "OK", sdfTime.format(new Date())) + new ResponseStatusObject("1", "/VIID/Images", "0", "OK", sdfTime.format(new Date())) ); } diff --git a/src/main/java/com/ycwl/basic/model/viid/entity/ImageInfoObject.java b/src/main/java/com/ycwl/basic/model/viid/entity/ImageInfoObject.java new file mode 100644 index 0000000..954f9db --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/viid/entity/ImageInfoObject.java @@ -0,0 +1,46 @@ +package com.ycwl.basic.model.viid.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +public class ImageInfoObject { + @JsonProperty("ContentDescription") + private String contentDescription; + + @JsonProperty("EventSort") + private int eventSort; + + @JsonProperty("FileFormat") + private String fileFormat; + + @JsonProperty("FileSize") + private long fileSize; + + @JsonProperty("Height") + private int height; + + @JsonProperty("ImageID") + private String imageID; + + @JsonProperty("ImageSource") + private String imageSource; + + @JsonProperty("InfoKind") + private int infoKind; + + @JsonProperty("SecurityLevel") + private String securityLevel; + + @JsonProperty("ShotPlaceFullAdress") + private String shotPlaceFullAdress; + + @JsonProperty("ShotTime") + private String shotTime; + + @JsonProperty("Title") + private String title; + + @JsonProperty("Width") + private int width; +} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/viid/entity/ImageListObject.java b/src/main/java/com/ycwl/basic/model/viid/entity/ImageListObject.java new file mode 100644 index 0000000..af0b936 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/viid/entity/ImageListObject.java @@ -0,0 +1,12 @@ +package com.ycwl.basic.model.viid.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class ImageListObject { + @JsonProperty("Image") + private List imageObject; +} diff --git a/src/main/java/com/ycwl/basic/model/viid/entity/ImageObject.java b/src/main/java/com/ycwl/basic/model/viid/entity/ImageObject.java new file mode 100644 index 0000000..4cf5466 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/viid/entity/ImageObject.java @@ -0,0 +1,16 @@ +package com.ycwl.basic.model.viid.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +public class ImageObject { + @JsonProperty("Data") + private String data; + + @JsonProperty("FaceList") + private FaceListObject faceListObject; + + @JsonProperty("ImageInfo") + private ImageInfoObject imageInfoObject; +} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/viid/req/ImageUploadReq.java b/src/main/java/com/ycwl/basic/model/viid/req/ImageUploadReq.java index e5867c8..897c973 100644 --- a/src/main/java/com/ycwl/basic/model/viid/req/ImageUploadReq.java +++ b/src/main/java/com/ycwl/basic/model/viid/req/ImageUploadReq.java @@ -1,7 +1,11 @@ package com.ycwl.basic.model.viid.req; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.ycwl.basic.model.viid.entity.ImageListObject; import lombok.Data; @Data public class ImageUploadReq { + @JsonProperty("ImageListObject") + private ImageListObject imageListObject; }