Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java

src/main/java/com/ai/da/mapper/primary/EmailLogMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.EmailLog;
+
+public interface EmailLogMapper extends CommonMapper<EmailLog> {
+}

src/main/java/com/ai/da/mapper/primary/EmailTemplateMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.EmailTemplate;
+
+public interface EmailTemplateMapper extends CommonMapper<EmailTemplate> {
+}

src/main/java/com/ai/da/mapper/primary/PoseTransformationMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.PoseTransformation;
+
+public interface PoseTransformationMapper extends CommonMapper<PoseTransformation> {
+}

src/main/java/com/ai/da/mapper/primary/SketchReconstructionMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.mapper.primary.entity.SketchReconstruction;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface SketchReconstructionMapper extends BaseMapper<SketchReconstruction> {
+}

src/main/java/com/ai/da/mapper/primary/entity/EmailLog.java

@@ -0,0 +1,35 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("t_email_log")
+public class EmailLog extends BaseEntity {
+
+    private Long templateId;
+
+    private String parameter;
+
+    // from是SQL关键字，直接使用会报错
+    private String sender;
+
+    private String recipients;
+
+    private String cc = null;
+
+    private String bcc = null;
+
+    private String subject;
+
+    /**
+     * failed	邮件发送失败（如网络问题、邮件服务器问题等）。
+     * retrying	邮件发送失败后，正在重试发送。
+     * delivered 邮件已成功投递到收件人的邮箱服务器。
+     */
+    private String status;
+
+    private int retryCount = 0;
+}

src/main/java/com/ai/da/mapper/primary/entity/EmailTemplate.java

@@ -0,0 +1,24 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("t_email_template")
+public class EmailTemplate extends BaseEntity {
+
+    // 考虑添加唯一索引
+    private String templateName;
+
+    private String templatePath;
+
+    private String content;
+
+    private int version;
+
+    private String language;
+
+    private byte isDeleted = 0;
+}

src/main/java/com/ai/da/mapper/primary/entity/Generate.java

@@ -85,6 +85,15 @@ public class Generate {
      */
     private Long styleImageElementId;
 
+    /**
+     * 由拼贴图生成线稿的项目id
+     */
+    private Long projectId;
+    /**
+     * 输入模型的拼贴图
+     */
+    private String inputImageUrl;
+
     /**
      * 创建时间
      */

src/main/java/com/ai/da/mapper/primary/entity/PoseTransformation.java

@@ -0,0 +1,33 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_pose_transformation")
+@Data
+public class PoseTransformation extends BaseEntity {
+
+    private Long projectId;
+
+    private Long accountId;
+
+    private String uniqueId;
+
+    private String productImage;
+
+    private int poseId;
+
+    private String gifUrl;
+
+    private String videoUrl;
+    // GIF第一帧截图
+    private String imageUrl;
+
+    private byte isLiked;
+
+    private byte isDeleted;
+
+
+}

src/main/java/com/ai/da/mapper/primary/entity/SketchReconstruction.java

@@ -0,0 +1,20 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("t_sketch_reconstruction")
+public class SketchReconstruction extends BaseEntity{
+
+    private Long projectId;
+    // 最后一次拼贴图生成的sketch
+    private String collageImgSketchUrl;
+
+    private Long generateDetailId;
+
+    private String canvasUrl;
+
+}