Merge branch 'mymaster' into 'master'

添加打包下载模型

See merge request rays/pcloud-common-parent!64

pcloud-common-core/src/main/java/com/pcloud/common/core/dto/FileRarBaseDto.java

+package com.pcloud.common.core.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author ruansiyuan
+ * @Date 2019/9/26 17:01
+ **/
+@ApiModel("文件压缩包基础信息")
+@JsonInclude(value = JsonInclude.Include.NON_NULL)
+public class FileRarBaseDto implements Serializable {
+
+    private static final long serialVersionUID = -1794097417651170567L;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("大小")
+    private Long size;
+
+    @ApiModelProperty("压缩包集合")
+    private List<FileRarDto> fileRarDtos;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getSize() {
+        return size;
+    }
+
+    public void setSize(Long size) {
+        this.size = size;
+    }
+
+    public List<FileRarDto> getFileRarDtos() {
+        return fileRarDtos;
+    }
+
+    public void setFileRarDtos(List<FileRarDto> fileRarDtos) {
+        this.fileRarDtos = fileRarDtos;
+    }
+
+    @Override
+    public String toString() {
+        return "FileRarBaseDto{" +
+                "name='" + name + '\'' +
+                ", size=" + size +
+                ", fileRarDtos=" + fileRarDtos +
+                '}';
+    }
+}

pcloud-common-core/src/main/java/com/pcloud/common/core/dto/FileRarDto.java

+package com.pcloud.common.core.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author ruansiyuan
+ * @Date 2019/9/26 16:56
+ **/
+@ApiModel("文件压缩包")
+@JsonInclude(value = JsonInclude.Include.NON_NULL)
+public class FileRarDto implements Serializable {
+
+    private static final long serialVersionUID = -5404297263953529753L;
+
+    @ApiModelProperty("文件名称")
+    private String fileName;
+
+    @ApiModelProperty("文件大小")
+    private Long fileSize;
+
+    @ApiModelProperty("文件地址")
+    private String fileUrl;
+
+    @ApiModelProperty("文件数量")
+    private Integer fileItemCount;
+
+    @ApiModelProperty("压缩状态(-1等待压缩;0正在压缩;1压缩成功;2压缩失败)")
+    private Integer state;
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public Long getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(Long fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    public Integer getFileItemCount() {
+        return fileItemCount;
+    }
+
+    public void setFileItemCount(Integer fileItemCount) {
+        this.fileItemCount = fileItemCount;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    @Override
+    public String toString() {
+        return "FileRarDto{" +
+                "fileName='" + fileName + '\'' +
+                ", fileSize=" + fileSize +
+                ", fileUrl='" + fileUrl + '\'' +
+                ", fileItemCount=" + fileItemCount +
+                ", state=" + state +
+                '}';
+    }
+}