Merge remote-tracking branch 'origin/dev/dev' into dev/dev_shb

src/main/java/com/ai/da/model/dto/QueryIncomeOrExpenditureDTO.java

@@ -0,0 +1,13 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("查积分的收支详情")
+public class QueryIncomeOrExpenditureDTO extends QueryPageByTimeDTO{
+
+    private Boolean isIncome;
+}

src/main/java/com/ai/da/model/dto/QueryPageByTimeDTO.java

@@ -0,0 +1,19 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.model.vo.PageQueryBaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("分页查询，限制时间区间")
+public class QueryPageByTimeDTO extends PageQueryBaseVo {
+
+    @ApiModelProperty("开始时间 yyyy-mm-dd hh:mm:ss 可以不要时分秒")
+    private String startTime;
+
+    @ApiModelProperty("结束时间 yyyy-mm-dd hh:mm:ss 可以不要时分秒")
+    private String endTime;
+}

src/main/java/com/ai/da/model/dto/QueryTaskHistoryDTO.java

@@ -0,0 +1,18 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotEmpty;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("按分类分页查询历史任务")
+public class QueryTaskHistoryDTO extends QueryPageByTimeDTO {
+
+    @NotEmpty(message = "type cannot be empty")
+    @ApiModelProperty("可选类型 ： SR")
+    private String type;
+}

src/main/java/com/ai/da/model/dto/SuperResolutionDTO.java

@@ -0,0 +1,25 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SuperResolutionDTO {
+
+    @NotBlank(message = "You have to select at least one image")
+    @ApiModelProperty("图片")
+    private String images;
+
+    @NotBlank(message = "You must choose the magnification")
+    @ApiModelProperty("放大倍数")
+    private Integer scale;
+
+    @ApiModelProperty("唯一id，用于保持消息唯一性")
+    private String uniqueId;
+}

src/main/java/com/ai/da/model/dto/TaskDTO.java

@@ -0,0 +1,46 @@
+package com.ai.da.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TaskDTO<T> {
+
+    private String taskId;
+
+    // 可选type : SR GENERATE
+    private String type;
+
+    // 输入的图片名
+    private String imageName;
+
+    private T inputParam;
+
+    private String outputImage;
+
+    // 任务状态，暂定状态：排队中、执行中、成功/失败
+    private String status;
+
+    // 当前任务的创建时间
+    private String createDate;
+
+    public TaskDTO(String taskId, String type, String imageName, T inputParam, String status, String createDate) {
+        this.taskId = taskId;
+        this.type = type;
+        this.imageName = imageName;
+        this.inputParam = inputParam;
+        this.status = status;
+        this.createDate = createDate;
+    }
+
+    public TaskDTO(String taskId, String type, T inputParam, String status, String createDate) {
+        this.taskId = taskId;
+        this.type = type;
+        this.inputParam = inputParam;
+        this.status = status;
+        this.createDate = createDate;
+    }
+}

src/main/java/com/ai/da/model/dto/UserDesignStatisticDTO.java

@@ -0,0 +1,17 @@
+package com.ai.da.model.dto;
+
+import lombok.Data;
+
+@Data
+public class UserDesignStatisticDTO {
+
+    private Long accountId;
+
+    private Long useDesignTimes;
+
+    private String userEmail;
+
+    private String userName;
+
+    private String isTrial;
+}

src/main/java/com/ai/da/model/dto/WebhookVerifyDTO.java

@@ -0,0 +1,35 @@
+package com.ai.da.model.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WebhookVerifyDTO implements Serializable {
+
+    private String transmission_id;
+    private String transmission_time;
+    private String cert_url;
+    private String auth_algo;
+    private String transmission_sig;
+    private String webhook_id;
+    private Object webhook_event;
+
+}
+
+
+
+
+
+
+
+
+

src/main/java/com/ai/da/model/vo/TaskVO.java

@@ -0,0 +1,22 @@
+package com.ai.da.model.vo;
+
+import lombok.Data;
+
+@Data
+public class TaskVO {
+
+    // 图片名
+    private String imageName;
+
+    private String inputImage;
+
+    private String outputImage;
+
+    private String otherInput;
+
+    private String status;
+
+    private String taskId;
+
+    private String createDate;
+}