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

# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java

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

@@ -14,7 +14,19 @@ public class AccountPreLoginDTO {
     @ApiModelProperty("用户名")
     private String userName;
 
+    /*新增字段*/
+    @NotBlank(message = "Please input email !")
+    @ApiModelProperty("邮箱")
+    private String email;
+
     @NotBlank(message = "password cannot be empty!")
     @ApiModelProperty("密码")
     private String password;
+
+    @NotBlank(message = "operationType cannot be empty")
+    @ApiModelProperty("操作类型  LOGIN 注册  FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱")
+    private String operationType;
+
+    @ApiModelProperty("异常ip")
+    private String ip;
 }

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

@@ -0,0 +1,27 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author aida
+ * @version 1.0
+ * @project aida_back
+ * @description 刷新缓存DTO
+ * @date 2023/7/25 16:51:16
+ */
+
+@Data
+public class ChatFlushDTO {
+    @NotNull(message = "userId cannot be empty!")
+    @ApiModelProperty("用户id")
+    private String user_id;
+
+    @NotBlank(message = "sessionId cannot be empty!")
+    @ApiModelProperty("会话ID")
+    private String session_id;
+
+}

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

@@ -0,0 +1,34 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author aida
+ * @version 1.0
+ * @project aida_back
+ * @description 机器人对话DTO
+ * @date 2023/7/25 16:35:55
+ */
+
+@Data
+@ApiModel("chatRobot 对话")
+public class ChatSendDTO {
+
+    @NotNull(message = "userId cannot be empty!")
+    @ApiModelProperty("用户id")
+    private String user_id;
+
+    @NotBlank(message = "sessionId cannot be empty!")
+    @ApiModelProperty("会话ID")
+    private String session_id;
+
+    @NotBlank(message = "Please input the message !")
+    @ApiModelProperty("消息")
+    private String message;
+
+}

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

@@ -0,0 +1,28 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("Generate like入参")
+public class GenerateLikeDTO {
+
+    @NotNull(message = "generateDetail id cannot be empty!")
+    @ApiModelProperty("generateDetailId")
+    private Long generateDetailId;
+
+    @NotBlank(message = "level1Type cannot be empty!")
+    @ApiModelProperty("一级类型 Sketchboard Printboard")
+    private String level1Type;
+
+    @ApiModelProperty("当一级类型为Sketchboard时，二级类型 Outwear Dress Blouse Skirt Trousers")
+    private String level2Type;
+
+    @NotBlank(message = "timeZone cannot be empty!")
+    @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
+    private String timeZone;
+}

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

@@ -0,0 +1,39 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel("GenerateThroughImageTextDTO")
+public class GenerateThroughImageTextDTO {
+
+    @ApiModelProperty("caption")
+    String text;
+
+    @ApiModelProperty("图片在t_collection_element表中的id")
+    Long collectionElementId;
+
+    @NotBlank(message = "you have to choose the generate type")
+    @ApiModelProperty("text  image  text-image")
+    String generateType;
+
+    @ApiModelProperty("图片是update，还是从library中选择")
+    String designType;
+
+    @NotBlank(message = "level1Type cannot be empty!")
+    @ApiModelProperty("Moodboard Printboard Sketchboard MarketingSketch")
+    String level1Type;
+
+    @ApiModelProperty("Outwear Dress Blouse Skirt Trousers")
+    String level2Type;
+
+    @ApiModelProperty("选择的模型名")
+    String version;
+
+    @NotBlank(message = "timeZone cannot be empty!")
+    @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
+    String timeZone;
+}