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

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

src/main/java/com/ai/da/mapper/TDesignPythonOutfitDetailMapper.java

@@ -0,0 +1,27 @@
+package com.ai.da.mapper;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.entity.TDesignPythonOutfitDetail;
+import com.ai.da.model.vo.TDesignPythonOutfitDetailVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * design item详情表 Mapper 接口
+ *
+ * @author SHAHAIBO
+ * @since 2023-09-04
+ */
+public interface TDesignPythonOutfitDetailMapper extends CommonMapper<TDesignPythonOutfitDetail> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param tDesignPythonOutfitDetail
+	 * @return
+	 */
+	List<TDesignPythonOutfitDetailVO> selectTDesignPythonOutfitDetailPage(IPage page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail);
+
+}

src/main/java/com/ai/da/mapper/TDesignPythonOutfitMapper.java

@@ -0,0 +1,27 @@
+package com.ai.da.mapper;
+
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.entity.TDesignPythonOutfit;
+import com.ai.da.model.vo.TDesignPythonOutfitVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * design item表 存对应design的8张图片 Mapper 接口
+ *
+ * @author SHAHAIBO
+ * @since 2023-09-04
+ */
+public interface TDesignPythonOutfitMapper extends CommonMapper<TDesignPythonOutfit> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param tDesignPythonOutfit
+	 * @return
+	 */
+	List<TDesignPythonOutfitVO> selectTDesignPythonOutfitPage(IPage page, TDesignPythonOutfitVO tDesignPythonOutfit);
+
+}

src/main/java/com/ai/da/mapper/WorkspaceMapper.java

@@ -0,0 +1,27 @@
+package com.ai.da.mapper;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.entity.Workspace;
+import com.ai.da.model.vo.WorkspaceVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author SHAHAIBO
+ * @since 2023-08-01
+ */
+public interface WorkspaceMapper extends CommonMapper<Workspace> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param workspace
+	 * @return
+	 */
+	List<WorkspaceVO> selectWorkspacePage(IPage page, WorkspaceVO workspace);
+
+}

src/main/java/com/ai/da/mapper/entity/TDesignPythonOutfit.java

@@ -0,0 +1,70 @@
+
+package com.ai.da.mapper.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * design item表 存对应design的8张图片实体类
+ *
+ * @author SHAHAIBO
+ * @since 2023-08-30
+ */
+@Data
+@ApiModel(value = "TDesignPythonOutfit对象", description = "design item表 存对应design的8张图片")
+public class TDesignPythonOutfit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 关联的design ID
+     */
+    @ApiModelProperty(value = "关联的design ID")
+    private Long designId;
+    /**
+     * 关联的collection ID
+     */
+    @ApiModelProperty(value = "关联的collection ID")
+    private Long collectionId;
+    /**
+     * design后的用户文件地址(python 返回)
+     */
+    @ApiModelProperty(value = "design后的用户文件地址(python 返回)")
+    private String designUrl;
+    /**
+     * 保存用户ID
+     */
+    @ApiModelProperty(value = "保存用户ID")
+    private Long userId;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateDate;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+
+}

src/main/java/com/ai/da/mapper/entity/TDesignPythonOutfitDetail.java

@@ -0,0 +1,90 @@
+
+package com.ai.da.mapper.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * design item详情表实体类
+ *
+ * @author SHAHAIBO
+ * @since 2023-08-31
+ */
+@Data
+@ApiModel(value = "TDesignPythonOutfitDetail对象", description = "design item详情表")
+public class TDesignPythonOutfitDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 关联的design ID
+     */
+    @ApiModelProperty(value = "关联的design ID")
+    private Long designId;
+    /**
+     * 关联的design_item ID
+     */
+    @ApiModelProperty(value = "关联的design_item ID")
+    private Long designPythonOutfitId;
+    /**
+     * 关联的elementId 没有为null
+     */
+    @ApiModelProperty(value = "关联的elementId 没有为null")
+    private Long collectionElementId;
+    /**
+     * 图层
+     */
+    @ApiModelProperty(value = "图层")
+    private String imageCategory;
+    /**
+     * 对应的图片的绝对路径
+     */
+    @ApiModelProperty(value = "对应的图片的绝对路径")
+    private String imageUrl;
+    /**
+     * mask_url
+     */
+    @ApiModelProperty(value = "mask_url")
+    private String maskUrl;
+    /**
+     * 位置
+     */
+    @ApiModelProperty(value = "位置")
+    private String position;
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateDate;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDeleted;
+
+
+}

src/main/java/com/ai/da/mapper/entity/Workspace.java

@@ -0,0 +1,85 @@
+
+package com.ai.da.mapper.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 实体类
+ *
+ * @author SHAHAIBO
+ * @since 2023-08-01
+ */
+@Data
+@ApiModel(value = "Workspace对象", description = "Workspace对象")
+@TableName("workspace")
+public class Workspace implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 工作空间名称
+     */
+    @ApiModelProperty(value = "工作空间名称")
+    private String workSpaceName;
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+    /**
+     * 性别
+     */
+    @ApiModelProperty(value = "性别")
+    private String sex;
+    /**
+     * 服装部位
+     */
+    @ApiModelProperty(value = "服装部位")
+    private String position;
+    /**
+     * SYSTEM_DESIGNER占比
+     */
+    @ApiModelProperty(value = "SYSTEM_DESIGNER占比")
+    private Integer systemDesignerPercentage;
+    /**
+     * 人体模型
+     */
+    @ApiModelProperty(value = "人体模型")
+    private String mannequin;
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+    /**
+     * 是否删除
+     */
+    @TableLogic
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDeleted;
+
+
+}