From 9f48a2ce09cc1a363c84698d9c4d47ff3ce3e359 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Mon, 15 Dec 2025 13:38:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8D=87=E7=BA=A7swagger=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/common/response/PageBaseResponse.java | 15 +- .../ai/da/common/response/PageResponse.java | 15 +- .../com/ai/da/common/response/Response.java | 11 +- .../response/TransactionPageResponse.java | 4 +- .../da/mapper/primary/entity/APIGenerate.java | 4 +- .../ai/da/mapper/primary/entity/Account.java | 8 +- .../ai/da/mapper/primary/entity/Canvas.java | 10 +- .../da/mapper/primary/entity/ChatMessage.java | 16 +- .../da/mapper/primary/entity/ChatRobot.java | 4 +- .../mapper/primary/entity/Classification.java | 18 +- .../entity/ClassificationRelLibrary.java | 16 +- .../da/mapper/primary/entity/CloudTask.java | 34 ++-- .../da/mapper/primary/entity/Portfolio.java | 33 ++-- .../entity/TCollectionElementRelation.java | 13 +- .../primary/entity/TDesignPythonOutfit.java | 24 ++- .../entity/TDesignPythonOutfitDetail.java | 38 ++-- .../primary/entity/ToProductElement.java | 14 +- .../primary/entity/ToProductImageRecord.java | 10 +- .../primary/entity/ToProductImageResult.java | 24 +-- .../da/mapper/primary/entity/TrialOrder.java | 16 +- .../da/mapper/primary/entity/Workspace.java | 31 ++-- .../com/ai/da/model/dto/AccountAddDTO.java | 24 +-- .../ai/da/model/dto/AccountBindEmailDTO.java | 22 +-- .../com/ai/da/model/dto/AccountEditDTO.java | 22 +-- .../com/ai/da/model/dto/AccountLoginDTO.java | 20 +-- .../com/ai/da/model/dto/AccountLogoutDTO.java | 8 +- .../ai/da/model/dto/AccountPreLoginDTO.java | 19 +- .../ai/da/model/dto/AccountRegisterDTO.java | 15 +- .../com/ai/da/model/dto/AccountTrialDTO.java | 5 +- .../ai/da/model/dto/AffiliateQueryDTO.java | 13 +- .../com/ai/da/model/dto/ChatFlushDTO.java | 6 +- .../java/com/ai/da/model/dto/ChatSendDTO.java | 13 +- .../ai/da/model/dto/ClassificationDTO.java | 9 +- .../com/ai/da/model/dto/CloudTaskDTO.java | 7 +- .../ai/da/model/dto/CollectionColorDTO.java | 16 +- .../da/model/dto/CollectionDeleteFileDTO.java | 11 +- .../model/dto/CollectionElementUploadDTO.java | 21 ++- .../model/dto/CollectionGeneratePrintDTO.java | 15 +- .../da/model/dto/CollectionSavePrintDTO.java | 13 +- .../ai/da/model/dto/CollectionSketchDTO.java | 17 +- .../ai/da/model/dto/CollectionSortDTO.java | 7 +- .../com/ai/da/model/dto/CreateCouponDTO.java | 16 +- .../dto/DesignAttributeRetrievalDTO.java | 12 +- .../ai/da/model/dto/DesignCollectionDTO.java | 169 +++++++++--------- .../model/dto/DesignCollectionElementDTO.java | 13 +- .../dto/DesignCollectionPrintElementDTO.java | 15 +- .../com/ai/da/model/dto/DesignLikeDTO.java | 17 +- .../com/ai/da/model/dto/DesignSingleDTO.java | 76 ++++---- .../dto/DesignSingleIncludeLayersDTO.java | 20 +-- .../ai/da/model/dto/DesignSingleItemDTO.java | 139 +++++++------- .../ai/da/model/dto/DesignSinglePrintDTO.java | 12 +- .../com/ai/da/model/dto/DisDesignLikeDTO.java | 17 +- .../com/ai/da/model/dto/EditReferralDTO.java | 11 +- .../com/ai/da/model/dto/EmailSendDTO.java | 75 ++++---- .../com/ai/da/model/dto/ExportSearchDTO.java | 11 +- .../da/model/dto/GenerateHighDesignDTO.java | 13 +- .../com/ai/da/model/dto/GenerateLikeDTO.java | 17 +- .../ai/da/model/dto/GenerateModifyDTO.java | 19 +- .../dto/GenerateThroughImageTextDTO.java | 35 ++-- .../com/ai/da/model/dto/GetFollowListDTO.java | 10 +- .../ai/da/model/dto/GetNotificationDTO.java | 8 +- .../ai/da/model/dto/GetRgbByHsvBatchDTO.java | 43 +++-- .../com/ai/da/model/dto/HistoryDeleteDTO.java | 33 ++-- .../com/ai/da/model/dto/HistoryUpdateDTO.java | 54 +++--- .../com/ai/da/model/dto/ImageToSketchDTO.java | 15 +- .../com/ai/da/model/dto/LibraryDeleteDTO.java | 51 +++--- .../model/dto/LibraryLevel2TypeUpdateDTO.java | 9 +- .../ai/da/model/dto/LibraryModelPointDTO.java | 143 ++++++++------- .../com/ai/da/model/dto/LibraryUpdateDTO.java | 57 +++--- .../com/ai/da/model/dto/LibraryUploadDTO.java | 13 +- .../com/ai/da/model/dto/ModelsDotDTO.java | 151 ++++++++-------- .../model/dto/ModifyModelProportionDTO.java | 17 +- .../com/ai/da/model/dto/ModuleSaveDTO.java | 8 +- .../da/model/dto/MoodBoardModuleSaveDTO.java | 2 +- .../java/com/ai/da/model/dto/NoteSendDTO.java | 49 +++-- .../com/ai/da/model/dto/PartialDesignDTO.java | 10 +- .../com/ai/da/model/dto/PortfolioDTO.java | 4 +- .../com/ai/da/model/dto/PoseTransformDTO.java | 22 +-- .../ai/da/model/dto/ProductPurchaseDTO.java | 19 +- .../com/ai/da/model/dto/ProjectQueryDTO.java | 14 +- .../model/dto/PublishSysNotificationDTO.java | 11 +- .../ai/da/model/dto/QueryCouponsPageDTO.java | 14 +- .../ai/da/model/dto/QueryHistoryPageDTO.java | 53 +++--- .../dto/QueryIncomeOrExpenditureDTO.java | 5 +- .../ai/da/model/dto/QueryLibraryPageDTO.java | 75 ++++---- .../model/dto/QueryLibraryPageServiceDTO.java | 73 ++++---- .../da/model/dto/QueryLibraryTopPageDTO.java | 47 +++-- .../model/dto/QueryOrganizationPageDTO.java | 9 +- .../ai/da/model/dto/QueryPageByTimeDTO.java | 12 +- .../ai/da/model/dto/QueryPaymentInfoDTO.java | 21 ++- .../da/model/dto/QueryPortfolioPageDTO.java | 5 +- .../ai/da/model/dto/QueryTaskHistoryDTO.java | 7 +- .../da/model/dto/ReDesignCollectionDTO.java | 147 ++++++++------- .../ai/da/model/dto/ReferralPageQueryDTO.java | 9 +- .../da/model/dto/SketchReconstructionDTO.java | 11 +- .../da/model/dto/SketchesBoundingBoxDTO.java | 7 +- .../ai/da/model/dto/SubscriptionPlanDTO.java | 17 +- .../model/dto/SubscriptionPlanPageQuery.java | 11 +- .../ai/da/model/dto/SuperResolutionDTO.java | 8 +- .../ai/da/model/dto/ThreeDLayoutQueryDTO.java | 3 +- .../com/ai/da/model/dto/TimeQueryBaseDTO.java | 10 +- .../com/ai/da/model/dto/TrialOrderDTO.java | 5 +- .../model/dto/UpdateSubscriptionPlanDTO.java | 17 +- .../ai/da/model/dto/UpdateUserInfoDTO.java | 2 +- .../com/ai/da/model/vo/AccountLoginVO.java | 20 +-- .../com/ai/da/model/vo/AccountPreLoginVO.java | 11 +- .../com/ai/da/model/vo/CheckCouponsVO.java | 4 +- .../com/ai/da/model/vo/CollectionColorVO.java | 57 +++--- .../ai/da/model/vo/CollectionElementVO.java | 31 ++-- .../model/vo/CollectionGeneratePrintVO.java | 65 ++++--- .../ai/da/model/vo/CollectionSketchVO.java | 5 +- .../com/ai/da/model/vo/ComposeLayersVO.java | 11 +- .../da/model/vo/DesignCollectionItemVO.java | 17 +- .../ai/da/model/vo/DesignCollectionVO.java | 15 +- .../model/vo/DesignItemClothesDetailVO.java | 46 ++--- .../ai/da/model/vo/DesignItemDetailVO.java | 23 ++- .../da/model/vo/DesignItemOthersDetailVO.java | 22 +-- .../model/vo/DesignLibraryModelPointVO.java | 21 ++- .../java/com/ai/da/model/vo/DesignLikeVO.java | 13 +- .../ai/da/model/vo/DesignModuleChooseVO.java | 6 +- .../model/vo/DesignPythonOutfitDetailVO.java | 17 +- .../ai/da/model/vo/DesignPythonOutfitVO.java | 21 ++- .../com/ai/da/model/vo/DesignSinglePrint.java | 23 ++- .../com/ai/da/model/vo/DesignSingleVO.java | 10 +- .../vo/EditLayersPositionAndScaleVO.java | 9 +- src/main/java/com/ai/da/model/vo/FileVO.java | 13 +- .../com/ai/da/model/vo/GenerateCaptionVO.java | 7 +- .../da/model/vo/GenerateCollectionItemVO.java | 11 +- .../ai/da/model/vo/GenerateCollectionVO.java | 13 +- .../com/ai/da/model/vo/GenerateLikeVO.java | 7 +- .../com/ai/da/model/vo/GenerateResultVO.java | 5 +- .../ai/da/model/vo/GetNextSysElementVO.java | 15 +- .../com/ai/da/model/vo/HistoryUpdateVO.java | 13 +- .../ai/da/model/vo/LibraryModelPointVO.java | 25 ++- .../com/ai/da/model/vo/LibraryUpdateVo.java | 26 +-- .../com/ai/da/model/vo/MagicToolResultVO.java | 7 +- .../com/ai/da/model/vo/ModuleChooseVO.java | 6 +- .../com/ai/da/model/vo/PageQueryBaseVo.java | 43 +++-- .../java/com/ai/da/model/vo/PantoneVO.java | 27 ++- .../com/ai/da/model/vo/PaymentInfoVO.java | 26 +-- .../ai/da/model/vo/PersonalHomepageVO.java | 19 +- .../ai/da/model/vo/PrepareForGenerateVO.java | 13 +- .../com/ai/da/model/vo/ProjectChooseVO.java | 6 +- .../java/com/ai/da/model/vo/ProjectVO.java | 10 +- .../ai/da/model/vo/QueryLibraryPageVO.java | 85 +++++---- .../ai/da/model/vo/QueryUserConditionsVO.java | 7 +- .../ai/da/model/vo/SubscriptionPlanVO.java | 18 +- .../java/com/ai/da/model/vo/SysFileVO.java | 7 +- .../model/vo/TDesignPythonOutfitDetailVO.java | 6 +- .../ai/da/model/vo/TDesignPythonOutfitVO.java | 6 +- .../da/model/vo/ToProductImageResultVO.java | 7 +- .../com/ai/da/model/vo/ToProductImageVO.java | 7 +- .../com/ai/da/model/vo/UserLikeChooseVO.java | 14 +- .../ai/da/model/vo/UserLikeCollectionVO.java | 23 ++- .../com/ai/da/model/vo/UserLikeGroupVO.java | 23 ++- .../java/com/ai/da/model/vo/UserLikeVO.java | 21 ++- .../da/model/vo/UserPreferenceLogTestDTO.java | 17 ++ .../com/ai/da/model/vo/ValidateElementVO.java | 7 +- .../java/com/ai/da/model/vo/WorkspaceVO.java | 6 +- .../da/python/vo/DesignPythonItemElement.java | 8 +- .../da/python/vo/DesignPythonItemPrint.java | 28 +-- 161 files changed, 1801 insertions(+), 1867 deletions(-) diff --git a/src/main/java/com/ai/da/common/response/PageBaseResponse.java b/src/main/java/com/ai/da/common/response/PageBaseResponse.java index 6a0a2e83..40c2e063 100644 --- a/src/main/java/com/ai/da/common/response/PageBaseResponse.java +++ b/src/main/java/com/ai/da/common/response/PageBaseResponse.java @@ -1,8 +1,7 @@ package com.ai.da.common.response; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @@ -16,17 +15,17 @@ import java.util.List; */ @Data @NoArgsConstructor -@ApiModel("分页响应结果") +@Schema(description = "分页响应结果") public class PageBaseResponse { - @ApiModelProperty("页码") + @Schema(description = "页码") private long page; - @ApiModelProperty("每页数量") + @Schema(description = "每页数量") private long size; - @ApiModelProperty("总页数") + @Schema(description = "总页数") private long pages; - @ApiModelProperty("总条数") + @Schema(description = "总条数") private long total; - @ApiModelProperty("结果集") + @Schema(description = "结果集") private List content; diff --git a/src/main/java/com/ai/da/common/response/PageResponse.java b/src/main/java/com/ai/da/common/response/PageResponse.java index 3aa1929d..2fdbe947 100644 --- a/src/main/java/com/ai/da/common/response/PageResponse.java +++ b/src/main/java/com/ai/da/common/response/PageResponse.java @@ -1,8 +1,7 @@ package com.ai.da.common.response; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @@ -16,18 +15,18 @@ import java.util.List; */ @Data @NoArgsConstructor -@ApiModel("分页响应结果") +@Schema(description = "分页响应结果") public class PageResponse extends Response> { - @ApiModelProperty("页码") + @Schema(description = "页码") private long page; - @ApiModelProperty("每页数量") + @Schema(description = "每页数量") private long size; - @ApiModelProperty("总页数") + @Schema(description = "总页数") private long pages; - @ApiModelProperty("总条数") + @Schema(description = "总条数") private long total; - @ApiModelProperty("结果集") + @Schema(description = "结果集") private List content; diff --git a/src/main/java/com/ai/da/common/response/Response.java b/src/main/java/com/ai/da/common/response/Response.java index a24ccb53..c010d739 100644 --- a/src/main/java/com/ai/da/common/response/Response.java +++ b/src/main/java/com/ai/da/common/response/Response.java @@ -1,7 +1,6 @@ package com.ai.da.common.response; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,14 +16,14 @@ import java.io.Serializable; @Data @AllArgsConstructor @NoArgsConstructor -@ApiModel("响应结果") +@Schema(description = "响应结果") public class Response implements Serializable { - @ApiModelProperty("响应状态码 0：成功 -1：失败") + @Schema(description = "响应状态码 0：成功 -1：失败") private int errCode; - @ApiModelProperty("提示消息") + @Schema(description = "提示消息") private String errMsg; - @ApiModelProperty("数据结果") + @Schema(description = "数据结果") private T data; public static Response success() { diff --git a/src/main/java/com/ai/da/common/response/TransactionPageResponse.java b/src/main/java/com/ai/da/common/response/TransactionPageResponse.java index 25200d49..3d68e57f 100644 --- a/src/main/java/com/ai/da/common/response/TransactionPageResponse.java +++ b/src/main/java/com/ai/da/common/response/TransactionPageResponse.java @@ -1,6 +1,6 @@ package com.ai.da.common.response; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @@ -8,7 +8,7 @@ import java.math.BigDecimal; @Data @NoArgsConstructor -@ApiModel("交易记录分页响应结果") +@Schema(description = "交易记录分页响应结果") public class TransactionPageResponse extends PageBaseResponse { private BigDecimal totalAmount; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/APIGenerate.java b/src/main/java/com/ai/da/mapper/primary/entity/APIGenerate.java index 282c686c..c299b5ed 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/APIGenerate.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/APIGenerate.java @@ -1,14 +1,14 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data @TableName("t_api_generate") -@ApiModel("调用第三方api的所有记录") +@Schema(description = "调用第三方api的所有记录") public class APIGenerate extends BaseEntity{ // 用户id private Long accountId; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Account.java b/src/main/java/com/ai/da/mapper/primary/entity/Account.java index 5a39c197..940aa7f0 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Account.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Account.java @@ -1,10 +1,10 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -132,13 +132,13 @@ public class Account implements Serializable { private String invitationCode; - @ApiModelProperty("title") + @Schema(description = "title") private String title; - @ApiModelProperty("surname") + @Schema(description = "surname") private String surname; - @ApiModelProperty("givenName") + @Schema(description = "givenName") private String givenName; private Long subscriptionPlanId; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Canvas.java b/src/main/java/com/ai/da/mapper/primary/entity/Canvas.java index d33d7e6f..1b50935b 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Canvas.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Canvas.java @@ -1,9 +1,9 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -27,16 +27,16 @@ public class Canvas implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty("url") + @Schema(description = "url") private String url; - @ApiModelProperty("accountId") + @Schema(description = "accountId") private Long accountId; - @ApiModelProperty("createTime") + @Schema(description = "createTime") private LocalDateTime createTime; } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ChatMessage.java b/src/main/java/com/ai/da/mapper/primary/entity/ChatMessage.java index 0d84e2dc..099ca909 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/ChatMessage.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ChatMessage.java @@ -1,9 +1,9 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -22,22 +22,22 @@ public class ChatMessage implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty("项目ID") + @Schema(description = "项目ID") private Long projectId; - @ApiModelProperty("角色system/user") + @Schema(description = "角色system/user") private String role; - @ApiModelProperty("排序") + @Schema(description = "排序") private Integer seq; - @ApiModelProperty("内容") + @Schema(description = "内容") private String content; - @ApiModelProperty("用户ID") + @Schema(description = "用户ID") private Long accountId; - @ApiModelProperty("0对话内容1颜色2图片") + @Schema(description = "0对话内容1颜色2图片") private Integer isImage; /** * 输入 @@ -56,6 +56,6 @@ public class ChatMessage implements Serializable { */ private String totalCost; - @ApiModelProperty("创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ChatRobot.java b/src/main/java/com/ai/da/mapper/primary/entity/ChatRobot.java index 31397ada..f4c68938 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/ChatRobot.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ChatRobot.java @@ -1,9 +1,9 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -20,7 +20,7 @@ public class ChatRobot implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Classification.java b/src/main/java/com/ai/da/mapper/primary/entity/Classification.java index b41a2b0f..e1e9be3b 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Classification.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Classification.java @@ -1,9 +1,9 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -18,22 +18,22 @@ import java.time.LocalDateTime; public class Classification implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "分类名称") + @Schema(description = "分类名称") private String classificationName; - @ApiModelProperty(value = "分类类型") + @Schema(description = "分类类型") private String type; - @ApiModelProperty(value = "父菜单ID") + @Schema(description = "父菜单ID") private Long parentId; - @ApiModelProperty(value = "用户ID") + @Schema(description = "用户ID") private Long userId; - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; - @ApiModelProperty(value = "是否删除1:是0:否") + @Schema(description = "是否删除1:是0:否") private Integer isDeleted = 0; } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ClassificationRelLibrary.java b/src/main/java/com/ai/da/mapper/primary/entity/ClassificationRelLibrary.java index 41649ab3..87f25c08 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/ClassificationRelLibrary.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ClassificationRelLibrary.java @@ -1,9 +1,9 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -18,20 +18,20 @@ import java.time.LocalDateTime; public class ClassificationRelLibrary implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "分类名称") + @Schema(description = "分类名称") private Long classificationId; - @ApiModelProperty(value = "分类名称") + @Schema(description = "分类名称") private Long libraryId; - @ApiModelProperty(value = "用户ID") + @Schema(description = "用户ID") private Long userId; - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; - @ApiModelProperty(value = "是否删除1:是0:否") + @Schema(description = "是否删除1:是0:否") private Integer isDeleted; } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/CloudTask.java b/src/main/java/com/ai/da/mapper/primary/entity/CloudTask.java index 5df0eba4..b065a702 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/CloudTask.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/CloudTask.java @@ -1,9 +1,9 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -19,52 +19,52 @@ import java.time.LocalDateTime; public class CloudTask implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty("任务名") + @Schema(description = "任务名") private String name; - @ApiModelProperty("项目ID") + @Schema(description = "项目ID") private Long projectId; - @ApiModelProperty("collectionId") + @Schema(description = "collectionId") private Long collectionId; - @ApiModelProperty("designId") + @Schema(description = "designId") private Long designId; - @ApiModelProperty("任务类型") + @Schema(description = "任务类型") private String buildType; - @ApiModelProperty("生成数量") + @Schema(description = "生成数量") private Integer nums; - @ApiModelProperty("完成数量") + @Schema(description = "完成数量") private Integer completedNum; - @ApiModelProperty("消耗积分") + @Schema(description = "消耗积分") private Integer costCredits; - @ApiModelProperty("状态1完成0未完成") + @Schema(description = "状态1完成0未完成") private Integer status; - @ApiModelProperty("批处理ID") + @Schema(description = "批处理ID") private String taskId; - @ApiModelProperty("创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; - @ApiModelProperty("任务开始时间") + @Schema(description = "任务开始时间") private LocalDateTime startTime; - @ApiModelProperty("任务更新时间") + @Schema(description = "任务更新时间") private LocalDateTime updateTime; - @ApiModelProperty("用户ID") + @Schema(description = "用户ID") private Long accountId; - @ApiModelProperty("任务序号") + @Schema(description = "任务序号") private Long sequence; } \ No newline at end of file diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java b/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java index 057a99ef..2b6178ae 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java @@ -3,50 +3,49 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; @Data -@ApiModel(value = "Portfolio对象", description = "作品集") +@Schema(description = "作品集") @TableName("portfolio") public class Portfolio implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "collection ID") + @Schema(description = "collection ID") private Long collectionId; private Long projectId; - @ApiModelProperty(value = "userLikeGroup源") + @Schema(description = "userLikeGroup源") private Long userLikeGroupSourceId; - @ApiModelProperty(value = "作品名称") + @Schema(description = "作品名称") private String portfolioName; - @ApiModelProperty(value = "作品描述") + @Schema(description = "作品描述") private String portfolioDes; - @ApiModelProperty(value = "作品类型") + @Schema(description = "作品类型") private String portfolioType; - @ApiModelProperty(value = "画布ID") + @Schema(description = "画布ID") private Long canvasId; - @ApiModelProperty(value = "封面ID") + @Schema(description = "封面ID") private Long coverId; - @ApiModelProperty(value = "作品状态1公开0隐藏") + @Schema(description = "作品状态1公开0隐藏") private Integer status; - @ApiModelProperty(value = "是否允许二次创作1允许0不允许") + @Schema(description = "是否允许二次创作1允许0不允许") private Integer openSource; private Integer original; @@ -57,7 +56,7 @@ public class Portfolio implements Serializable { private String snapshot; - @ApiModelProperty(value = "作品集作者ID") + @Schema(description = "作品集作者ID") private Long accountId; // 学校/企业id @@ -66,12 +65,12 @@ public class Portfolio implements Serializable { // 该条作品是否在该组织公开 默认公开 1（0为不公开） private Integer isPublic; - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createDate; - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateDate; - @ApiModelProperty(value = "是否删除") + @Schema(description = "是否删除") private Integer isDeleted; } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/TCollectionElementRelation.java b/src/main/java/com/ai/da/mapper/primary/entity/TCollectionElementRelation.java index dac90348..f3f43af9 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/TCollectionElementRelation.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/TCollectionElementRelation.java @@ -1,10 +1,9 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.*; import lombok.experimental.Accessors; +import io.swagger.v3.oas.annotations.media.Schema; import java.io.Serializable; import java.util.Date; @@ -25,22 +24,22 @@ import java.util.Date; @Setter @Accessors(chain = true) @TableName("t_collection_element_relation") -@ApiModel(value = "TCollectionElementRelation对象", description = "collection和element的关联表") +@Schema(description = "collection和element的关联表") public class TCollectionElementRelation implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty("element ID") + @Schema(description = "element ID") private Long elementId; - @ApiModelProperty("colletion ID class类型为COLLECTION 存 其他默认是0") + @Schema(description = "colletion ID class类型为COLLECTION 存 其他默认是0") private Long collectionId; - @ApiModelProperty("创建时间") + @Schema(description = "创建时间") private Date createDate; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfit.java b/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfit.java index 3d8f2679..575d061b 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfit.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfit.java @@ -2,6 +2,7 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; @@ -9,9 +10,6 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - /** * design item表 存对应design的8张图片实体类 * @@ -20,7 +18,7 @@ import io.swagger.annotations.ApiModelProperty; */ @Data @TableName("t_design_python_outfit") -@ApiModel(value = "TDesignPythonOutfit对象", description = "design item表 存对应design的8张图片") +@Schema(description = "design item表 存对应design的8张图片") public class TDesignPythonOutfit implements Serializable { private static final long serialVersionUID = 1L; @@ -28,48 +26,48 @@ public class TDesignPythonOutfit implements Serializable { /** * ID */ - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * designItemId */ - @ApiModelProperty(value = "designItemId") + @Schema(description = "designItemId") private Long designItemId; /** * 关联的design ID */ - @ApiModelProperty(value = "关联的design ID") + @Schema(description = "关联的design ID") private Long designId; /** * 关联的collection ID */ - @ApiModelProperty(value = "关联的collection ID") + @Schema(description = "关联的collection ID") private Long collectionId; /** * design后的用户文件地址(python 返回) */ - @ApiModelProperty(value = "design后的用户文件地址(python 返回)") + @Schema(description = "design后的用户文件地址(python 返回)") private String designUrl; /** * 保存用户ID */ - @ApiModelProperty(value = "保存用户ID") + @Schema(description = "保存用户ID") private Long userId; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createDate; /** * 更新时间 */ - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateDate; /** * 是否删除 */ - @ApiModelProperty(value = "是否删除") + @Schema(description = "是否删除") private String isDeleted; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfitDetail.java b/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfitDetail.java index acc72673..864598eb 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfitDetail.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/TDesignPythonOutfitDetail.java @@ -2,6 +2,7 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; @@ -9,9 +10,6 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - /** * design item详情表实体类 * @@ -20,7 +18,7 @@ import io.swagger.annotations.ApiModelProperty; */ @Data @TableName("t_design_python_outfit_detail") -@ApiModel(value = "TDesignPythonOutfitDetail对象", description = "design item详情表") +@Schema(description = "design item详情表") public class TDesignPythonOutfitDetail implements Serializable { private static final long serialVersionUID = 1L; @@ -28,84 +26,84 @@ public class TDesignPythonOutfitDetail implements Serializable { /** * ID */ - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 关联的design ID */ - @ApiModelProperty(value = "关联的design ID") + @Schema(description = "关联的design ID") private Long designId; /** * 关联的design_item ID */ - @ApiModelProperty(value = "关联的design_item ID") + @Schema(description = "关联的design_item ID") private Long designPythonOutfitId; /** * 关联的elementId 没有为null */ - @ApiModelProperty(value = "关联的elementId 没有为null") + @Schema(description = "关联的elementId 没有为null") private Long collectionElementId; /** * 图层 */ - @ApiModelProperty(value = "图层") + @Schema(description = "图层") private String imageCategory; /** * imageSize */ - @ApiModelProperty(value = "imageSize") + @Schema(description = "imageSize") private String imageSize; /** * 对应的图片的绝对路径 */ - @ApiModelProperty(value = "对应的图片的绝对路径") + @Schema(description = "对应的图片的绝对路径") private String imageUrl; /** * mask_url */ - @ApiModelProperty(value = "mask_url") + @Schema(description = "mask_url") private String maskUrl; /** * 位置 */ - @ApiModelProperty(value = "位置") + @Schema(description = "位置") private String position; /** * 偏移量 */ - @ApiModelProperty(value = "偏移量") + @Schema(description = "偏移量") private String offset; /** * 图层缩放大小 */ - @ApiModelProperty(value = "图层缩放大小") + @Schema(description = "图层缩放大小") private String scale; /** * 用户ID */ - @ApiModelProperty(value = "用户ID") + @Schema(description = "用户ID") private Long userId; /** * 图层优先级 */ - @ApiModelProperty(value = "图层优先级") + @Schema(description = "图层优先级") private Integer priority; /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createDate; /** * 更新时间 */ - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateDate; /** * 是否删除 */ - @ApiModelProperty(value = "是否删除") + @Schema(description = "是否删除") private Integer isDeleted; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java b/src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java index 6efe5545..af81cf76 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java @@ -1,8 +1,8 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -12,22 +12,22 @@ import java.time.LocalDateTime; public class ToProductElement implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "userLikeGroupId") + @Schema(description = "userLikeGroupId") private Long userLikeGroupId; - @ApiModelProperty(value = "项目id") + @Schema(description = "项目id") private Long projectId; - @ApiModelProperty(value = "url") + @Schema(description = "url") private String url; - @ApiModelProperty(value = "首尾帧 first | last") + @Schema(description = "首尾帧 first | last") private String frameType; - @ApiModelProperty(value = "createTime") + @Schema(description = "createTime") private LocalDateTime createTime; } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageRecord.java b/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageRecord.java index c2d3cd17..ec640826 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageRecord.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageRecord.java @@ -1,8 +1,8 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -12,18 +12,18 @@ import java.time.LocalDateTime; public class ToProductImageRecord implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "userLikeGroupId") + @Schema(description = "userLikeGroupId") private Long userLikeGroupId; private Long projectId; - @ApiModelProperty(value = "prompt") + @Schema(description = "prompt") private String prompt; - @ApiModelProperty(value = "createTime") + @Schema(description = "createTime") private LocalDateTime createTime; } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java b/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java index cbe44957..056c679b 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java @@ -1,9 +1,9 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -14,11 +14,11 @@ import java.time.LocalDateTime; public class ToProductImageResult implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "elementId") + @Schema(description = "elementId") private Long elementId; /** @@ -26,28 +26,28 @@ public class ToProductImageResult implements Serializable { * ProductElement 上传的图片 * ToProductImage 以to product image的结果作为图片来源(relight) */ - @ApiModelProperty(value = "elementType 图片来源：DesignOutfit(design的结果) | ProductElement(上传的图片) | ToProductImage(生成的结果)") + @Schema(description = "elementType 图片来源：DesignOutfit(design的结果) | ProductElement(上传的图片) | ToProductImage(生成的结果)") private String elementType; - @ApiModelProperty(value = "url") + @Schema(description = "url") private String url; - @ApiModelProperty(value = "isLike 1是0否") + @Schema(description = "isLike 1是0否") private Integer isLike; - @ApiModelProperty(value = "createTime") + @Schema(description = "createTime") private LocalDateTime createTime; - @ApiModelProperty(value = "toProductImageRecordId") + @Schema(description = "toProductImageRecordId") private Long toProductImageRecordId; - @ApiModelProperty(value = "taskId") + @Schema(description = "taskId") private String taskId; - @ApiModelProperty(value = "userLikeGroupId") + @Schema(description = "userLikeGroupId") private Long userLikeGroupId; - @ApiModelProperty(value = "generate 结果类型") + @Schema(description = "generate 结果类型") private String resultType; private Double brightenValue; @@ -64,7 +64,7 @@ public class ToProductImageResult implements Serializable { private String status; - @ApiModelProperty(value = "是否删除1:是 0:否") + @Schema(description = "是否删除1:是 0:否") @TableField private byte isDeleted = 0; } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java b/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java index ea7a9118..88032f01 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java @@ -1,10 +1,10 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -26,25 +26,25 @@ public class TrialOrder implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty("title") + @Schema(description = "title") private String title; - @ApiModelProperty("surname") + @Schema(description = "surname") private String surname; - @ApiModelProperty("givenName") + @Schema(description = "givenName") private String givenName; - @ApiModelProperty("userName") + @Schema(description = "userName") private String userName; - @ApiModelProperty("email") + @Schema(description = "email") private String email; - @ApiModelProperty("country") + @Schema(description = "country") private String country; - @ApiModelProperty("occupation") + @Schema(description = "occupation") private String occupation; /** diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java b/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java index b2b16d2b..9e2ee764 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Workspace.java @@ -7,8 +7,7 @@ import java.time.LocalDateTime; import java.io.Serializable; import lombok.Data; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * 实体类 @@ -17,7 +16,7 @@ import io.swagger.annotations.ApiModelProperty; * @since 2023-08-01 */ @Data -@ApiModel(value = "Workspace对象", description = "Workspace对象") +@Schema(description = "Workspace对象") @TableName("workspace") public class Workspace implements Serializable { @@ -26,23 +25,23 @@ public class Workspace implements Serializable { /** * ID */ - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 工作空间名称 */ - @ApiModelProperty(value = "工作空间名称") + @Schema(description = "工作空间名称") private String workSpaceName; /** * 用户名 */ - @ApiModelProperty(value = "用户名") + @Schema(description = "用户名") private String userName; /** * 用户ID */ - @ApiModelProperty(value = "用户ID") + @Schema(description = "用户ID") private Long accountId; /** * 年龄段 Adult || Child @@ -51,54 +50,54 @@ public class Workspace implements Serializable { /** * 性别 */ - @ApiModelProperty(value = "性别") + @Schema(description = "性别") private String sex; /** * 服装部位 */ - @ApiModelProperty(value = "服装部位") + @Schema(description = "服装部位") private String position; /** * SYSTEM_DESIGNER占比 */ - @ApiModelProperty(value = "SYSTEM_DESIGNER占比") + @Schema(description = "SYSTEM_DESIGNER占比") private Integer systemDesignerPercentage; /** * 人体模型 */ - @ApiModelProperty(value = "人体模型ID") + @Schema(description = "人体模型ID") private Long mannequinFemaleId; private Long mannequinMaleId; private Long mannequinChildId; /** * 人体模型 */ - @ApiModelProperty(value = "人体模型类型") + @Schema(description = "人体模型类型") private String mannequinFemaleType; private String mannequinMaleType; private String mannequinChildType; /** * 最后使用的工作空间标识 */ - @ApiModelProperty(value = "最后使用的工作空间标识") + @Schema(description = "最后使用的工作空间标识") private Integer isLastIndex; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ @TableField(fill = FieldFill.INSERT_UPDATE) - @ApiModelProperty(value = "更新时间") + @Schema(description = "更新时间") private LocalDateTime updateTime; /** * 是否删除 */ @TableLogic - @ApiModelProperty(value = "是否删除") + @Schema(description = "是否删除") private Integer isDeleted; private Long projectId; diff --git a/src/main/java/com/ai/da/model/dto/AccountAddDTO.java b/src/main/java/com/ai/da/model/dto/AccountAddDTO.java index c7d3d4e9..fa2bcfaa 100644 --- a/src/main/java/com/ai/da/model/dto/AccountAddDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountAddDTO.java @@ -1,7 +1,7 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -10,42 +10,42 @@ import jakarta.validation.constraints.NotBlank; import java.math.BigDecimal; @Data -@ApiModel("AccountAddDTO") +@Schema(description = "AccountAddDTO") @NoArgsConstructor @AllArgsConstructor public class AccountAddDTO { @NotBlank(message = "email.cannot.be.empty") - @ApiModelProperty("userEmail") + @Schema(description = "userEmail") private String userEmail; @NotBlank(message = "userName.cannot.be.empty") - @ApiModelProperty("userName") + @Schema(description = "userName") private String userName; private String country; @NotBlank(message = "validStartTime.cannot.be.empty") - @ApiModelProperty("Start time of account validity ") + @Schema(description = "Start time of account validity ") private String validStartTime; @NotBlank(message = "validEndTime.cannot.be.empty") - @ApiModelProperty("End time of account validity ") + @Schema(description = "End time of account validity ") private String validEndTime; - @ApiModelProperty("是否是试用用户 0 否 | 1 是") + @Schema(description = "是否是试用用户 0 否 | 1 是") private Integer isTrial; - @ApiModelProperty("分配积分") + @Schema(description = "分配积分") private BigDecimal credits; - @ApiModelProperty("用户角色") + @Schema(description = "用户角色") private Integer systemUser; - @ApiModelProperty("学校名称 | 企业名称") + @Schema(description = "学校名称 | 企业名称") private String organizationName; - @ApiModelProperty("可分配子账号总数（仅适用于学校或教育管理员）") + @Schema(description = "可分配子账号总数（仅适用于学校或教育管理员）") private Integer subAccountNum; public AccountAddDTO(String userEmail, String userName, String country, String validStartTime, String validEndTime, Integer isTrial, BigDecimal credits, Integer systemUser) { diff --git a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java index 182dad3d..29f56f27 100644 --- a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java @@ -1,39 +1,39 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import jakarta.validation.constraints.NotBlank; @Data -@ApiModel("绑定邮箱") +@Schema(description = "绑定邮箱") public class AccountBindEmailDTO { // @NotNull(message = "userId.cannot.be.empty") -// @ApiModelProperty("用户id") +// @Schema(description = "用户id") // private Long userId; @NotBlank(message = "email.cannot.be.empty") - @ApiModelProperty("邮箱") + @Schema(description = "邮箱") private String userEmail; @NotBlank(message = "emailVerifyCode.cannot.be.empty") - @ApiModelProperty("邮箱验证码") + @Schema(description = "邮箱验证码") private String emailVerifyCode; -// @ApiModelProperty("国家") +// @Schema(description = "国家") // private String country; // -// @ApiModelProperty("职业") +// @Schema(description = "职业") // private String occupation; // -// @ApiModelProperty("title") +// @Schema(description = "title") // private String title; // -// @ApiModelProperty("surname") +// @Schema(description = "surname") // private String surname; // -// @ApiModelProperty("givenName") +// @Schema(description = "givenName") // private String givenName; } diff --git a/src/main/java/com/ai/da/model/dto/AccountEditDTO.java b/src/main/java/com/ai/da/model/dto/AccountEditDTO.java index a603c16b..9c201cf9 100644 --- a/src/main/java/com/ai/da/model/dto/AccountEditDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountEditDTO.java @@ -1,35 +1,35 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; @Data -@ApiModel("AccountEdit") +@Schema(description = "AccountEdit") public class AccountEditDTO { - @ApiModelProperty("Old user email") + @Schema(description = "Old user email") private String oldEmail; - @ApiModelProperty("New user email") + @Schema(description = "New user email") private String newEmail; - @ApiModelProperty("Old user name") + @Schema(description = "Old user name") private String oldUserName; - @ApiModelProperty("New user name") + @Schema(description = "New user name") private String newUserName; - @ApiModelProperty("Start time of the new account validity period") + @Schema(description = "Start time of the new account validity period") private String newValidStartTime; - @ApiModelProperty("Start time of the old account validity period") + @Schema(description = "Start time of the old account validity period") private String oldValidStartTime; - @ApiModelProperty("End time of the new account validity period") + @Schema(description = "End time of the new account validity period") private String newValidEndTime; - @ApiModelProperty("End time of the old account validity period") + @Schema(description = "End time of the old account validity period") private String oldValidEndTime; } diff --git a/src/main/java/com/ai/da/model/dto/AccountLoginDTO.java b/src/main/java/com/ai/da/model/dto/AccountLoginDTO.java index 10ba1dde..a02c1434 100644 --- a/src/main/java/com/ai/da/model/dto/AccountLoginDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountLoginDTO.java @@ -1,32 +1,32 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; @Data -@ApiModel("登入") +@Schema(description = "登入") public class AccountLoginDTO { - @ApiModelProperty("userId") + @Schema(description = "userId") private Long userId; - @ApiModelProperty("邮箱") + @Schema(description = "邮箱") private String email; - @ApiModelProperty("用户名") + @Schema(description = "用户名") private String userName; - @ApiModelProperty("密码") + @Schema(description = "密码") private String password; - @ApiModelProperty("登入类型 EMAIL - >邮箱 , PASSWORD ->密码") + @Schema(description = "登入类型 EMAIL - >邮箱 , PASSWORD ->密码") private String loginType; - @ApiModelProperty("邮箱验证码") + @Schema(description = "邮箱验证码") private String emailVerifyCode; - @ApiModelProperty("组织名") + @Schema(description = "组织名") private String organizationName; } diff --git a/src/main/java/com/ai/da/model/dto/AccountLogoutDTO.java b/src/main/java/com/ai/da/model/dto/AccountLogoutDTO.java index 24608dab..c733f2a1 100644 --- a/src/main/java/com/ai/da/model/dto/AccountLogoutDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountLogoutDTO.java @@ -1,17 +1,17 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("登出") +@Schema(description = "登出") public class AccountLogoutDTO { @NotNull(message = "userId.cannot.be.empty") - @ApiModelProperty("userId") + @Schema(description = "userId") private Long userId; } diff --git a/src/main/java/com/ai/da/model/dto/AccountPreLoginDTO.java b/src/main/java/com/ai/da/model/dto/AccountPreLoginDTO.java index 515fd4f5..0c0636a0 100644 --- a/src/main/java/com/ai/da/model/dto/AccountPreLoginDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountPreLoginDTO.java @@ -1,32 +1,31 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @Data -@ApiModel("预先登入") +@Schema(description = "预先登入") public class AccountPreLoginDTO { @NotBlank(message = "userName.cannot.be.empty") - @ApiModelProperty("用户名") + @Schema(description = "用户名") private String userName; /*新增字段*/ @NotBlank(message = "email.cannot.be.empty") - @ApiModelProperty("邮箱") + @Schema(description = "邮箱") private String email; @NotBlank(message = "password.cannot.be.empty") - @ApiModelProperty("密码") + @Schema(description = "密码") private String password; @NotBlank(message = "operationType.cannot.be.empty") - @ApiModelProperty("操作类型 LOGIN 注册 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱") + @Schema(description = "操作类型 LOGIN 注册 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱") private String operationType; - @ApiModelProperty("异常ip") + @Schema(description = "异常ip") private String ip; } diff --git a/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java b/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java index 878fc63e..b7f3e79a 100644 --- a/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java @@ -1,26 +1,25 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @Data -@ApiModel("账户") +@Schema(description = "账户") public class AccountRegisterDTO { @NotBlank(message = "email.cannot.be.empty") - @ApiModelProperty("邮箱") + @Schema(description = "邮箱") private String email; private Boolean verifyEmail; // @NotBlank(message = "password.cannot.be.empty") - @ApiModelProperty("密码") + @Schema(description = "密码") private String password; @NotBlank(message = "emailVerifyCode.cannot.be.empty") - @ApiModelProperty("邮箱验证码") + @Schema(description = "邮箱验证码") private String emailVerifyCode; } diff --git a/src/main/java/com/ai/da/model/dto/AccountTrialDTO.java b/src/main/java/com/ai/da/model/dto/AccountTrialDTO.java index c4ef92a9..83da3e5c 100644 --- a/src/main/java/com/ai/da/model/dto/AccountTrialDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountTrialDTO.java @@ -1,13 +1,14 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.TrialOrder; -import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("AccountTrial") +@Schema(description = "AccountTrial") public class AccountTrialDTO extends TrialOrder { private String ref; } diff --git a/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java b/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java index 6194af4f..ca16b39a 100644 --- a/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java @@ -1,7 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,19 +8,19 @@ import jakarta.validation.constraints.Pattern; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("查询affiliate列表") +@Schema(description = "查询affiliate列表") public class AffiliateQueryDTO extends TimeQueryBaseDTO{ - @ApiModelProperty("Active（活跃） || Inactive（过期） || Pending（待审批） || Refused(拒绝)") + @Schema(description = "Active（活跃） || Inactive（过期） || Pending（待审批） || Refused(拒绝)") private String status; - @ApiModelProperty("推广者id") + @Schema(description = "推广者id") private Long affiliateId; @Pattern(regexp = "id|createTime|totalIncome|", message = "允许排序字段只有id|createTime|totalIncome") - @ApiModelProperty("目前允许按id, createTime, totalIncome进行排序") + @Schema(description = "目前允许按id, createTime, totalIncome进行排序") private String orderBy = "id"; - @ApiModelProperty("按时间 DESC 降序 || ASC 升序") + @Schema(description = "按时间 DESC 降序 || ASC 升序") private String order = "ASC"; @Override diff --git a/src/main/java/com/ai/da/model/dto/ChatFlushDTO.java b/src/main/java/com/ai/da/model/dto/ChatFlushDTO.java index 7a0d61e2..3348a478 100644 --- a/src/main/java/com/ai/da/model/dto/ChatFlushDTO.java +++ b/src/main/java/com/ai/da/model/dto/ChatFlushDTO.java @@ -1,6 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @@ -17,11 +17,11 @@ import jakarta.validation.constraints.NotNull; @Data public class ChatFlushDTO { @NotNull(message = "user_id.cannot.be.empty") - @ApiModelProperty("用户id") + @Schema(description = "用户id") private String user_id; @NotBlank(message = "session_id.cannot.be.empty") - @ApiModelProperty("会话ID") + @Schema(description = "会话ID") private String session_id; } diff --git a/src/main/java/com/ai/da/model/dto/ChatSendDTO.java b/src/main/java/com/ai/da/model/dto/ChatSendDTO.java index 384209cb..aae8d4b1 100644 --- a/src/main/java/com/ai/da/model/dto/ChatSendDTO.java +++ b/src/main/java/com/ai/da/model/dto/ChatSendDTO.java @@ -1,7 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @@ -16,23 +15,23 @@ import jakarta.validation.constraints.NotNull; */ @Data -@ApiModel("chatRobot 对话") +@Schema(description = "chatRobot 对话") public class ChatSendDTO { @NotNull(message = "userId.cannot.be.empty") - @ApiModelProperty("用户id") + @Schema(description = "用户id") private Long user_id; @NotBlank(message = "sessionId.cannot.be.empty") - @ApiModelProperty("会话ID") + @Schema(description = "会话ID") private String session_id; @NotBlank(message = "message.cannot.be.empty") - @ApiModelProperty("消息") + @Schema(description = "消息") private String message; @NotBlank(message = "gender.cannot.be.empty") - @ApiModelProperty("性别") + @Schema(description = "性别") private String gender; } diff --git a/src/main/java/com/ai/da/model/dto/ClassificationDTO.java b/src/main/java/com/ai/da/model/dto/ClassificationDTO.java index 8a24260c..b03cd0b0 100644 --- a/src/main/java/com/ai/da/model/dto/ClassificationDTO.java +++ b/src/main/java/com/ai/da/model/dto/ClassificationDTO.java @@ -1,7 +1,8 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.Classification; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,10 +13,10 @@ import java.util.List; public class ClassificationDTO extends Classification { private static final long serialVersionUID = 1L; - @ApiModelProperty("分类ID列表") + @Schema(description = "分类ID列表") private List classificationIdList; - @ApiModelProperty("LibraryID") + @Schema(description = "LibraryID") private List libraryIdList; - @ApiModelProperty("分类删除校验1：校验0：不校验") + @Schema(description = "分类删除校验1：校验0：不校验") private Integer deleteConfirm; } diff --git a/src/main/java/com/ai/da/model/dto/CloudTaskDTO.java b/src/main/java/com/ai/da/model/dto/CloudTaskDTO.java index 483cc856..f320edbe 100644 --- a/src/main/java/com/ai/da/model/dto/CloudTaskDTO.java +++ b/src/main/java/com/ai/da/model/dto/CloudTaskDTO.java @@ -1,16 +1,17 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.CloudTask; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data public class CloudTaskDTO extends CloudTask { - @ApiModelProperty("toProduct/relight入参") + @Schema(description = "toProduct/relight入参") private ToProductImageDTO toProductImage; - @ApiModelProperty("posetransfer入参") + @Schema(description = "posetransfer入参") private List poseTransform; diff --git a/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java b/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java index f7899f8e..d16a2201 100644 --- a/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java +++ b/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java @@ -1,27 +1,27 @@ -package com.ai.da.model.dto; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import com.ai.da.mapper.primary.entity.Gradient; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import jakarta.validation.constraints.NotBlank; @Data -@ApiModel("设计Collection颜色板 入参") +@Schema(description = "设计Collection颜色板 入参") public class CollectionColorDTO { - @ApiModelProperty("潘通id") + @Schema(description = "潘通id") private Integer id; - @ApiModelProperty("潘通名字") + @Schema(description = "潘通名字") private String name; - @ApiModelProperty("tcx值") + @Schema(description = "tcx值") private String tcx; @NotBlank(message = "rgbValue.cannot.be.empty") - @ApiModelProperty("潘通RGB值") + @Schema(description = "潘通RGB值") private String rgbValue; private Gradient gradient; diff --git a/src/main/java/com/ai/da/model/dto/CollectionDeleteFileDTO.java b/src/main/java/com/ai/da/model/dto/CollectionDeleteFileDTO.java index 34622277..f20647bb 100644 --- a/src/main/java/com/ai/da/model/dto/CollectionDeleteFileDTO.java +++ b/src/main/java/com/ai/da/model/dto/CollectionDeleteFileDTO.java @@ -1,16 +1,15 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("删除文件") +@Schema(description = "删除文件") public class CollectionDeleteFileDTO { @NotNull(message = "file id cannot be empty!") - @ApiModelProperty("文件id") + @Schema(description = "文件id") private Long id; } diff --git a/src/main/java/com/ai/da/model/dto/CollectionElementUploadDTO.java b/src/main/java/com/ai/da/model/dto/CollectionElementUploadDTO.java index 523f167a..66fca610 100644 --- a/src/main/java/com/ai/da/model/dto/CollectionElementUploadDTO.java +++ b/src/main/java/com/ai/da/model/dto/CollectionElementUploadDTO.java @@ -1,7 +1,6 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import org.springframework.web.multipart.MultipartFile; @@ -11,28 +10,28 @@ import jakarta.validation.constraints.NotNull; import java.util.Date; @Data -@ApiModel("文件上传") +@Schema(description = "文件上传") @AllArgsConstructor public class CollectionElementUploadDTO { @NotNull(message = "file.cannot.be.empty") private MultipartFile file; - @ApiModelProperty("项目id") + @Schema(description = "项目id") private Long projectId; - @ApiModelProperty("一级类型") + @Schema(description = "一级类型") private String level1Type; - @ApiModelProperty("二级类型") + @Schema(description = "二级类型") private String level2Type; - @ApiModelProperty("性别") + @Schema(description = "性别") private String gender; - @ApiModelProperty("时区") + @Schema(description = "时区") private String timeZone; - @ApiModelProperty("md5") + @Schema(description = "md5") private String md5; } diff --git a/src/main/java/com/ai/da/model/dto/CollectionGeneratePrintDTO.java b/src/main/java/com/ai/da/model/dto/CollectionGeneratePrintDTO.java index 9cb7ef96..e27dbb2a 100644 --- a/src/main/java/com/ai/da/model/dto/CollectionGeneratePrintDTO.java +++ b/src/main/java/com/ai/da/model/dto/CollectionGeneratePrintDTO.java @@ -1,25 +1,24 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("生成印花") +@Schema(description = "生成印花") public class CollectionGeneratePrintDTO { @NotNull(message = "select1Id.cannot.be.empty") - @ApiModelProperty("选择的第一个print文件id") + @Schema(description = "选择的第一个print文件id") private Long select1Id; @NotNull(message = "select2Id.cannot.be.empty") - @ApiModelProperty("选择的第一个print文件id") + @Schema(description = "选择的第一个print文件id") private Long select2Id; @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; } diff --git a/src/main/java/com/ai/da/model/dto/CollectionSavePrintDTO.java b/src/main/java/com/ai/da/model/dto/CollectionSavePrintDTO.java index a6c801d0..e54bc5cf 100644 --- a/src/main/java/com/ai/da/model/dto/CollectionSavePrintDTO.java +++ b/src/main/java/com/ai/da/model/dto/CollectionSavePrintDTO.java @@ -1,7 +1,6 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @@ -10,16 +9,16 @@ import jakarta.validation.constraints.Size; import java.util.List; @Data -@ApiModel("印花保存") +@Schema(description = "印花保存") public class CollectionSavePrintDTO { - @ApiModelProperty("生成的印花绝对路径") + @Schema(description = "生成的印花绝对路径") @Size(max = 15, message = "Save up to 15 prints at a time!") @NotEmpty(message = "printId.cannot.be.empty") private List printId; @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; } diff --git a/src/main/java/com/ai/da/model/dto/CollectionSketchDTO.java b/src/main/java/com/ai/da/model/dto/CollectionSketchDTO.java index 35b5c47d..b4c52f8c 100644 --- a/src/main/java/com/ai/da/model/dto/CollectionSketchDTO.java +++ b/src/main/java/com/ai/da/model/dto/CollectionSketchDTO.java @@ -1,29 +1,28 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("设计Collection Sketch 入参") +@Schema(description = "设计Collection Sketch 入参") public class CollectionSketchDTO { - @ApiModelProperty("sketchBoardId 元素id") + @Schema(description = "sketchBoardId 元素id") private Long sketchBoardId; @NotNull(message = "isPin.cannot.be.empty") - @ApiModelProperty("是否pin 1 pin 0 不pin") + @Schema(description = "是否pin 1 pin 0 不pin") private Byte isPin; @NotBlank(message = "level2Type.cannot.be.empty") - @ApiModelProperty("二级类型 Outwear Dress Blouse Skirt Trousers") + @Schema(description = "二级类型 Outwear Dress Blouse Skirt Trousers") private String level2Type; @NotBlank(message = "designType.cannot.be.empty") - @ApiModelProperty("design类型 用户design生成时候区别library和collection") + @Schema(description = "design类型 用户design生成时候区别library和collection") private String designType; } diff --git a/src/main/java/com/ai/da/model/dto/CollectionSortDTO.java b/src/main/java/com/ai/da/model/dto/CollectionSortDTO.java index 71138b17..ed3a735f 100644 --- a/src/main/java/com/ai/da/model/dto/CollectionSortDTO.java +++ b/src/main/java/com/ai/da/model/dto/CollectionSortDTO.java @@ -1,7 +1,8 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.CollectionSort; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -9,9 +10,9 @@ import java.util.List; @Data public class CollectionSortDTO{ - @ApiModelProperty("userLikeGroupId") + @Schema(description = "userLikeGroupId") private Long userLikeGroupId; - @ApiModelProperty("排序数组") + @Schema(description = "排序数组") List userLikeSortList; } diff --git a/src/main/java/com/ai/da/model/dto/CreateCouponDTO.java b/src/main/java/com/ai/da/model/dto/CreateCouponDTO.java index 438e8713..6467e9f9 100644 --- a/src/main/java/com/ai/da/model/dto/CreateCouponDTO.java +++ b/src/main/java/com/ai/da/model/dto/CreateCouponDTO.java @@ -1,26 +1,26 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotNull; @Data public class CreateCouponDTO { - @ApiModelProperty("折扣率") + @Schema(description = "折扣率") @NotNull(message = "Please set the percentOff") private Float percentOff; - @ApiModelProperty("佣金比例") + @Schema(description = "佣金比例") @NotNull(message = "Please set the commissionRate.") private Float commissionRate; - @ApiModelProperty("推广码到期时间 秒级时间戳") + @Schema(description = "推广码到期时间 秒级时间戳") private Long endTime; - @ApiModelProperty("推广码开始时间 秒级时间戳") + @Schema(description = "推广码开始时间 秒级时间戳") private Long startTime; - @ApiModelProperty("推广码最大使用次数") + @Schema(description = "推广码最大使用次数") private Long maxRedemptions; - @ApiModelProperty("合作者/机构名") + @Schema(description = "合作者/机构名") private String cooperator; - @ApiModelProperty("备注") + @Schema(description = "备注") private String remark; } diff --git a/src/main/java/com/ai/da/model/dto/DesignAttributeRetrievalDTO.java b/src/main/java/com/ai/da/model/dto/DesignAttributeRetrievalDTO.java index 77e61642..be0b5b45 100644 --- a/src/main/java/com/ai/da/model/dto/DesignAttributeRetrievalDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignAttributeRetrievalDTO.java @@ -1,19 +1,19 @@ -package com.ai.da.model.dto; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data -@ApiModel("DesignAttributeRetrievalDTO 入参") +@Schema(description = "DesignAttributeRetrievalDTO 入参") public class DesignAttributeRetrievalDTO { - @ApiModelProperty("library图片 数组") + @Schema(description = "library图片 数组") private List libraryUrls = Lists.newArrayList(); - @ApiModelProperty("sysFile图片 数组") + @Schema(description = "sysFile图片 数组") private List sysFileUrlS = Lists.newArrayList(); } diff --git a/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java b/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java index 38d120bb..d175c96c 100644 --- a/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java @@ -1,85 +1,84 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import java.math.BigDecimal; -import java.util.List; - -@Data -@ApiModel("设计Collection 入参") -public class DesignCollectionDTO { - - private Long projectId; - - private Long collectionId; - - @ApiModelProperty("情绪板图片 数组") - private List moodBoards; - - @ApiModelProperty("印花板图片 数组") - private List printBoards; - -// @NotEmpty(message = "colorBoards.cannot.be.empty") - @ApiModelProperty("颜色板RGB值 数组") - private List colorBoards; - - @ApiModelProperty("手稿板图片id 数组") - private List sketchBoards; - - @ApiModelProperty("模特 数组") - private List mannequins; - - @NotNull(message = "systemScale.cannot.be.empty") - @ApiModelProperty("系统取图比列") - private BigDecimal systemScale; - -// @NotNull(message = "templateId.cannot.be.empty") - @ApiModelProperty("模特ID") - private Long templateId; - -// @NotBlank(message = "modelType.cannot.be.empty") - @ApiModelProperty("模特类型:System,Library") - private String modelType; - - @NotBlank(message = "modelSex.cannot.be.empty") - @ApiModelProperty("模特性别") - private String modelSex; - - @ApiModelProperty("mood版本id 没有传null") - private String moodTemplateId; - - @NotBlank(message = "singleOverall.cannot.be.empty") - @ApiModelProperty("控制生成类型的参数，两个选项：outfit时候传 single , 另外一个传 overall") - private String singleOverall; - - @ApiModelProperty("single模式下的类别选择参数 选项有outwear,dress,blouse,skirt,trousers") - private String switchCategory; - - @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") - private String timeZone; - - @NotBlank(message = "processId.cannot.be.empty") - @ApiModelProperty("python端design进程ID") - private String processId; - - @ApiModelProperty("moodboard 位置信息") - private String moodboardPosition; - - @ApiModelProperty("获取结果标识数组") - private List requestIdList; - - @ApiModelProperty("design数量") - private Integer designNum; - - @ApiModelProperty("品牌ID") - private Long brandId; - - @ApiModelProperty("品牌占比") - private Double brandScale; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.List; + +@Data +@Schema(description = "设计Collection 入参") +public class DesignCollectionDTO { + + private Long projectId; + + private Long collectionId; + + @Schema(description = "情绪板图片 数组") + private List moodBoards; + + @Schema(description = "印花板图片 数组") + private List printBoards; + +// @NotEmpty(message = "colorBoards.cannot.be.empty") + @Schema(description = "颜色板RGB值 数组") + private List colorBoards; + + @Schema(description = "手稿板图片id 数组") + private List sketchBoards; + + @Schema(description = "模特 数组") + private List mannequins; + + @NotNull(message = "systemScale.cannot.be.empty") + @Schema(description = "系统取图比列") + private BigDecimal systemScale; + +// @NotNull(message = "templateId.cannot.be.empty") + @Schema(description = "模特ID") + private Long templateId; + +// @NotBlank(message = "modelType.cannot.be.empty") + @Schema(description = "模特类型:System,Library") + private String modelType; + + @NotBlank(message = "modelSex.cannot.be.empty") + @Schema(description = "模特性别") + private String modelSex; + + @Schema(description = "mood版本id 没有传null") + private String moodTemplateId; + + @NotBlank(message = "singleOverall.cannot.be.empty") + @Schema(description = "控制生成类型的参数，两个选项：outfit时候传 single , 另外一个传 overall") + private String singleOverall; + + @Schema(description = "single模式下的类别选择参数 选项有outwear,dress,blouse,skirt,trousers") + private String switchCategory; + + @NotBlank(message = "timeZone.cannot.be.empty") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + private String timeZone; + + @NotBlank(message = "processId.cannot.be.empty") + @Schema(description = "python端design进程ID") + private String processId; + + @Schema(description = "moodboard 位置信息") + private String moodboardPosition; + + @Schema(description = "获取结果标识数组") + private List requestIdList; + + @Schema(description = "design数量") + private Integer designNum; + + @Schema(description = "品牌ID") + private Long brandId; + + @Schema(description = "品牌占比") + private Double brandScale; + +} diff --git a/src/main/java/com/ai/da/model/dto/DesignCollectionElementDTO.java b/src/main/java/com/ai/da/model/dto/DesignCollectionElementDTO.java index 1e99a345..40314313 100644 --- a/src/main/java/com/ai/da/model/dto/DesignCollectionElementDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignCollectionElementDTO.java @@ -1,17 +1,16 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("设计Collection element other 入参") +@Schema(description = "设计Collection element other 入参") public class DesignCollectionElementDTO { - @ApiModelProperty("元素id") + @Schema(description = "元素id") private Long id; - @ApiModelProperty("design类型 用户design生成时候区别library和collection") + @Schema(description = "design类型 用户design生成时候区别library和collection") private String designType; } diff --git a/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java b/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java index 50d4f679..1c63b721 100644 --- a/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java @@ -1,22 +1,21 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("设计Collection element print 入参") +@Schema(description = "设计Collection element print 入参") public class DesignCollectionPrintElementDTO { - @ApiModelProperty("元素id") + @Schema(description = "元素id") private Long id; - @ApiModelProperty("design类型 用户design生成时候区别library和collection") + @Schema(description = "design类型 用户design生成时候区别library和collection") private String designType; private String level2Type; - @ApiModelProperty("是否pin 1 pin 0 不pin") + @Schema(description = "是否pin 1 pin 0 不pin") private Byte isPin; } diff --git a/src/main/java/com/ai/da/model/dto/DesignLikeDTO.java b/src/main/java/com/ai/da/model/dto/DesignLikeDTO.java index dc0120c9..906cb40e 100644 --- a/src/main/java/com/ai/da/model/dto/DesignLikeDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignLikeDTO.java @@ -1,29 +1,28 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("Design like 入参") +@Schema(description = "Design like 入参") public class DesignLikeDTO { @NotNull(message = "designItemId.cannot.be.empty") - @ApiModelProperty("like图片对应的designItemId") + @Schema(description = "like图片对应的designItemId") private Long designItemId; @NotNull(message = "designPythonOutfitId.cannot.be.empty") - @ApiModelProperty("like图片对应的designItemId") + @Schema(description = "like图片对应的designItemId") private Long designPythonOutfitId; - @ApiModelProperty("like design到对应collection 对应的userGroupId,不传表示selected collection 为null") + @Schema(description = "like design到对应collection 对应的userGroupId,不传表示selected collection 为null") private Long userGroupId; @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; private Long projectId; diff --git a/src/main/java/com/ai/da/model/dto/DesignSingleDTO.java b/src/main/java/com/ai/da/model/dto/DesignSingleDTO.java index 4cea1ebe..7bda02c3 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleDTO.java @@ -1,38 +1,38 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import java.util.List; - -@Data -public class DesignSingleDTO { - - @ApiModelProperty("designItemId") - @NotNull(message = "designItemId.cannot.be.empty") - private Long designItemId; - - @ApiModelProperty("priority 数组,列表中包含服饰的顺序，越右边的表示越外层的衣服 例如[\"Outwear\", \"Dress\"]表示outwear在dress里面") - @NotEmpty(message = "priority.cannot.be.empty") - private List priority; - - @NotEmpty(message = "clothes.cannot.be.empty") - @ApiModelProperty("clothes 元素") - private List clothes; - - @ApiModelProperty("others 元素") - private List others; - - private DesignSingleItemDTO designSingleItem; - - @ApiModelProperty("preview -> true submit -> false") - private Boolean isPreview; - - @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") - private String timeZone; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.util.List; + +@Data +public class DesignSingleDTO { + + @Schema(description = "designItemId") + @NotNull(message = "designItemId.cannot.be.empty") + private Long designItemId; + + @Schema(description = "priority 数组,列表中包含服饰的顺序，越右边的表示越外层的衣服 例如[\"Outwear\", \"Dress\"]表示outwear在dress里面") + @NotEmpty(message = "priority.cannot.be.empty") + private List priority; + + @NotEmpty(message = "clothes.cannot.be.empty") + @Schema(description = "clothes 元素") + private List clothes; + + @Schema(description = "others 元素") + private List others; + + private DesignSingleItemDTO designSingleItem; + + @Schema(description = "preview -> true submit -> false") + private Boolean isPreview; + + @NotBlank(message = "timeZone.cannot.be.empty") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + private String timeZone; + +} diff --git a/src/main/java/com/ai/da/model/dto/DesignSingleIncludeLayersDTO.java b/src/main/java/com/ai/da/model/dto/DesignSingleIncludeLayersDTO.java index eb659985..c5d5d7d9 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleIncludeLayersDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleIncludeLayersDTO.java @@ -1,6 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @@ -11,36 +11,36 @@ import java.util.List; @Data public class DesignSingleIncludeLayersDTO implements Serializable { - @ApiModelProperty("designItemId") + @Schema(description = "designItemId") @NotNull(message = "designItemId.cannot.be.empty") private Long designItemId; @NotNull - @ApiModelProperty("designSingleItemDTOList") + @Schema(description = "designSingleItemDTOList") private List designSingleItemDTOList; @NotNull(message = "isPreview.cannot.be.empty") - @ApiModelProperty("preview -> true submit -> false") + @Schema(description = "preview -> true submit -> false") private Boolean isPreview; @NotNull(message = "processId.cannot.be.empty") - @ApiModelProperty("进度") + @Schema(description = "进度") private String processId; - @ApiModelProperty("性别") + @Schema(description = "性别") private String gender; @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; - @ApiModelProperty("模特id 每套衣服允许有一个单独的模特") + @Schema(description = "模特id 每套衣服允许有一个单独的模特") private Long modelId; - @ApiModelProperty("模特类型 System || Library") + @Schema(description = "模特类型 System || Library") private String modelType; - @ApiModelProperty("项目id") + @Schema(description = "项目id") private Long projectId; @Override diff --git a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java index 56a4350e..d94b4f08 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java @@ -1,69 +1,70 @@ -package com.ai.da.model.dto; - -import com.ai.da.mapper.primary.entity.Gradient; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -@Data -public class DesignSingleItemDTO implements Serializable { - - @NotNull(message = "id.cannot.be.empty") - @ApiModelProperty("切换图片对应的id") - private Long id; - - @NotEmpty(message = "changed cannot be empty") - @ApiModelProperty("当前服装的id是否被添加随机数") - private Boolean changed; - - @NotBlank(message = "designType cannot be empty") - @ApiModelProperty("当前图片来源于用户上传还是从library选择 Collection/Library") - private String designType; - - @NotBlank(message = "type.cannot.be.empty") - @ApiModelProperty("生成item实际对应的类型 有:Outwear,Dress,Blouse,Skirt,Trousers Shoes Hairstyle Earring") - private String type; - - @ApiModelProperty("对应的图片的minIO路径") - private String path; - - @ApiModelProperty("颜色 存 RGB值 中间空格分隔 比如 \"58 58 169\"") - private String color; - - @ApiModelProperty("对应的print图片对象") -// private DesignPythonItemPrint printObject; - private DesignSinglePrintDTO printObject; - - @ApiModelProperty("图层位置") - private List offset; - - @ApiModelProperty("图层缩放比例") - private Float[] scale; - - @NotNull(message = "priority.cannot.be.empty") - @ApiModelProperty("图层优先级") - private Integer priority; - - @ApiModelProperty("渐变 颜色") - private Gradient gradient; - - @ApiModelProperty("画笔修改过的sketch图片的base64格式的数据") - private String sketchString; - - @ApiModelProperty("衣服上的装饰") - private DesignSinglePrintDTO trims; - - @ApiModelProperty("标注后的mask 的base64") - private String maskUrl; - - @ApiModelProperty("mask 的minio地址") - private String maskMinioUrl; - - private PartialDesignDTO partialDesign; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import com.ai.da.mapper.primary.entity.Gradient; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +@Data +public class DesignSingleItemDTO implements Serializable { + + @NotNull(message = "id.cannot.be.empty") + @Schema(description = "切换图片对应的id") + private Long id; + + @NotEmpty(message = "changed cannot be empty") + @Schema(description = "当前服装的id是否被添加随机数") + private Boolean changed; + + @NotBlank(message = "designType cannot be empty") + @Schema(description = "当前图片来源于用户上传还是从library选择 Collection/Library") + private String designType; + + @NotBlank(message = "type.cannot.be.empty") + @Schema(description = "生成item实际对应的类型 有:Outwear,Dress,Blouse,Skirt,Trousers Shoes Hairstyle Earring") + private String type; + + @Schema(description = "对应的图片的minIO路径") + private String path; + + @Schema(description = "颜色 存 RGB值 中间空格分隔 比如 \"58 58 169\"") + private String color; + + @Schema(description = "对应的print图片对象") +// private DesignPythonItemPrint printObject; + private DesignSinglePrintDTO printObject; + + @Schema(description = "图层位置") + private List offset; + + @Schema(description = "图层缩放比例") + private Float[] scale; + + @NotNull(message = "priority.cannot.be.empty") + @Schema(description = "图层优先级") + private Integer priority; + + @Schema(description = "渐变 颜色") + private Gradient gradient; + + @Schema(description = "画笔修改过的sketch图片的base64格式的数据") + private String sketchString; + + @Schema(description = "衣服上的装饰") + private DesignSinglePrintDTO trims; + + @Schema(description = "标注后的mask 的base64") + private String maskUrl; + + @Schema(description = "mask 的minio地址") + private String maskMinioUrl; + + private PartialDesignDTO partialDesign; + +} diff --git a/src/main/java/com/ai/da/model/dto/DesignSinglePrintDTO.java b/src/main/java/com/ai/da/model/dto/DesignSinglePrintDTO.java index db815161..9d108307 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSinglePrintDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSinglePrintDTO.java @@ -1,24 +1,24 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.model.vo.DesignSinglePrint; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.List; @Data -@ApiModel("design single 印花请求信息") +@Schema(description = "design single 印花请求信息") public class DesignSinglePrintDTO implements Serializable { -// @ApiModelProperty("印花url") +// @Schema(description = "印花url") // private String path; - /*@ApiModelProperty("single -> true,overall -> false") + /*@Schema(description = "single -> true,overall -> false") private Boolean ifSingle;*/ - @ApiModelProperty("印花详细") + @Schema(description = "印花详细") private List prints; public DesignSinglePrintDTO() { diff --git a/src/main/java/com/ai/da/model/dto/DisDesignLikeDTO.java b/src/main/java/com/ai/da/model/dto/DisDesignLikeDTO.java index 198c17d4..a7b87edb 100644 --- a/src/main/java/com/ai/da/model/dto/DisDesignLikeDTO.java +++ b/src/main/java/com/ai/da/model/dto/DisDesignLikeDTO.java @@ -1,28 +1,27 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("Design dislike 入参") +@Schema(description = "Design dislike 入参") public class DisDesignLikeDTO { @NotNull(message = "groupDetailId.cannot.be.empty") - @ApiModelProperty("dislike图片对应的分组详情id") + @Schema(description = "dislike图片对应的分组详情id") private Long groupDetailId; @NotNull(message = "designId.cannot.be.empty") - @ApiModelProperty("dislike图片到对应的designId中") + @Schema(description = "dislike图片到对应的designId中") private Long designId; @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; - @ApiModelProperty("项目ID") + @Schema(description = "项目ID") private Long projectId; } diff --git a/src/main/java/com/ai/da/model/dto/EditReferralDTO.java b/src/main/java/com/ai/da/model/dto/EditReferralDTO.java index c3c3f128..2422fbef 100644 --- a/src/main/java/com/ai/da/model/dto/EditReferralDTO.java +++ b/src/main/java/com/ai/da/model/dto/EditReferralDTO.java @@ -1,7 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotNull; @@ -9,16 +8,16 @@ import jakarta.validation.constraints.Pattern; import java.math.BigDecimal; @Data -@ApiModel +@Schema(description = "编辑推荐") public class EditReferralDTO { @NotNull(message = "referral id cannot be empty") - @ApiModelProperty("指定需要修改的referral的id") + @Schema(description = "指定需要修改的referral的id") private Long id; - @ApiModelProperty("修改佣金金额") + @Schema(description = "修改佣金金额") private BigDecimal commission; - @ApiModelProperty("referral状态 取值：Paid/Unpaid/Accept/Rejected") + @Schema(description = "referral状态 取值：Paid/Unpaid/Accept/Rejected") @Pattern(regexp = "Paid|Unpaid|Accept|Rejected", message = "状态必须是Paid/Unpaid/Accept/Rejected") private String status; } diff --git a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java index 9caf0b21..00456d5e 100644 --- a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java +++ b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java @@ -1,38 +1,37 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; - -@Data -@ApiModel("邮箱发送") -public class EmailSendDTO { - @ApiModelProperty("用户id") - private Long userId; - - @NotBlank(message = "email.cannot.be.empty") - @ApiModelProperty("邮箱") - private String email; - - @NotBlank(message = "operationType.cannot.be.empty") - @ApiModelProperty("操作类型 LOGIN 登录 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱 " + - "CHANGE_MAILBOX 更改邮箱 UPDATE_USERINFO 仅填写国家、职业（不发送邮件） REGISTER 注册") - private String operationType; - - @ApiModelProperty("异常ip") - private String ip; - - @ApiModelProperty("国家") - private String country; - - @ApiModelProperty("职业") - private String occupation; - - private String title; - private String surname; - private String givenName; - - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; + +@Data +@Schema(description = "邮箱发送") +public class EmailSendDTO { + @Schema(description = "用户id") + private Long userId; + + @NotBlank(message = "email.cannot.be.empty") + @Schema(description = "邮箱") + private String email; + + @NotBlank(message = "operationType.cannot.be.empty") + @Schema(description = "操作类型 LOGIN 登录 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱 " + + "CHANGE_MAILBOX 更改邮箱 UPDATE_USERINFO 仅填写国家、职业（不发送邮件） REGISTER 注册") + private String operationType; + + @Schema(description = "异常ip") + private String ip; + + @Schema(description = "国家") + private String country; + + @Schema(description = "职业") + private String occupation; + + private String title; + private String surname; + private String givenName; + + +} diff --git a/src/main/java/com/ai/da/model/dto/ExportSearchDTO.java b/src/main/java/com/ai/da/model/dto/ExportSearchDTO.java index cc6b4b52..7ee85202 100644 --- a/src/main/java/com/ai/da/model/dto/ExportSearchDTO.java +++ b/src/main/java/com/ai/da/model/dto/ExportSearchDTO.java @@ -1,18 +1,17 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("查询画布详细") +@Schema(description = "查询画布详细") public class ExportSearchDTO { // private Long userLikeGroupId; - @ApiModelProperty("画布文件id") + @Schema(description = "画布文件id") private Long id; - @ApiModelProperty("画布关联项目id") + @Schema(description = "画布关联项目id") private Long projectId; - @ApiModelProperty("画布所属模块。canvas | deReconstruction | designItemDetail") + @Schema(description = "画布所属模块。canvas | deReconstruction | designItemDetail") private String module; } diff --git a/src/main/java/com/ai/da/model/dto/GenerateHighDesignDTO.java b/src/main/java/com/ai/da/model/dto/GenerateHighDesignDTO.java index b9815e78..f940379e 100644 --- a/src/main/java/com/ai/da/model/dto/GenerateHighDesignDTO.java +++ b/src/main/java/com/ai/da/model/dto/GenerateHighDesignDTO.java @@ -1,21 +1,20 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("生成高级design 入参") +@Schema(description = "生成高级design 入参") public class GenerateHighDesignDTO { @NotNull(message = "designItemId.cannot.be.empty") - @ApiModelProperty("design的designItemId") + @Schema(description = "design的designItemId") private Long designItemId; @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; } diff --git a/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java b/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java index 74a745cc..8e2b2e99 100644 --- a/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java +++ b/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java @@ -1,34 +1,33 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("Generate like入参") +@Schema(description = "Generate like入参") public class GenerateLikeDTO { @NotNull(message = "generateDetailId.cannot.be.empty") - @ApiModelProperty("generateDetailId") + @Schema(description = "generateDetailId") private Long generateDetailId; @NotBlank(message = "level1Type.cannot.be.empty") - @ApiModelProperty("一级类型 Sketchboard Printboard") + @Schema(description = "一级类型 Sketchboard Printboard") private String level1Type; - @ApiModelProperty("当一级类型为Sketchboard时，二级类型 Outwear Dress Blouse Skirt Trousers；当一级类型为Printboard时，二级类型 Slogan Logo Pattern") + @Schema(description = "当一级类型为Sketchboard时，二级类型 Outwear Dress Blouse Skirt Trousers；当一级类型为Printboard时，二级类型 Slogan Logo Pattern") private String level2Type; - @ApiModelProperty("年龄段") + @Schema(description = "年龄段") private String ageGroup; - @ApiModelProperty("性别") + @Schema(description = "性别") private String gender; @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; } diff --git a/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java b/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java index 3b49a81e..6411a4ab 100644 --- a/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java +++ b/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java @@ -1,42 +1,41 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; -@ApiModel("修改imageToSketch提取出的sketch") +@Schema(description = "修改imageToSketch提取出的sketch") @Data public class GenerateModifyDTO { @NotBlank(message = "image cannot be empty") - @ApiModelProperty(value = "需要保存的图片的base64格式", required = true) + @Schema(description = "需要保存的图片的base64格式", required = true) private String base64; @NotBlank(message = "gender cannot be empty") - @ApiModelProperty(value = "sketch所属性别", required = true) + @Schema(description = "sketch所属性别", required = true) private String gender; @NotBlank(message = "category cannot be empty") - @ApiModelProperty(value = "sketch所属分类", required = true) + @Schema(description = "sketch所属分类", required = true) private String category; @NotNull(message = "id cannot be empty") - @ApiModelProperty(value = "原图id", required = true) + @Schema(description = "原图id", required = true) private Long originalId; @NotBlank(message = "original Id Source cannot be empty") - @ApiModelProperty(value = "原图id的来源 Library || Generate || Collection", required = true) + @Schema(description = "原图id的来源 Library || Generate || Collection", required = true) private String originalIdSource; @NotNull(message = "isOverride cannot be empty") - @ApiModelProperty("是否覆盖原图") + @Schema(description = "是否覆盖原图") private Boolean isOverride; @NotBlank(message = "type cannot be empty") - @ApiModelProperty("类型 Sketchboard || Printboard") + @Schema(description = "类型 Sketchboard || Printboard") @Pattern(regexp = "Sketchboard|Printboard", message = "type只能填入Sketchboard 或 Printboard") private String type; } diff --git a/src/main/java/com/ai/da/model/dto/GenerateThroughImageTextDTO.java b/src/main/java/com/ai/da/model/dto/GenerateThroughImageTextDTO.java index b344fadf..23919e81 100644 --- a/src/main/java/com/ai/da/model/dto/GenerateThroughImageTextDTO.java +++ b/src/main/java/com/ai/da/model/dto/GenerateThroughImageTextDTO.java @@ -1,64 +1,63 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("GenerateThroughImageTextDTO") +@Schema(description = "GenerateThroughImageTextDTO") public class GenerateThroughImageTextDTO { @NotNull(message = "userId cannot be empty") - @ApiModelProperty("用户id") + @Schema(description = "用户id") private Long userId; - @ApiModelProperty("caption | prompt") + @Schema(description = "caption | prompt") private String text; - @ApiModelProperty("图片在t_collection_element表中的id") + @Schema(description = "图片在t_collection_element表中的id") private Long collectionElementId; // todo 后续取消这个字段的传输，由后端自行判断相关参数是否有值 // @NotBlank(message = "you have to choose the generate type") - @ApiModelProperty("text image text-image") + @Schema(description = "text image text-image") private String generateType; - @ApiModelProperty("图片来源：update，从library中选择,从toProductImage结果中选择 collection || library || productImage") + @Schema(description = "图片来源：update，从library中选择,从toProductImage结果中选择 collection || library || productImage") private String designType; @NotBlank(message = "level1Type cannot be empty!") - @ApiModelProperty("Moodboard Printboard Sketchboard MarketingSketch") + @Schema(description = "Moodboard Printboard Sketchboard MarketingSketch") private String level1Type; - @ApiModelProperty("Outwear Dress Blouse Skirt Trousers || Logo Slogan Pattern") + @Schema(description = "Outwear Dress Blouse Skirt Trousers || Logo Slogan Pattern") private String level2Type; - @ApiModelProperty("性别") + @Schema(description = "性别") private String gender; - @ApiModelProperty("选择的模型名 high || fast || wx || fp") + @Schema(description = "选择的模型名 high || fast || wx || fp") private String modelName; @NotBlank(message = "timeZone cannot be empty!") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") private String timeZone; - @ApiModelProperty("唯一id，用于保持消息唯一性") + @Schema(description = "唯一id，用于保持消息唯一性") private String uniqueId; @NotNull(message = "Please check if the required fields are empty.(isTestUser)") - @ApiModelProperty("是否是测试用户") + @Schema(description = "是否是测试用户") private Boolean isTestUser; - @ApiModelProperty("页面上用户设计的slogan所截的图片") + @Schema(description = "页面上用户设计的slogan所截的图片") private String sloganBase64; - @ApiModelProperty("种子 取值范围 0~500") + @Schema(description = "种子 取值范围 0~500") private String seed; - @ApiModelProperty("年龄区间 Adult || Child") + @Schema(description = "年龄区间 Adult || Child") private String ageGroup = "Adult"; } diff --git a/src/main/java/com/ai/da/model/dto/GetFollowListDTO.java b/src/main/java/com/ai/da/model/dto/GetFollowListDTO.java index c2878ecb..ef45d2ef 100644 --- a/src/main/java/com/ai/da/model/dto/GetFollowListDTO.java +++ b/src/main/java/com/ai/da/model/dto/GetFollowListDTO.java @@ -1,19 +1,19 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + 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("按条件分页查询关注列表") +@Schema(description = "按条件分页查询关注列表") public class GetFollowListDTO extends PageQueryBaseVo { - @ApiModelProperty("查找指定用户名") + @Schema(description = "查找指定用户名") private String searchByName; - @ApiModelProperty("按关注时间排序 DESC 降序 || ASC 升序") + @Schema(description = "按关注时间排序 DESC 降序 || ASC 升序") private String order; } diff --git a/src/main/java/com/ai/da/model/dto/GetNotificationDTO.java b/src/main/java/com/ai/da/model/dto/GetNotificationDTO.java index a5ff536c..8940624f 100644 --- a/src/main/java/com/ai/da/model/dto/GetNotificationDTO.java +++ b/src/main/java/com/ai/da/model/dto/GetNotificationDTO.java @@ -1,16 +1,16 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + 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) -@ApiModel +@Schema(description = "获取通知") @Data public class GetNotificationDTO extends PageQueryBaseVo { - @ApiModelProperty("system/like/comment/follow/newPosted") + @Schema(description = "system/like/comment/follow/newPosted") private String type; } \ No newline at end of file diff --git a/src/main/java/com/ai/da/model/dto/GetRgbByHsvBatchDTO.java b/src/main/java/com/ai/da/model/dto/GetRgbByHsvBatchDTO.java index 35a0bc9d..54dc655f 100644 --- a/src/main/java/com/ai/da/model/dto/GetRgbByHsvBatchDTO.java +++ b/src/main/java/com/ai/da/model/dto/GetRgbByHsvBatchDTO.java @@ -1,22 +1,21 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotNull; - -@Data -@ApiModel("根据rgb数组批量获取潘通rgb") -public class GetRgbByHsvBatchDTO { - @NotNull(message = "h.cannot.be.empty") - @ApiModelProperty("h值") - private Integer h; - @NotNull(message = "s.cannot.be.empty") - @ApiModelProperty("s值") - private Integer s; - @NotNull(message = "v.cannot.be.empty") - @ApiModelProperty("v值") - private Integer v; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotNull; + +@Data +@Schema(description = "根据rgb数组批量获取潘通rgb") +public class GetRgbByHsvBatchDTO { + @NotNull(message = "h.cannot.be.empty") + @Schema(description = "h值") + private Integer h; + @NotNull(message = "s.cannot.be.empty") + @Schema(description = "s值") + private Integer s; + @NotNull(message = "v.cannot.be.empty") + @Schema(description = "v值") + private Integer v; + +} diff --git a/src/main/java/com/ai/da/model/dto/HistoryDeleteDTO.java b/src/main/java/com/ai/da/model/dto/HistoryDeleteDTO.java index 25bfef79..e3438aa8 100644 --- a/src/main/java/com/ai/da/model/dto/HistoryDeleteDTO.java +++ b/src/main/java/com/ai/da/model/dto/HistoryDeleteDTO.java @@ -1,17 +1,16 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotNull; - -@Data -@ApiModel("History删除") -public class HistoryDeleteDTO { - - @NotNull(message = "userGroupId.cannot.be.empty") - @ApiModelProperty("history 分组id") - private Long userGroupId; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotNull; + +@Data +@Schema(description = "History删除") +public class HistoryDeleteDTO { + + @NotNull(message = "userGroupId.cannot.be.empty") + @Schema(description = "history 分组id") + private Long userGroupId; + +} diff --git a/src/main/java/com/ai/da/model/dto/HistoryUpdateDTO.java b/src/main/java/com/ai/da/model/dto/HistoryUpdateDTO.java index 4f28114f..746d5a79 100644 --- a/src/main/java/com/ai/da/model/dto/HistoryUpdateDTO.java +++ b/src/main/java/com/ai/da/model/dto/HistoryUpdateDTO.java @@ -1,28 +1,26 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import org.springframework.web.bind.annotation.RequestParam; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -@Data -@ApiModel("History编辑") -public class HistoryUpdateDTO { - - @NotNull(message = "userGroupId.cannot.be.empty") - @ApiModelProperty("history 分组id") - private Long userGroupId; - - @NotBlank(message = "userGroupName.cannot.be.empty") - @ApiModelProperty("history 分组名称") - private String userGroupName; - - @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") - private String timeZone; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.web.bind.annotation.RequestParam; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +@Data +@Schema(description = "History编辑") +public class HistoryUpdateDTO { + + @NotNull(message = "userGroupId.cannot.be.empty") + @Schema(description = "history 分组id") + private Long userGroupId; + + @NotBlank(message = "userGroupName.cannot.be.empty") + @Schema(description = "history 分组名称") + private String userGroupName; + + @NotBlank(message = "timeZone.cannot.be.empty") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + private String timeZone; + +} diff --git a/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java b/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java index 85949622..ad86ee64 100644 --- a/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java +++ b/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java @@ -1,26 +1,25 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -@ApiModel("image to sketch") +@Schema(description = "image to sketch") @Data public class ImageToSketchDTO { - @ApiModelProperty("上传图片的collection_element_id") + @Schema(description = "上传图片的collection_element_id") private Long elementId; - @ApiModelProperty("sketch线条风格 1->粗， 2->中， 3->细，传数字，自定义风格时，传空 ") + @Schema(description = "sketch线条风格 1->粗， 2->中， 3->细，传数字，自定义风格时，传空 ") private String style; - @ApiModelProperty("自定义线条风格，上传图片的collection_element_id") + @Schema(description = "自定义线条风格，上传图片的collection_element_id") private Long styleImageId; - @ApiModelProperty("性别") + @Schema(description = "性别") private String gender; - @ApiModelProperty("模型名") + @Schema(description = "模型名") private String modelName; public ImageToSketchDTO() { diff --git a/src/main/java/com/ai/da/model/dto/LibraryDeleteDTO.java b/src/main/java/com/ai/da/model/dto/LibraryDeleteDTO.java index cf9e26be..8df96f0f 100644 --- a/src/main/java/com/ai/da/model/dto/LibraryDeleteDTO.java +++ b/src/main/java/com/ai/da/model/dto/LibraryDeleteDTO.java @@ -1,26 +1,25 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.Size; -import java.util.List; - -@Data -@ApiModel("Library删除") -public class LibraryDeleteDTO { - - - @NotEmpty(message = "libraryIds cannot be empty!") - @Size(max = 100, min = 1) - @ApiModelProperty("libraryId数组") - private List libraryIds; - - private Integer deleteModelConfirm; - - @NotEmpty(message = "timeZone.cannot.be.empty") - @ApiModelProperty("时区") - private String timeZone; -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; +import java.util.List; + +@Data +@Schema(description = "Library删除") +public class LibraryDeleteDTO { + + + @NotEmpty(message = "libraryIds cannot be empty!") + @Size(max = 100, min = 1) + @Schema(description = "libraryId数组") + private List libraryIds; + + private Integer deleteModelConfirm; + + @NotEmpty(message = "timeZone.cannot.be.empty") + @Schema(description = "时区") + private String timeZone; +} diff --git a/src/main/java/com/ai/da/model/dto/LibraryLevel2TypeUpdateDTO.java b/src/main/java/com/ai/da/model/dto/LibraryLevel2TypeUpdateDTO.java index 418889e3..13ad4403 100644 --- a/src/main/java/com/ai/da/model/dto/LibraryLevel2TypeUpdateDTO.java +++ b/src/main/java/com/ai/da/model/dto/LibraryLevel2TypeUpdateDTO.java @@ -1,7 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @@ -10,15 +9,15 @@ import jakarta.validation.constraints.Size; import java.util.List; @Data -@ApiModel("Library编辑") +@Schema(description = "Library编辑") public class LibraryLevel2TypeUpdateDTO { @NotEmpty(message = "libraryId cannot be empty!") - @ApiModelProperty("libraryId") + @Schema(description = "libraryId") private List libraryId; @NotBlank(message = "level2Type cannot be empty!") - @ApiModelProperty("level2Type") + @Schema(description = "level2Type") private String level2Type; } diff --git a/src/main/java/com/ai/da/model/dto/LibraryModelPointDTO.java b/src/main/java/com/ai/da/model/dto/LibraryModelPointDTO.java index 556b5063..650f19ec 100644 --- a/src/main/java/com/ai/da/model/dto/LibraryModelPointDTO.java +++ b/src/main/java/com/ai/da/model/dto/LibraryModelPointDTO.java @@ -1,72 +1,71 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-11-13 - */ -@ApiModel("template打点入参") -@Data -public class LibraryModelPointDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - @NotNull(message = "libraryId.cannot.be.empty") - @ApiModelProperty("libraryId") - private Long libraryId; - - private String modelType; - - private String modelSex; - - @ApiModelProperty("templateId") - private Long templateId; - - @NotEmpty(message = "shoulderLeft.cannot.be.empty") - @ApiModelProperty("左肩 数组传类似 [0.2, 0.2]") - private List shoulderLeft; - - @NotEmpty(message = "shoulderRight.cannot.be.empty") - @ApiModelProperty("右肩 数组传类似 [0.2, 0.2]") - private List shoulderRight; - - @NotEmpty(message = "waistbandLeft.cannot.be.empty") - @ApiModelProperty("左腰 数组传类似 [0.2, 0.2]") - private List waistbandLeft; - - @NotEmpty(message = "waistbandRight.cannot.be.empty") - @ApiModelProperty("右腰 数组传类似 [0.2, 0.2]") - private List waistbandRight; - - @NotEmpty(message = "handLeft.cannot.be.empty") - @ApiModelProperty("左手 数组传类似 [0.2, 0.2]") - private List handLeft; - - @NotEmpty(message = "handRight.cannot.be.empty") - @ApiModelProperty("右手 数组传类似 [0.2, 0.2]") - private List handRight; - - @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") - private String timeZone; - - @NotBlank(message = "model.path.cannot.be.empty") - @ApiModelProperty("模特路径") - private String modelPath; - - @ApiModelProperty("是否覆盖保存还是另存为 true -> 保存，false -> 另存为") - private Boolean isCovered; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-11-13 + */ +@Schema(description = "template打点入参") +@Data +public class LibraryModelPointDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "libraryId.cannot.be.empty") + @Schema(description = "libraryId") + private Long libraryId; + + private String modelType; + + private String modelSex; + + @Schema(description = "templateId") + private Long templateId; + + @NotEmpty(message = "shoulderLeft.cannot.be.empty") + @Schema(description = "左肩 数组传类似 [0.2, 0.2]") + private List shoulderLeft; + + @NotEmpty(message = "shoulderRight.cannot.be.empty") + @Schema(description = "右肩 数组传类似 [0.2, 0.2]") + private List shoulderRight; + + @NotEmpty(message = "waistbandLeft.cannot.be.empty") + @Schema(description = "左腰 数组传类似 [0.2, 0.2]") + private List waistbandLeft; + + @NotEmpty(message = "waistbandRight.cannot.be.empty") + @Schema(description = "右腰 数组传类似 [0.2, 0.2]") + private List waistbandRight; + + @NotEmpty(message = "handLeft.cannot.be.empty") + @Schema(description = "左手 数组传类似 [0.2, 0.2]") + private List handLeft; + + @NotEmpty(message = "handRight.cannot.be.empty") + @Schema(description = "右手 数组传类似 [0.2, 0.2]") + private List handRight; + + @NotBlank(message = "timeZone.cannot.be.empty") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + private String timeZone; + + @NotBlank(message = "model.path.cannot.be.empty") + @Schema(description = "模特路径") + private String modelPath; + + @Schema(description = "是否覆盖保存还是另存为 true -> 保存，false -> 另存为") + private Boolean isCovered; + +} diff --git a/src/main/java/com/ai/da/model/dto/LibraryUpdateDTO.java b/src/main/java/com/ai/da/model/dto/LibraryUpdateDTO.java index d73618f9..b54493cc 100644 --- a/src/main/java/com/ai/da/model/dto/LibraryUpdateDTO.java +++ b/src/main/java/com/ai/da/model/dto/LibraryUpdateDTO.java @@ -1,29 +1,28 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.Size; -import java.util.List; - -@Data -@ApiModel("Library编辑") -public class LibraryUpdateDTO { - - @NotEmpty(message = "libraryIds cannot be empty!") - @Size(max = 100, min = 1) - @ApiModelProperty("libraryId数组") - private List libraryIds; - - @NotBlank(message = "libraryName cannot be empty!") - @ApiModelProperty("library名字") - private String libraryName; - - @NotBlank(message = "timeZone cannot be empty!") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") - private String timeZone; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; +import java.util.List; + +@Data +@Schema(description = "Library编辑") +public class LibraryUpdateDTO { + + @NotEmpty(message = "libraryIds cannot be empty!") + @Size(max = 100, min = 1) + @Schema(description = "libraryId数组") + private List libraryIds; + + @NotBlank(message = "libraryName cannot be empty!") + @Schema(description = "library名字") + private String libraryName; + + @NotBlank(message = "timeZone cannot be empty!") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + private String timeZone; + +} diff --git a/src/main/java/com/ai/da/model/dto/LibraryUploadDTO.java b/src/main/java/com/ai/da/model/dto/LibraryUploadDTO.java index 5edeba30..df6257d5 100644 --- a/src/main/java/com/ai/da/model/dto/LibraryUploadDTO.java +++ b/src/main/java/com/ai/da/model/dto/LibraryUploadDTO.java @@ -1,7 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import org.springframework.web.multipart.MultipartFile; @@ -9,23 +8,23 @@ import org.springframework.web.multipart.MultipartFile; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("Library文件上传") +@Schema(description = "Library文件上传") @AllArgsConstructor public class LibraryUploadDTO { @NotNull(message = "file.cannot.be.empty") private MultipartFile file; - @ApiModelProperty("一级类型") + @Schema(description = "一级类型") private String level1Type; - @ApiModelProperty("二级类型") + @Schema(description = "二级类型") private String level2Type; - @ApiModelProperty("时区") + @Schema(description = "时区") private String timeZone; - @ApiModelProperty("md5") + @Schema(description = "md5") private String md5; /** * 图片高度,目前只争对 models类型 diff --git a/src/main/java/com/ai/da/model/dto/ModelsDotDTO.java b/src/main/java/com/ai/da/model/dto/ModelsDotDTO.java index 41f2a154..f3b86987 100644 --- a/src/main/java/com/ai/da/model/dto/ModelsDotDTO.java +++ b/src/main/java/com/ai/da/model/dto/ModelsDotDTO.java @@ -1,76 +1,75 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.web.multipart.MultipartFile; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -/** - * Attendance - * - * @author easy-generator - * @since 2022-11-19 - */ -@ApiModel("template 预览入参") -@Data -public class ModelsDotDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("libraryId 编辑时预览用") - private Long libraryId; - - @ApiModelProperty("templateId 编辑时预览用") - private Long templateId; - - @NotEmpty(message = "shoulderLeft.cannot.be.empty") - @ApiModelProperty("左肩 数组传类似 [0.2, 0.2]") - private List shoulderLeft; - - @NotEmpty(message = "shoulderRight.cannot.be.empty") - @ApiModelProperty("右肩 数组传类似 [0.2, 0.2]") - private List shoulderRight; - - @NotEmpty(message = "waistbandLeft.cannot.be.empty") - @ApiModelProperty("左腰 数组传类似 [0.2, 0.2]") - private List waistbandLeft; - - @NotEmpty(message = "waistbandRight.cannot.be.empty") - @ApiModelProperty("右腰 数组传类似 [0.2, 0.2]") - private List waistbandRight; - - @NotEmpty(message = "handLeft.cannot.be.empty") - @ApiModelProperty("左手 数组传类似 [0.2, 0.2]") - private List handLeft; - - @NotEmpty(message = "handRight.cannot.be.empty") - @ApiModelProperty("右手 数组传类似 [0.2, 0.2]") - private List handRight; - - @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") - private String timeZone; - /** - * 图片高度,目前只争对 models类型 - */ - private Integer high; - /** - * 图片宽度,目前只争对 models类型 - */ - private Integer width; - - /** - * templateUrl - */ - private String templateUrl; - - private String sex; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * Attendance + * + * @author easy-generator + * @since 2022-11-19 + */ +@Schema(description = "template 预览入参") +@Data +public class ModelsDotDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @Schema(description = "libraryId 编辑时预览用") + private Long libraryId; + + @Schema(description = "templateId 编辑时预览用") + private Long templateId; + + @NotEmpty(message = "shoulderLeft.cannot.be.empty") + @Schema(description = "左肩 数组传类似 [0.2, 0.2]") + private List shoulderLeft; + + @NotEmpty(message = "shoulderRight.cannot.be.empty") + @Schema(description = "右肩 数组传类似 [0.2, 0.2]") + private List shoulderRight; + + @NotEmpty(message = "waistbandLeft.cannot.be.empty") + @Schema(description = "左腰 数组传类似 [0.2, 0.2]") + private List waistbandLeft; + + @NotEmpty(message = "waistbandRight.cannot.be.empty") + @Schema(description = "右腰 数组传类似 [0.2, 0.2]") + private List waistbandRight; + + @NotEmpty(message = "handLeft.cannot.be.empty") + @Schema(description = "左手 数组传类似 [0.2, 0.2]") + private List handLeft; + + @NotEmpty(message = "handRight.cannot.be.empty") + @Schema(description = "右手 数组传类似 [0.2, 0.2]") + private List handRight; + + @NotBlank(message = "timeZone.cannot.be.empty") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + private String timeZone; + /** + * 图片高度,目前只争对 models类型 + */ + private Integer high; + /** + * 图片宽度,目前只争对 models类型 + */ + private Integer width; + + /** + * templateUrl + */ + private String templateUrl; + + private String sex; + +} diff --git a/src/main/java/com/ai/da/model/dto/ModifyModelProportionDTO.java b/src/main/java/com/ai/da/model/dto/ModifyModelProportionDTO.java index 6f08bd7d..b1e30e2f 100644 --- a/src/main/java/com/ai/da/model/dto/ModifyModelProportionDTO.java +++ b/src/main/java/com/ai/da/model/dto/ModifyModelProportionDTO.java @@ -1,36 +1,35 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("ModifyModelProportionDTO") +@Schema(description = "ModifyModelProportionDTO") public class ModifyModelProportionDTO { - @ApiModelProperty("模特id") + @Schema(description = "模特id") @NotNull(message = "model id cannot be empty") private Long id; - @ApiModelProperty("Library || System") + @Schema(description = "Library || System") @NotBlank(message = "model type cannot be empty") private String type; - @ApiModelProperty("top") + @Schema(description = "top") @NotNull(message = "top cannot be empty") private Integer top; - @ApiModelProperty("bottom") + @Schema(description = "bottom") @NotNull(message = "bottom cannot be empty") private Integer bottom; - @ApiModelProperty("stretch") + @Schema(description = "stretch") @NotNull(message = "stretch cannot be empty") private Float stretch; - @ApiModelProperty("模特minio地址") + @Schema(description = "模特minio地址") @NotBlank(message = "modelPath type cannot be empty") private String modelPath; diff --git a/src/main/java/com/ai/da/model/dto/ModuleSaveDTO.java b/src/main/java/com/ai/da/model/dto/ModuleSaveDTO.java index 8251217a..bf5c48ec 100644 --- a/src/main/java/com/ai/da/model/dto/ModuleSaveDTO.java +++ b/src/main/java/com/ai/da/model/dto/ModuleSaveDTO.java @@ -4,7 +4,7 @@ import com.ai.da.mapper.primary.entity.Library; import com.ai.da.model.vo.CollectionColorVO; import com.ai.da.model.vo.CollectionElementVO; import com.ai.da.model.vo.MoodBoardModuleChooseVO; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -15,13 +15,13 @@ public class ModuleSaveDTO { private MoodBoardModuleSaveDTO moodBoard; - @ApiModelProperty("印花板图片 数组") + @Schema(description = "印花板图片 数组") private List printBoard; - @ApiModelProperty("颜色板RGB值 数组") + @Schema(description = "颜色板RGB值 数组") private List colorBoard; - @ApiModelProperty("手稿板图片id 数组") + @Schema(description = "手稿板图片id 数组") private List sketchBoard; private PatternMaking3DDTO patternMaking3D; diff --git a/src/main/java/com/ai/da/model/dto/MoodBoardModuleSaveDTO.java b/src/main/java/com/ai/da/model/dto/MoodBoardModuleSaveDTO.java index a81c9fbc..003ff4c9 100644 --- a/src/main/java/com/ai/da/model/dto/MoodBoardModuleSaveDTO.java +++ b/src/main/java/com/ai/da/model/dto/MoodBoardModuleSaveDTO.java @@ -1,6 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/ai/da/model/dto/NoteSendDTO.java b/src/main/java/com/ai/da/model/dto/NoteSendDTO.java index 3efb31b4..eec2588a 100644 --- a/src/main/java/com/ai/da/model/dto/NoteSendDTO.java +++ b/src/main/java/com/ai/da/model/dto/NoteSendDTO.java @@ -1,25 +1,24 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; - -@Data -@ApiModel("短信发送") -public class NoteSendDTO { - - @NotBlank(message = "regionNum.cannot.be.empty") - @ApiModelProperty("[区域/国家]号 示例如 852 香港 不支持中国") - private String regionNum; - - @NotBlank(message = "phone.cannot.be.empty") - @ApiModelProperty("手机号") - private String phone; - - @NotBlank(message = "operationType.cannot.be.empty") - @ApiModelProperty("操作类型 LOGIN 登入 FORGET_PWD 忘记密码") - private String operationType; - -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; + +@Data +@Schema(description = "短信发送") +public class NoteSendDTO { + + @NotBlank(message = "regionNum.cannot.be.empty") + @Schema(description = "[区域/国家]号 示例如 852 香港 不支持中国") + private String regionNum; + + @NotBlank(message = "phone.cannot.be.empty") + @Schema(description = "手机号") + private String phone; + + @NotBlank(message = "operationType.cannot.be.empty") + @Schema(description = "操作类型 LOGIN 登入 FORGET_PWD 忘记密码") + private String operationType; + +} diff --git a/src/main/java/com/ai/da/model/dto/PartialDesignDTO.java b/src/main/java/com/ai/da/model/dto/PartialDesignDTO.java index 5d7eff65..fdae97e4 100644 --- a/src/main/java/com/ai/da/model/dto/PartialDesignDTO.java +++ b/src/main/java/com/ai/da/model/dto/PartialDesignDTO.java @@ -1,6 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @@ -11,16 +11,16 @@ import java.util.List; @NoArgsConstructor public class PartialDesignDTO implements Serializable { - @ApiModelProperty("图片的minio地址") + @Schema(description = "图片的minio地址") private String partialDesignMinioPath; - @ApiModelProperty("图片网页访问地址") + @Schema(description = "图片网页访问地址") private String partialDesignPath; - @ApiModelProperty("图片的base64格式") + @Schema(description = "图片的base64格式") private String partialDesignBase64; - @ApiModelProperty("图层信息") + @Schema(description = "图层信息") private List layers; public PartialDesignDTO(String partialDesignMinioPath) { diff --git a/src/main/java/com/ai/da/model/dto/PortfolioDTO.java b/src/main/java/com/ai/da/model/dto/PortfolioDTO.java index a9437118..1cba5e61 100644 --- a/src/main/java/com/ai/da/model/dto/PortfolioDTO.java +++ b/src/main/java/com/ai/da/model/dto/PortfolioDTO.java @@ -1,7 +1,7 @@ package com.ai.da.model.dto; import com.ai.da.mapper.primary.entity.Portfolio; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -12,6 +12,6 @@ public class PortfolioDTO extends Portfolio { private List tagsDTO; - @ApiModelProperty("项目id") + @Schema(description = "项目id") private Long projectId; } diff --git a/src/main/java/com/ai/da/model/dto/PoseTransformDTO.java b/src/main/java/com/ai/da/model/dto/PoseTransformDTO.java index 153273aa..0445ea36 100644 --- a/src/main/java/com/ai/da/model/dto/PoseTransformDTO.java +++ b/src/main/java/com/ai/da/model/dto/PoseTransformDTO.java @@ -1,7 +1,7 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @@ -9,35 +9,35 @@ import jakarta.validation.constraints.NotNull; @Data public class PoseTransformDTO { - @ApiModelProperty("项目id") + @Schema(description = "项目id") private Long projectId; - @ApiModelProperty("图片的minio地址 | 首帧图片的minio地址") + @Schema(description = "图片的minio地址 | 首帧图片的minio地址") @NotBlank(message = "please select a product image") private String productImage; - @ApiModelProperty("尾帧图片的minio地址") + @Schema(description = "尾帧图片的minio地址") private String lastFrameProductImage; - @ApiModelProperty("pose的编号") + @Schema(description = "pose的编号") @NotNull(message = "please select a pose") private Integer poseId; - @ApiModelProperty("模型名") + @Schema(description = "模型名") private String modelName; - @ApiModelProperty("design结果在collectionSort中的id") + @Schema(description = "design结果在collectionSort中的id") private Long parentId; - @ApiModelProperty("子集中的元素作为父元素，用于重新排序") + @Schema(description = "子集中的元素作为父元素，用于重新排序") private Long userLikeSortId; - @ApiModelProperty("是否默认喜欢") + @Schema(description = "是否默认喜欢") private Boolean isDefaultLike; - @ApiModelProperty("动作描述") + @Schema(description = "动作描述") private String prompt; - @ApiModelProperty("生成模式 1.pose2video | 2.prompt2video | 3.FLFrame2video ") + @Schema(description = "生成模式 1.pose2video | 2.prompt2video | 3.FLFrame2video ") private Integer mode; } diff --git a/src/main/java/com/ai/da/model/dto/ProductPurchaseDTO.java b/src/main/java/com/ai/da/model/dto/ProductPurchaseDTO.java index d27d0037..179dea8a 100644 --- a/src/main/java/com/ai/da/model/dto/ProductPurchaseDTO.java +++ b/src/main/java/com/ai/da/model/dto/ProductPurchaseDTO.java @@ -1,36 +1,35 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @Data -@ApiModel("购买产品DTO") +@Schema(description = "购买产品DTO") public class ProductPurchaseDTO { - @ApiModelProperty("购买数量") + @Schema(description = "购买数量") private int quantity; // http://example.com @NotBlank(message = "return url cannot be empty") - @ApiModelProperty("购买完成后返回页面地址") + @Schema(description = "购买完成后返回页面地址") private String returnUrl; @NotBlank(message = "product name cannot be empty") - @ApiModelProperty("产品名 CreditsPurchase || Subscription") + @Schema(description = "产品名 CreditsPurchase || Subscription") private String productName; - @ApiModelProperty("EcoMonth || Month || Year") + @Schema(description = "EcoMonth || Month || Year") private String subscribeType; - @ApiModelProperty("是否自动续订 one_time || recurring") + @Schema(description = "是否自动续订 one_time || recurring") private Boolean autoRenewal; - @ApiModelProperty("使用Alipay-HK时需要选择 ALIPAYHK || ALIPAYCN") + @Schema(description = "使用Alipay-HK时需要选择 ALIPAYHK || ALIPAYCN") private String wallet; - @ApiModelProperty("优惠码") + @Schema(description = "优惠码") private String promotionCode; } diff --git a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java index 916c254c..01d8891d 100644 --- a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java @@ -1,10 +1,10 @@ - package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.Project; import com.ai.da.mapper.primary.entity.Workspace; import com.ai.da.model.vo.PageQueryBaseVo; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,21 +20,21 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) public class ProjectQueryDTO extends PageQueryBaseVo { - @ApiModelProperty("项目id") + @Schema(description = "项目id") private Long id; - @ApiModelProperty("项目名称") + @Schema(description = "项目名称") private String projectName; - @ApiModelProperty("开始时间 时间戳") + @Schema(description = "开始时间 时间戳") private Long startDate; - @ApiModelProperty("开始时间 时间戳") + @Schema(description = "开始时间 时间戳") private Long endDate; private List classificationIdList; - @ApiModelProperty("1交集2并集") + @Schema(description = "1交集2并集") private Integer intersection; // todo 获取历史列表，允许传入多个类型 diff --git a/src/main/java/com/ai/da/model/dto/PublishSysNotificationDTO.java b/src/main/java/com/ai/da/model/dto/PublishSysNotificationDTO.java index 11a0c56b..d1da2eeb 100644 --- a/src/main/java/com/ai/da/model/dto/PublishSysNotificationDTO.java +++ b/src/main/java/com/ai/da/model/dto/PublishSysNotificationDTO.java @@ -1,19 +1,18 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("发布系统消息") +@Schema(description = "发布系统消息") public class PublishSysNotificationDTO { - @ApiModelProperty("系统消息标题") + @Schema(description = "系统消息标题") private String title; - @ApiModelProperty("系统消息内容") + @Schema(description = "系统消息内容") private String content; - @ApiModelProperty("系统消息 活动链接") + @Schema(description = "系统消息 活动链接") private String link; } diff --git a/src/main/java/com/ai/da/model/dto/QueryCouponsPageDTO.java b/src/main/java/com/ai/da/model/dto/QueryCouponsPageDTO.java index 3d03dfe6..52d6bf27 100644 --- a/src/main/java/com/ai/da/model/dto/QueryCouponsPageDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryCouponsPageDTO.java @@ -1,22 +1,20 @@ package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel +@Schema(description = "查询优惠券分页") public class QueryCouponsPageDTO extends QueryPageByTimeDTO { - @ApiModelProperty("DESC(按id降序) || ASC(按id升序)") + @Schema(description = "DESC(按id降序) || ASC(按id升序)") private String orderById; - @ApiModelProperty("推广码") + @Schema(description = "推广码") private String promotionCode; - @ApiModelProperty("查询过期 || 未过期的优惠券") + @Schema(description = "查询过期 || 未过期的优惠券") private Boolean isExpired; - @ApiModelProperty("按合作者名字查询") + @Schema(description = "按合作者名字查询") private String cooperator; } diff --git a/src/main/java/com/ai/da/model/dto/QueryHistoryPageDTO.java b/src/main/java/com/ai/da/model/dto/QueryHistoryPageDTO.java index fbb89e76..3ff23bfb 100644 --- a/src/main/java/com/ai/da/model/dto/QueryHistoryPageDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryHistoryPageDTO.java @@ -1,27 +1,26 @@ -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 java.util.List; - -@Data -@ApiModel("History分页查询") -public class QueryHistoryPageDTO extends PageQueryBaseVo { - - @ApiModelProperty("collectionName") - private String collectionName; - - @ApiModelProperty("开始时间 时间戳") - private Long startDate; - - @ApiModelProperty("开始时间 时间戳") - private Long endDate; - - private List classificationIdList; - - @ApiModelProperty("1交集2并集") - private Integer intersection; -} +package com.ai.da.model.dto; + +import com.ai.da.model.vo.PageQueryBaseVo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Data +@Schema(description = "History分页查询") +public class QueryHistoryPageDTO extends PageQueryBaseVo { + + @Schema(description = "collectionName") + private String collectionName; + + @Schema(description = "开始时间 时间戳") + private Long startDate; + + @Schema(description = "开始时间 时间戳") + private Long endDate; + + private List classificationIdList; + + @Schema(description = "1交集2并集") + private Integer intersection; +} diff --git a/src/main/java/com/ai/da/model/dto/QueryIncomeOrExpenditureDTO.java b/src/main/java/com/ai/da/model/dto/QueryIncomeOrExpenditureDTO.java index 748d6108..f6c46637 100644 --- a/src/main/java/com/ai/da/model/dto/QueryIncomeOrExpenditureDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryIncomeOrExpenditureDTO.java @@ -1,12 +1,13 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("查积分的收支详情") +@Schema(description = "查积分的收支详情") public class QueryIncomeOrExpenditureDTO extends QueryPageByTimeDTO{ private Boolean isIncome; diff --git a/src/main/java/com/ai/da/model/dto/QueryLibraryPageDTO.java b/src/main/java/com/ai/da/model/dto/QueryLibraryPageDTO.java index 82617fb3..e3b6df1f 100644 --- a/src/main/java/com/ai/da/model/dto/QueryLibraryPageDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryLibraryPageDTO.java @@ -1,38 +1,37 @@ -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 jakarta.validation.constraints.NotBlank; -import java.util.List; - -@Data -@ApiModel("Library分页查询") -public class QueryLibraryPageDTO extends PageQueryBaseVo { - - @NotBlank(message = "level1Type.cannot.be.empty") - @ApiModelProperty("一级类型") - private String level1Type; - - @ApiModelProperty("二级类型") - private String level2Type; - - private String modelSex; - - @ApiModelProperty("pictureName") - private String pictureName; - - @ApiModelProperty("分类ID") - private List classificationIdList; - - @ApiModelProperty("交集还是并集：1交集2并集") - private Integer intersection; - - @ApiModelProperty("年龄段") - private String ageGroup; - - @ApiModelProperty("brandId") - private Long brandId; -} +package com.ai.da.model.dto; + +import com.ai.da.model.vo.PageQueryBaseVo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; +import java.util.List; + +@Data +@Schema(description = "Library分页查询") +public class QueryLibraryPageDTO extends PageQueryBaseVo { + + @NotBlank(message = "level1Type.cannot.be.empty") + @Schema(description = "一级类型") + private String level1Type; + + @Schema(description = "二级类型") + private String level2Type; + + private String modelSex; + + @Schema(description = "pictureName") + private String pictureName; + + @Schema(description = "分类ID") + private List classificationIdList; + + @Schema(description = "交集还是并集：1交集2并集") + private Integer intersection; + + @Schema(description = "年龄段") + private String ageGroup; + + @Schema(description = "brandId") + private Long brandId; +} diff --git a/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java b/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java index 3895eb98..c9d7a75d 100644 --- a/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java @@ -1,37 +1,36 @@ -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 java.util.List; - -@Data -@ApiModel("Library分页查询2") -public class QueryLibraryPageServiceDTO extends PageQueryBaseVo { - - @ApiModelProperty("一级类型") - private String level1Type; - - @ApiModelProperty("二级类型") - private String level2Type; - - private String modelSex; - - @ApiModelProperty("类型 Top , Bottom ,Print ") - private String type; - - @ApiModelProperty("pictureName") - private String pictureName; - - private List classificationIdList; - - @ApiModelProperty("1交集2并集") - private Integer intersection; - - private String ageGroup; - - private Long brandId; - -} +package com.ai.da.model.dto; + +import com.ai.da.model.vo.PageQueryBaseVo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Data +@Schema(description = "Library分页查询2") +public class QueryLibraryPageServiceDTO extends PageQueryBaseVo { + + @Schema(description = "一级类型") + private String level1Type; + + @Schema(description = "二级类型") + private String level2Type; + + private String modelSex; + + @Schema(description = "类型 Top , Bottom ,Print ") + private String type; + + @Schema(description = "pictureName") + private String pictureName; + + private List classificationIdList; + + @Schema(description = "1交集2并集") + private Integer intersection; + + private String ageGroup; + + private Long brandId; + +} diff --git a/src/main/java/com/ai/da/model/dto/QueryLibraryTopPageDTO.java b/src/main/java/com/ai/da/model/dto/QueryLibraryTopPageDTO.java index b4976cbb..cccf75a1 100644 --- a/src/main/java/com/ai/da/model/dto/QueryLibraryTopPageDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryLibraryTopPageDTO.java @@ -1,24 +1,23 @@ -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 jakarta.validation.constraints.NotBlank; - -@Data -@ApiModel("LibraryTop分页查询") -public class QueryLibraryTopPageDTO extends PageQueryBaseVo { - - @NotBlank(message = "type.cannot.be.empty") - @ApiModelProperty("类型 Top , Bottom ,Print ") - private String type; - - @ApiModelProperty("二级类型") - private String level2Type; - - @ApiModelProperty("pictureName") - private String pictureName; - -} +package com.ai.da.model.dto; + +import com.ai.da.model.vo.PageQueryBaseVo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; + +@Data +@Schema(description = "LibraryTop分页查询") +public class QueryLibraryTopPageDTO extends PageQueryBaseVo { + + @NotBlank(message = "type.cannot.be.empty") + @Schema(description = "类型 Top , Bottom ,Print ") + private String type; + + @Schema(description = "二级类型") + private String level2Type; + + @Schema(description = "pictureName") + private String pictureName; + +} diff --git a/src/main/java/com/ai/da/model/dto/QueryOrganizationPageDTO.java b/src/main/java/com/ai/da/model/dto/QueryOrganizationPageDTO.java index 8ec3d487..7f887399 100644 --- a/src/main/java/com/ai/da/model/dto/QueryOrganizationPageDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryOrganizationPageDTO.java @@ -1,19 +1,18 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel +@Schema(description = "查询组织分页") @NoArgsConstructor public class QueryOrganizationPageDTO extends QueryPageByTimeDTO{ - @ApiModelProperty("组织类型 Enterprise || Education") + @Schema(description = "组织类型 Enterprise || Education") private String type; - @ApiModelProperty("组织名字") + @Schema(description = "组织名字") private String name; public QueryOrganizationPageDTO(String type, String name) { diff --git a/src/main/java/com/ai/da/model/dto/QueryPageByTimeDTO.java b/src/main/java/com/ai/da/model/dto/QueryPageByTimeDTO.java index 669493eb..49c8c45e 100644 --- a/src/main/java/com/ai/da/model/dto/QueryPageByTimeDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryPageByTimeDTO.java @@ -1,22 +1,22 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + 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("分页查询，限制时间区间") +@Schema(description = "分页查询，限制时间区间") public class QueryPageByTimeDTO extends PageQueryBaseVo { - @ApiModelProperty("开始时间 yyyy-mm-dd hh:mm:ss 可以不要时分秒") + @Schema(description = "开始时间 yyyy-mm-dd hh:mm:ss 可以不要时分秒") private String startTime; - @ApiModelProperty("结束时间 yyyy-mm-dd hh:mm:ss 可以不要时分秒") + @Schema(description = "结束时间 yyyy-mm-dd hh:mm:ss 可以不要时分秒") private String endTime; - @ApiModelProperty("指定id") + @Schema(description = "指定id") private Long id; } diff --git a/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java b/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java index 6aa95e9a..d9aa8a2d 100644 --- a/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryPaymentInfoDTO.java @@ -1,7 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -9,22 +8,22 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Data -@ApiModel("交易记录详情") +@Schema(description = "交易记录详情") public class QueryPaymentInfoDTO extends QueryPageByTimeDTO { - @ApiModelProperty("选择的支付平台 PayPal || Stripe || Alipay-HK") + @Schema(description = "选择的支付平台 PayPal || Stripe || Alipay-HK") private String platform; - @ApiModelProperty("支付的金额 单位:HKD") + @Schema(description = "支付的金额 单位:HKD") private String payerTotal; - @ApiModelProperty("商品种类 new || renewal || credits") + @Schema(description = "商品种类 new || renewal || credits") private String type; - @ApiModelProperty("交易状态 Success || Fail || Pending") + @Schema(description = "交易状态 Success || Fail || Pending") private String status; - @ApiModelProperty("付款人所在国家") + @Schema(description = "付款人所在国家") private String country; - @ApiModelProperty("付款人所在城市") + @Schema(description = "付款人所在城市") private String city; - @ApiModelProperty("按id排序 DESC || ASC") + @Schema(description = "按id排序 DESC || ASC") private String order = "DESC"; - @ApiModelProperty("付款用户名") + @Schema(description = "付款用户名") private String payer; } diff --git a/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java b/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java index a6337e73..187a5e64 100644 --- a/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java @@ -1,11 +1,12 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.model.vo.PageQueryBaseVo; -import io.swagger.annotations.ApiModel; import lombok.Data; @Data -@ApiModel("作品集分页查询") +@Schema(description = "作品集分页查询") public class QueryPortfolioPageDTO extends PageQueryBaseVo { private Integer getMyPortfolio; diff --git a/src/main/java/com/ai/da/model/dto/QueryTaskHistoryDTO.java b/src/main/java/com/ai/da/model/dto/QueryTaskHistoryDTO.java index 84caa17d..6aa550be 100644 --- a/src/main/java/com/ai/da/model/dto/QueryTaskHistoryDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryTaskHistoryDTO.java @@ -1,7 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,10 +8,10 @@ import jakarta.validation.constraints.NotEmpty; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("按分类分页查询历史任务") +@Schema(description = "按分类分页查询历史任务") public class QueryTaskHistoryDTO extends QueryPageByTimeDTO { @NotEmpty(message = "type cannot be empty") - @ApiModelProperty("可选类型 ： SR") + @Schema(description = "可选类型 ： SR") private String type; } diff --git a/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java b/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java index 6fff4c8b..3accd1ff 100644 --- a/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java +++ b/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java @@ -1,74 +1,73 @@ -package com.ai.da.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import java.math.BigDecimal; -import java.util.List; - -@Data -@ApiModel("重新设计Collection 入参") -public class ReDesignCollectionDTO { - - @ApiModelProperty("collectionId") - private Long collectionId; - - @ApiModelProperty("情绪板图片 数组") - private List moodBoards; - - @ApiModelProperty("印花板图片 数组") - private List printBoards; - - @NotEmpty(message = "colorBoards.cannot.be.empty") - @ApiModelProperty("颜色板RGB值 数组") - private List colorBoards; - - @ApiModelProperty("手稿板图片id 数组") - private List sketchBoards; - - @ApiModelProperty("市场手稿板图片id 数组") - private List marketingSketchs; - - @NotNull(message = "systemScale.cannot.be.empty") - @ApiModelProperty("系统取图比列") - private BigDecimal systemScale; - -// @NotNull(message = "templateId.cannot.be.empty") - @ApiModelProperty("模特ID") - private Long templateId; - -// @NotBlank(message = "modelType.cannot.be.empty") - @ApiModelProperty("模特类型:System,Library") - private String modelType; - - @NotBlank(message = "modelSex.cannot.be.empty") - @ApiModelProperty("模特性别") - private String modelSex; - - @NotBlank(message = "singleOverall.cannot.be.empty") - @ApiModelProperty("控制生成类型的参数，两个选项：outfit时候传 single , 另外一个传 overall") - private String singleOverall; - - @ApiModelProperty("single模式下的类别选择参数 选项有outwear,dress,blouse,skirt,trousers") - private String switchCategory; - - @NotBlank(message = "timeZone.cannot.be.empty") - @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") - private String timeZone; - - @NotBlank(message = "processId.cannot.be.empty") - @ApiModelProperty("python端design进程ID") - private String processId; - - private String moodboardPosition; - - private String moodTemplateId; - - private List requestIdList; - - private Integer designNum; -} +package com.ai.da.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.List; + +@Data +@Schema(description = "重新设计Collection 入参") +public class ReDesignCollectionDTO { + + @Schema(description = "collectionId") + private Long collectionId; + + @Schema(description = "情绪板图片 数组") + private List moodBoards; + + @Schema(description = "印花板图片 数组") + private List printBoards; + + @NotEmpty(message = "colorBoards.cannot.be.empty") + @Schema(description = "颜色板RGB值 数组") + private List colorBoards; + + @Schema(description = "手稿板图片id 数组") + private List sketchBoards; + + @Schema(description = "市场手稿板图片id 数组") + private List marketingSketchs; + + @NotNull(message = "systemScale.cannot.be.empty") + @Schema(description = "系统取图比列") + private BigDecimal systemScale; + +// @NotNull(message = "templateId.cannot.be.empty") + @Schema(description = "模特ID") + private Long templateId; + +// @NotBlank(message = "modelType.cannot.be.empty") + @Schema(description = "模特类型:System,Library") + private String modelType; + + @NotBlank(message = "modelSex.cannot.be.empty") + @Schema(description = "模特性别") + private String modelSex; + + @NotBlank(message = "singleOverall.cannot.be.empty") + @Schema(description = "控制生成类型的参数，两个选项：outfit时候传 single , 另外一个传 overall") + private String singleOverall; + + @Schema(description = "single模式下的类别选择参数 选项有outwear,dress,blouse,skirt,trousers") + private String switchCategory; + + @NotBlank(message = "timeZone.cannot.be.empty") + @Schema(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取") + private String timeZone; + + @NotBlank(message = "processId.cannot.be.empty") + @Schema(description = "python端design进程ID") + private String processId; + + private String moodboardPosition; + + private String moodTemplateId; + + private List requestIdList; + + private Integer designNum; +} diff --git a/src/main/java/com/ai/da/model/dto/ReferralPageQueryDTO.java b/src/main/java/com/ai/da/model/dto/ReferralPageQueryDTO.java index a8ea5572..fa0b61b9 100644 --- a/src/main/java/com/ai/da/model/dto/ReferralPageQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/ReferralPageQueryDTO.java @@ -1,18 +1,17 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel +@Schema(description = "推荐分页查询") public class ReferralPageQueryDTO extends TimeQueryBaseDTO { - @ApiModelProperty("推广者id") + @Schema(description = "推广者id") private Long affiliateId; - @ApiModelProperty("状态 取值Paid/Unpaid/Pending/Access/Rejected") + @Schema(description = "状态 取值Paid/Unpaid/Pending/Access/Rejected") private String status; } diff --git a/src/main/java/com/ai/da/model/dto/SketchReconstructionDTO.java b/src/main/java/com/ai/da/model/dto/SketchReconstructionDTO.java index e44fd76c..33ee9560 100644 --- a/src/main/java/com/ai/da/model/dto/SketchReconstructionDTO.java +++ b/src/main/java/com/ai/da/model/dto/SketchReconstructionDTO.java @@ -1,19 +1,18 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel(value = "sketch拼贴") +@Schema(description = "sketch拼贴") public class SketchReconstructionDTO { - @ApiModelProperty("项目id") + @Schema(description = "项目id") private Long projectId; - @ApiModelProperty("拼贴图的base64数据") + @Schema(description = "拼贴图的base64数据") private String collagePicture; // 识别衣服类型用 - @ApiModelProperty("性别") + @Schema(description = "性别") private String gender; } diff --git a/src/main/java/com/ai/da/model/dto/SketchesBoundingBoxDTO.java b/src/main/java/com/ai/da/model/dto/SketchesBoundingBoxDTO.java index 811d8f6e..2f14d077 100644 --- a/src/main/java/com/ai/da/model/dto/SketchesBoundingBoxDTO.java +++ b/src/main/java/com/ai/da/model/dto/SketchesBoundingBoxDTO.java @@ -1,16 +1,15 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel("sketches裁剪 入参") +@Schema(description = "sketches裁剪 入参") public class SketchesBoundingBoxDTO { - @ApiModelProperty("手稿板图片id 数组") + @Schema(description = "手稿板图片id 数组") private List sketchBoards; } diff --git a/src/main/java/com/ai/da/model/dto/SubscriptionPlanDTO.java b/src/main/java/com/ai/da/model/dto/SubscriptionPlanDTO.java index ec7e5132..36fe5f0b 100644 --- a/src/main/java/com/ai/da/model/dto/SubscriptionPlanDTO.java +++ b/src/main/java/com/ai/da/model/dto/SubscriptionPlanDTO.java @@ -1,38 +1,37 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; import java.math.BigDecimal; @Data -@ApiModel( value = "创建订阅计划入参") +@Schema(description = "创建订阅计划入参") public class SubscriptionPlanDTO { - @ApiModelProperty("组织id") + @Schema(description = "组织id") @NotNull(message = "Please select an organizationId.") private Long organizationId; - @ApiModelProperty("当前订阅开始时间") + @Schema(description = "当前订阅开始时间") @NotNull(message = "Please set a subscription start time.") private Long currentPeriodStart; - @ApiModelProperty("当前订阅结束时间") + @Schema(description = "当前订阅结束时间") @NotNull(message = "Please set a subscription end time.") private Long currentPeriodEnd; - @ApiModelProperty("当前订阅总的子账号数量") + @Schema(description = "当前订阅总的子账号数量") @NotNull(message = "Please set the sub-account number.") private Integer accountNum; - @ApiModelProperty("当前订阅可用积分上限") + @Schema(description = "当前订阅可用积分上限") @NotNull(message = "Please set the credits limit.") private BigDecimal creditLimit; - @ApiModelProperty("管理员账户id") + @Schema(description = "管理员账户id") @NotNull(message = "Please assign an administrator account.") private Long adminAccId; diff --git a/src/main/java/com/ai/da/model/dto/SubscriptionPlanPageQuery.java b/src/main/java/com/ai/da/model/dto/SubscriptionPlanPageQuery.java index 60910b27..122ad835 100644 --- a/src/main/java/com/ai/da/model/dto/SubscriptionPlanPageQuery.java +++ b/src/main/java/com/ai/da/model/dto/SubscriptionPlanPageQuery.java @@ -1,21 +1,20 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel +@Schema(description = "订阅计划分页查询") public class SubscriptionPlanPageQuery extends QueryPageByTimeDTO { - @ApiModelProperty("组织id") + @Schema(description = "组织id") private Long organizationId; - @ApiModelProperty("管理id") + @Schema(description = "管理id") private Long adminAccId; - @ApiModelProperty("状态 PENDING||ACTIVE||EXPIRED") + @Schema(description = "状态 PENDING||ACTIVE||EXPIRED") private List status; } diff --git a/src/main/java/com/ai/da/model/dto/SuperResolutionDTO.java b/src/main/java/com/ai/da/model/dto/SuperResolutionDTO.java index de12b701..7b6734bb 100644 --- a/src/main/java/com/ai/da/model/dto/SuperResolutionDTO.java +++ b/src/main/java/com/ai/da/model/dto/SuperResolutionDTO.java @@ -1,6 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -13,13 +13,13 @@ import jakarta.validation.constraints.NotBlank; public class SuperResolutionDTO { @NotBlank(message = "You have to select at least one image") - @ApiModelProperty("图片") + @Schema(description = "图片") private String images; @NotBlank(message = "You must choose the magnification") - @ApiModelProperty("放大倍数") + @Schema(description = "放大倍数") private Integer scale; - @ApiModelProperty("唯一id，用于保持消息唯一性") + @Schema(description = "唯一id，用于保持消息唯一性") private String uniqueId; } diff --git a/src/main/java/com/ai/da/model/dto/ThreeDLayoutQueryDTO.java b/src/main/java/com/ai/da/model/dto/ThreeDLayoutQueryDTO.java index a36c4ae9..8985ad63 100644 --- a/src/main/java/com/ai/da/model/dto/ThreeDLayoutQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/ThreeDLayoutQueryDTO.java @@ -1,8 +1,9 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.model.vo.PageQueryBaseVo; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/ai/da/model/dto/TimeQueryBaseDTO.java b/src/main/java/com/ai/da/model/dto/TimeQueryBaseDTO.java index 3c10297b..ff1cd441 100644 --- a/src/main/java/com/ai/da/model/dto/TimeQueryBaseDTO.java +++ b/src/main/java/com/ai/da/model/dto/TimeQueryBaseDTO.java @@ -1,19 +1,19 @@ package com.ai.da.model.dto; +import io.swagger.v3.oas.annotations.media.Schema; + 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("按时间查询") +@Schema(description = "按时间查询") public class TimeQueryBaseDTO extends PageQueryBaseVo { - @ApiModelProperty("按时间区间查询 区间起点") + @Schema(description = "按时间区间查询 区间起点") private String startTime; - @ApiModelProperty("按时间区间查询 区间终点") + @Schema(description = "按时间区间查询 区间终点") private String endTime; } diff --git a/src/main/java/com/ai/da/model/dto/TrialOrderDTO.java b/src/main/java/com/ai/da/model/dto/TrialOrderDTO.java index f05e875e..5e5eef00 100644 --- a/src/main/java/com/ai/da/model/dto/TrialOrderDTO.java +++ b/src/main/java/com/ai/da/model/dto/TrialOrderDTO.java @@ -1,15 +1,14 @@ package com.ai.da.model.dto; import com.ai.da.model.vo.PageQueryBaseVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -@ApiModel("登入") +@Schema(description = "登入") public class TrialOrderDTO extends PageQueryBaseVo { private Integer status; } diff --git a/src/main/java/com/ai/da/model/dto/UpdateSubscriptionPlanDTO.java b/src/main/java/com/ai/da/model/dto/UpdateSubscriptionPlanDTO.java index f42d39c1..bf5f53cd 100644 --- a/src/main/java/com/ai/da/model/dto/UpdateSubscriptionPlanDTO.java +++ b/src/main/java/com/ai/da/model/dto/UpdateSubscriptionPlanDTO.java @@ -1,33 +1,32 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; import java.math.BigDecimal; @Data -@ApiModel +@Schema(description = "更新订阅计划") public class UpdateSubscriptionPlanDTO { - @ApiModelProperty("id") + @Schema(description = "id") @NotNull(message = "subscription plan id cannot be empty") private Long id; - @ApiModelProperty("当前订阅开始时间") + @Schema(description = "当前订阅开始时间") private Long currentPeriodStart; - @ApiModelProperty("当前订阅结束时间") + @Schema(description = "当前订阅结束时间") private Long currentPeriodEnd; - @ApiModelProperty("当前订阅总的子账号数量") + @Schema(description = "当前订阅总的子账号数量") private Integer accountNum; - @ApiModelProperty("当前订阅可用积分上限") + @Schema(description = "当前订阅可用积分上限") private BigDecimal creditLimit; - @ApiModelProperty("管理员账户id") + @Schema(description = "管理员账户id") private Long adminAccId; } diff --git a/src/main/java/com/ai/da/model/dto/UpdateUserInfoDTO.java b/src/main/java/com/ai/da/model/dto/UpdateUserInfoDTO.java index 8033e815..eaef9dba 100644 --- a/src/main/java/com/ai/da/model/dto/UpdateUserInfoDTO.java +++ b/src/main/java/com/ai/da/model/dto/UpdateUserInfoDTO.java @@ -1,6 +1,6 @@ package com.ai.da.model.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data diff --git a/src/main/java/com/ai/da/model/vo/AccountLoginVO.java b/src/main/java/com/ai/da/model/vo/AccountLoginVO.java index f436d70f..e16b2ef1 100644 --- a/src/main/java/com/ai/da/model/vo/AccountLoginVO.java +++ b/src/main/java/com/ai/da/model/vo/AccountLoginVO.java @@ -1,8 +1,8 @@ -package com.ai.da.model.vo; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import com.ai.da.mapper.primary.entity.AccountExtend; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -13,24 +13,24 @@ import java.util.Map; @AllArgsConstructor @NoArgsConstructor @Data -@ApiModel("登入-响应") +@Schema(description = "登入-响应") public class AccountLoginVO { - @ApiModelProperty("邮箱") + @Schema(description = "邮箱") private String email; - @ApiModelProperty("用户名") + @Schema(description = "用户名") private String userName; - @ApiModelProperty("token") + @Schema(description = "token") private String token; - @ApiModelProperty("userId") + @Schema(description = "userId") private Long userId; - @ApiModelProperty("是否是试用用户") + @Schema(description = "是否是试用用户") private Integer isTrial; - @ApiModelProperty("是否完成引导") + @Schema(description = "是否完成引导") private Integer isBeginner; private Integer systemUser; diff --git a/src/main/java/com/ai/da/model/vo/AccountPreLoginVO.java b/src/main/java/com/ai/da/model/vo/AccountPreLoginVO.java index 32f172bc..4c4c2f7f 100644 --- a/src/main/java/com/ai/da/model/vo/AccountPreLoginVO.java +++ b/src/main/java/com/ai/da/model/vo/AccountPreLoginVO.java @@ -1,7 +1,6 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,9 +8,9 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Data -@ApiModel("预先-登入-响应") +@Schema(description = "预先-登入-响应") public class AccountPreLoginVO { - @ApiModelProperty("userId") + @Schema(description = "userId") private Long userId; } diff --git a/src/main/java/com/ai/da/model/vo/CheckCouponsVO.java b/src/main/java/com/ai/da/model/vo/CheckCouponsVO.java index dbbf2aeb..4aa4d4db 100644 --- a/src/main/java/com/ai/da/model/vo/CheckCouponsVO.java +++ b/src/main/java/com/ai/da/model/vo/CheckCouponsVO.java @@ -1,6 +1,6 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class CheckCouponsVO { - @ApiModelProperty("expired 过期 || invalid 无效 || valid 有效 || pending 尚未生效") + @Schema(description = "expired 过期 || invalid 无效 || valid 有效 || pending 尚未生效") private String status; private String message; diff --git a/src/main/java/com/ai/da/model/vo/CollectionColorVO.java b/src/main/java/com/ai/da/model/vo/CollectionColorVO.java index 5fb1ca2e..0bd11a6a 100644 --- a/src/main/java/com/ai/da/model/vo/CollectionColorVO.java +++ b/src/main/java/com/ai/da/model/vo/CollectionColorVO.java @@ -1,29 +1,28 @@ -package com.ai.da.model.vo; - -import com.ai.da.mapper.primary.entity.Gradient; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode -@ApiModel("设计Collection颜色板 响应") -public class CollectionColorVO { - - @ApiModelProperty("潘通id") - private Integer id; - - @ApiModelProperty("潘通名字") - private String name; - - @ApiModelProperty("tcx值") - private String tcx; - - @ApiModelProperty("潘通RGB值") - private String rgbValue; - - @ApiModelProperty("渐变色信息") - private Gradient gradient; - -} +package com.ai.da.model.vo; + +import com.ai.da.mapper.primary.entity.Gradient; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode +@Schema(description = "设计Collection颜色板 响应") +public class CollectionColorVO { + + @Schema(description = "潘通id") + private Integer id; + + @Schema(description = "潘通名字") + private String name; + + @Schema(description = "tcx值") + private String tcx; + + @Schema(description = "潘通RGB值") + private String rgbValue; + + @Schema(description = "渐变色信息") + private Gradient gradient; + +} diff --git a/src/main/java/com/ai/da/model/vo/CollectionElementVO.java b/src/main/java/com/ai/da/model/vo/CollectionElementVO.java index 1bf91702..9a30f81b 100644 --- a/src/main/java/com/ai/da/model/vo/CollectionElementVO.java +++ b/src/main/java/com/ai/da/model/vo/CollectionElementVO.java @@ -1,46 +1,45 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel("element-响应") +@Schema(description = "element-响应") public class CollectionElementVO { - @ApiModelProperty("元素id") + @Schema(description = "元素id") private Long id; - @ApiModelProperty("用户Id") + @Schema(description = "用户Id") private Long accountId; - @ApiModelProperty("collectionId") + @Schema(description = "collectionId") private Long collectionId; - @ApiModelProperty("一级类型 Moodboard Printboard Sketchboard MarketingSketch") + @Schema(description = "一级类型 Moodboard Printboard Sketchboard MarketingSketch") private String level1Type; - @ApiModelProperty("二级类型 Outwear Dress Blouse Skirt Trousers(只争对Sketchboard一级类型)") + @Schema(description = "二级类型 Outwear Dress Blouse Skirt Trousers(只争对Sketchboard一级类型)") private String level2Type; - @ApiModelProperty("三级类型 性别") + @Schema(description = "三级类型 性别") private String level3Type; - @ApiModelProperty("design类型 用户design生成时候区别library和collection") + @Schema(description = "design类型 用户design生成时候区别library和collection") private String designType; - @ApiModelProperty("元素名") + @Schema(description = "元素名") private String name; - @ApiModelProperty("是否pin 1pin 0 不pin") + @Schema(description = "是否pin 1pin 0 不pin") private Byte isPin; - @ApiModelProperty("元素存放地址,绝对路径") + @Schema(description = "元素存放地址,绝对路径") private String url; - @ApiModelProperty("元素存放地址,绝对路径") + @Schema(description = "元素存放地址,绝对路径") private String minIOPath; private String urlWithWhiteSide; diff --git a/src/main/java/com/ai/da/model/vo/CollectionGeneratePrintVO.java b/src/main/java/com/ai/da/model/vo/CollectionGeneratePrintVO.java index 91b4a219..5bb38495 100644 --- a/src/main/java/com/ai/da/model/vo/CollectionGeneratePrintVO.java +++ b/src/main/java/com/ai/da/model/vo/CollectionGeneratePrintVO.java @@ -1,33 +1,32 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel("生产印花-响应") -public class CollectionGeneratePrintVO { - @ApiModelProperty("元素id") - private Long id; - - @ApiModelProperty("用户Id") - private Long accountId; - - @ApiModelProperty("collectionId") - private Long collectionId; - - @ApiModelProperty("一级类型 Moodboard Printboard Sketchboard MarketingSketch") - private String level1Type; - - @ApiModelProperty("二级类型 Outwear Dress Blouse Skirt Trousers(只争对Sketchboard一级类型)") - private String level2Type; - - @ApiModelProperty("design类型 用户design生成时候区别library和collection") - private String designType; - - @ApiModelProperty("元素名") - private String name; - - @ApiModelProperty("元素存放地址,绝对路径") - private String url; -} +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "生产印花-响应") +public class CollectionGeneratePrintVO { + @Schema(description = "元素id") + private Long id; + + @Schema(description = "用户Id") + private Long accountId; + + @Schema(description = "collectionId") + private Long collectionId; + + @Schema(description = "一级类型 Moodboard Printboard Sketchboard MarketingSketch") + private String level1Type; + + @Schema(description = "二级类型 Outwear Dress Blouse Skirt Trousers(只争对Sketchboard一级类型)") + private String level2Type; + + @Schema(description = "design类型 用户design生成时候区别library和collection") + private String designType; + + @Schema(description = "元素名") + private String name; + + @Schema(description = "元素存放地址,绝对路径") + private String url; +} diff --git a/src/main/java/com/ai/da/model/vo/CollectionSketchVO.java b/src/main/java/com/ai/da/model/vo/CollectionSketchVO.java index b6e48c6d..57d0f31a 100644 --- a/src/main/java/com/ai/da/model/vo/CollectionSketchVO.java +++ b/src/main/java/com/ai/da/model/vo/CollectionSketchVO.java @@ -1,12 +1,11 @@ package com.ai.da.model.vo; import com.ai.da.model.dto.CollectionSketchDTO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("设计Collection Sketch 入参") +@Schema(description = "设计Collection Sketch 入参") public class CollectionSketchVO extends CollectionSketchDTO { private String urlWithWhiteSide; diff --git a/src/main/java/com/ai/da/model/vo/ComposeLayersVO.java b/src/main/java/com/ai/da/model/vo/ComposeLayersVO.java index 209c5e3a..d112461e 100644 --- a/src/main/java/com/ai/da/model/vo/ComposeLayersVO.java +++ b/src/main/java/com/ai/da/model/vo/ComposeLayersVO.java @@ -1,21 +1,20 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel("编辑图层位置大小，合成图层") +@Schema(description = "编辑图层位置大小，合成图层") public class ComposeLayersVO { - @ApiModelProperty("designItemId") + @Schema(description = "designItemId") private Long designItemId; - @ApiModelProperty("图层信息") + @Schema(description = "图层信息") private List layers; - @ApiModelProperty("合成图") + @Schema(description = "合成图") private String designItemUrl; } diff --git a/src/main/java/com/ai/da/model/vo/DesignCollectionItemVO.java b/src/main/java/com/ai/da/model/vo/DesignCollectionItemVO.java index ac40f33d..252e3c1a 100644 --- a/src/main/java/com/ai/da/model/vo/DesignCollectionItemVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignCollectionItemVO.java @@ -1,25 +1,24 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @AllArgsConstructor @Data -@ApiModel("设计ConllectionItem响应") +@Schema(description = "设计ConllectionItem响应") public class DesignCollectionItemVO { - @ApiModelProperty("design生成的图片id") + @Schema(description = "design生成的图片id") private Long designItemId; - @ApiModelProperty("design生成的图片地址 绝对路径") + @Schema(description = "design生成的图片地址 绝对路径") private String designItemUrl; - @ApiModelProperty("t_design_python_outfit id") + @Schema(description = "t_design_python_outfit id") private Long designOutfitId; - @ApiModelProperty("t_design_python_outfit id") + @Schema(description = "t_design_python_outfit id") private String designOutfitUrl; private String objectSign; diff --git a/src/main/java/com/ai/da/model/vo/DesignCollectionVO.java b/src/main/java/com/ai/da/model/vo/DesignCollectionVO.java index 807f364c..458bcf14 100644 --- a/src/main/java/com/ai/da/model/vo/DesignCollectionVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignCollectionVO.java @@ -1,7 +1,6 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,16 +8,16 @@ import java.util.List; @AllArgsConstructor @Data -@ApiModel("设计Conllection响应") +@Schema(description = "设计Conllection响应") public class DesignCollectionVO { - @ApiModelProperty("designId") + @Schema(description = "designId") private Long designId; - @ApiModelProperty("collectionId") + @Schema(description = "collectionId") private Long collectionId; - @ApiModelProperty("design生成的图片 数组") + @Schema(description = "design生成的图片 数组") private List designCollectionItems; private String processId; diff --git a/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java b/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java index b30f64be..76e088fd 100644 --- a/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java @@ -1,77 +1,77 @@ -package com.ai.da.model.vo; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import com.ai.da.mapper.primary.entity.Gradient; import com.ai.da.model.dto.DesignSinglePrintDTO; import com.ai.da.model.dto.PartialDesignDTO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data -@ApiModel("designItem detail clothes 响应") +@Schema(description = "designItem detail clothes 响应") public class DesignItemClothesDetailVO { /** * designItemDetail对应的Id */ - @ApiModelProperty("对应的上游id") + @Schema(description = "对应的上游id") private Long id; - @ApiModelProperty("该id末尾是否被加了随机数") + @Schema(description = "该id末尾是否被加了随机数") private Boolean changed; - @ApiModelProperty("该图片来源 Collection / Library") + @Schema(description = "该图片来源 Collection / Library") private String designType; - @ApiModelProperty("对应的类型 有:Outwear,Dress,Blouse,Skirt,Trousers Shoes Hairstyle Earring Body") + @Schema(description = "对应的类型 有:Outwear,Dress,Blouse,Skirt,Trousers Shoes Hairstyle Earring Body") private String type; - @ApiModelProperty("上传时候对应的类型,一级类型 Moodboard Printboard Sketchboard MarketingSketch Colorboard") + @Schema(description = "上传时候对应的类型,一级类型 Moodboard Printboard Sketchboard MarketingSketch Colorboard") private String level1Type; - @ApiModelProperty("对应的图片路径") + @Schema(description = "对应的图片路径") private String path; - @ApiModelProperty("对应图片minIO路径") + @Schema(description = "对应图片minIO路径") private String minIOPath; - @ApiModelProperty("图片所属：sys, user") + @Schema(description = "图片所属：sys, user") private String scope; - @ApiModelProperty(" 颜色 存 RGB值 中间空格分隔 比如 58 58 169") + @Schema(description = " 颜色 存 RGB值 中间空格分隔 比如 58 58 169") // private String color; private PantoneVO color; -// @ApiModelProperty("对应的print图片对象") +// @Schema(description = "对应的print图片对象") // private DesignPythonItemPrint printObject; - @ApiModelProperty("print详细") + @Schema(description = "print详细") private DesignSinglePrintDTO printObject = new DesignSinglePrintDTO(); - @ApiModelProperty("design elements详细") + @Schema(description = "design elements详细") private DesignSinglePrintDTO trims = new DesignSinglePrintDTO(); - @ApiModelProperty("对应图层信息") + @Schema(description = "对应图层信息") private List layersObject; - @ApiModelProperty("衣服所在图层") + @Schema(description = "衣服所在图层") private Integer priority; - @ApiModelProperty("渐变色信息") + @Schema(description = "渐变色信息") private Gradient gradient; - @ApiModelProperty("未分割的图层") + @Schema(description = "未分割的图层") private String undividedLayer; - @ApiModelProperty("添加single印花的未分割的图层") + @Schema(description = "添加single印花的未分割的图层") private String undividedLayerWithSinglePrint; - @ApiModelProperty("局部design") + @Schema(description = "局部design") private PartialDesignDTO partialDesign; - @ApiModelProperty("画布文件id") + @Schema(description = "画布文件id") private Long canvasId; public DesignItemClothesDetailVO() { diff --git a/src/main/java/com/ai/da/model/vo/DesignItemDetailVO.java b/src/main/java/com/ai/da/model/vo/DesignItemDetailVO.java index 29605965..4d2e2bf8 100644 --- a/src/main/java/com/ai/da/model/vo/DesignItemDetailVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignItemDetailVO.java @@ -1,35 +1,34 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import java.util.List; @Data -@ApiModel("designItem detail响应") +@Schema(description = "designItem detail响应") public class DesignItemDetailVO { - @ApiModelProperty("designItemId") + @Schema(description = "designItemId") private Long designItemId; - @ApiModelProperty("designItem图片") + @Schema(description = "designItem图片") // private DesignPythonOutfitVO designItemUrl; private String designItemUrl; - @ApiModelProperty("design高级图片") + @Schema(description = "design高级图片") private String highDesignUrl; - @ApiModelProperty("控制生成类型的参数，两个选项：“overall”或“single”") + @Schema(description = "控制生成类型的参数，两个选项：“overall”或“single”") private String singleOverall; - @ApiModelProperty("single模式下的类别选择参数 选项有outwear,dress,blouse,skirt,trousers") + @Schema(description = "single模式下的类别选择参数 选项有outwear,dress,blouse,skirt,trousers") private String switchCategory; - @ApiModelProperty("clothes 数组") + @Schema(description = "clothes 数组") private List clothes; - @ApiModelProperty("others 数组") + @Schema(description = "others 数组") private List others; } diff --git a/src/main/java/com/ai/da/model/vo/DesignItemOthersDetailVO.java b/src/main/java/com/ai/da/model/vo/DesignItemOthersDetailVO.java index 95fd96e1..b447fcd3 100644 --- a/src/main/java/com/ai/da/model/vo/DesignItemOthersDetailVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignItemOthersDetailVO.java @@ -1,35 +1,35 @@ -package com.ai.da.model.vo; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import com.ai.da.python.vo.DesignPythonItemPrint; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data -@ApiModel("designItem detail others 响应") +@Schema(description = "designItem detail others 响应") public class DesignItemOthersDetailVO { - @ApiModelProperty("对应的上游id") + @Schema(description = "对应的上游id") private Long id; - @ApiModelProperty("对应的类型 有Hairstyle Earring Body") + @Schema(description = "对应的类型 有Hairstyle Earring Body") private String type; - @ApiModelProperty("对应的图片路径") + @Schema(description = "对应的图片路径") private String path; - @ApiModelProperty("对应图片minIO路径") + @Schema(description = "对应图片minIO路径") private String minIOPath; - @ApiModelProperty(" 颜色 存 RGB值 中间空格分隔 比如 58 58 169") + @Schema(description = " 颜色 存 RGB值 中间空格分隔 比如 58 58 169") // private String color; private PantoneVO color; - @ApiModelProperty("对应的print图片的绝对路径") + @Schema(description = "对应的print图片的绝对路径") private DesignPythonItemPrint printObject; - @ApiModelProperty("对应图层信息") + @Schema(description = "对应图层信息") private List layersObject; } diff --git a/src/main/java/com/ai/da/model/vo/DesignLibraryModelPointVO.java b/src/main/java/com/ai/da/model/vo/DesignLibraryModelPointVO.java index 1c2d642a..b23c414a 100644 --- a/src/main/java/com/ai/da/model/vo/DesignLibraryModelPointVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignLibraryModelPointVO.java @@ -1,7 +1,6 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -14,28 +13,28 @@ import java.util.List; * @author easy-generator * @since 2022-11-13 */ -@ApiModel("Design template打点参数") +@Schema(description = "Design template打点参数") @Data public class DesignLibraryModelPointVO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("左肩") + @Schema(description = "左肩") private List shoulderLeft; - @ApiModelProperty("右肩") + @Schema(description = "右肩") private List shoulderRight; - @ApiModelProperty("左腰") + @Schema(description = "左腰") private List waistbandLeft; - @ApiModelProperty("右腰") + @Schema(description = "右腰") private List waistbandRight; - @ApiModelProperty("左手") + @Schema(description = "左手") private List handLeft; - @ApiModelProperty("右手") + @Schema(description = "右手") private List handRight; private String templateUrl; diff --git a/src/main/java/com/ai/da/model/vo/DesignLikeVO.java b/src/main/java/com/ai/da/model/vo/DesignLikeVO.java index a8d0c5d8..3d5aa4d0 100644 --- a/src/main/java/com/ai/da/model/vo/DesignLikeVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignLikeVO.java @@ -1,7 +1,6 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,14 +8,14 @@ import java.util.List; @AllArgsConstructor @Data -@ApiModel("design like-响应") +@Schema(description = "design like-响应") public class DesignLikeVO { private Long userLikeSortId; - @ApiModelProperty("分组id") + @Schema(description = "分组id") private Long userGroupId; - @ApiModelProperty("分组详情id") + @Schema(description = "分组详情id") private Long groupDetailId; private String pictureName; diff --git a/src/main/java/com/ai/da/model/vo/DesignModuleChooseVO.java b/src/main/java/com/ai/da/model/vo/DesignModuleChooseVO.java index 05735bde..ac0b20d8 100644 --- a/src/main/java/com/ai/da/model/vo/DesignModuleChooseVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignModuleChooseVO.java @@ -1,6 +1,6 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -11,9 +11,9 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor public class DesignModuleChooseVO { - @ApiModelProperty("分组id") + @Schema(description = "分组id") private Long userGroupId; - @ApiModelProperty("分组详细数组") + @Schema(description = "分组详细数组") private List userLikeDetails; } diff --git a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitDetailVO.java b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitDetailVO.java index 6615a74b..9587cd04 100644 --- a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitDetailVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitDetailVO.java @@ -1,28 +1,27 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("designItem detail layer响应") +@Schema(description = "designItem detail layer响应") public class DesignPythonOutfitDetailVO { - @ApiModelProperty("各图层id") + @Schema(description = "各图层id") private Long id; - @ApiModelProperty("图片所属分类 earring_back/front,hairstyle_back/front,skirt_back/front,shoes_left/right,body 等") + @Schema(description = "图片所属分类 earring_back/front,hairstyle_back/front,skirt_back/front,shoes_left/right,body 等") private String imageCategory; - @ApiModelProperty("图片url") + @Schema(description = "图片url") private String imageUrl; - @ApiModelProperty("蒙版url") + @Schema(description = "蒙版url") private String maskUrl; - @ApiModelProperty("坐标") + @Schema(description = "坐标") private String position; - @ApiModelProperty("优先级") + @Schema(description = "优先级") private Integer priority; } diff --git a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java index ad19d19b..4b1e546c 100644 --- a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java @@ -1,60 +1,59 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel("designItem detail从python端获取的合成图+各图层响应") +@Schema(description = "designItem detail从python端获取的合成图+各图层响应") public class DesignPythonOutfitVO { /** * ID */ - @ApiModelProperty(value = "ID") + @Schema(description = "ID") private Long id; /** * 图层 */ - @ApiModelProperty(value = "图层名") + @Schema(description = "图层名") private String imageCategory; /** * 图层大小(前后片大小) */ - @ApiModelProperty(value = "图层大小") + @Schema(description = "图层大小") private List imageSize; /** * 对应的图片的绝对路径 */ - @ApiModelProperty(value = "对应的图片的绝对路径") + @Schema(description = "对应的图片的绝对路径") private String imageUrl; private String imageMinioUrl; /** * mask_url */ - @ApiModelProperty(value = "遮罩") + @Schema(description = "遮罩") private String maskUrl; private String maskMinioUrl; /** * 位置 */ - @ApiModelProperty(value = "位置") + @Schema(description = "位置") private List position; /** * 偏移量 */ - @ApiModelProperty(value = "偏移量") + @Schema(description = "偏移量") private List offset; /** * 图层缩放比例 */ - @ApiModelProperty(value = "缩放比例") + @Schema(description = "缩放比例") private Float[] scale = new Float[]{1.0f,1.0f}; /** * 图层优先级 从10开始，优先级数字越大越靠近上层 diff --git a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java index 16ba3108..60638510 100644 --- a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java +++ b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java @@ -1,7 +1,6 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.hibernate.validator.constraints.Range; @@ -10,37 +9,37 @@ import java.io.Serializable; import java.util.List; @Data -@ApiModel("design single 印花详情") +@Schema(description = "design single 印花详情") public class DesignSinglePrint implements Serializable { - @ApiModelProperty("single -> true,overall -> false") + @Schema(description = "single -> true,overall -> false") private Boolean ifSingle; - @ApiModelProperty("印花的类型 Slogan || Logo || Pattern") + @Schema(description = "印花的类型 Slogan || Logo || Pattern") private String level2Type; - @ApiModelProperty("印花是用户上传的还是从library中选的 collection/library/Generate") + @Schema(description = "印花是用户上传的还是从library中选的 collection/library/Generate") private String designType; - @ApiModelProperty("印花url") + @Schema(description = "印花url") private String path; - @ApiModelProperty("印花minIO路径") + @Schema(description = "印花minIO路径") private String minIOPath; - @ApiModelProperty("印花位置") + @Schema(description = "印花位置") private List location; - @ApiModelProperty("印花大小") + @Schema(description = "印花大小") @Range(max = 1, message = "印花缩放值需用大于等于0小于等于1的数表示") private List scale; @Range(min = -360, max = 360, message = "印花旋转角度范围为-360° ~ 360°") - @ApiModelProperty("印花角度") + @Schema(description = "印花角度") private Double angle; @Min(value = 1) - @ApiModelProperty("印花优先级") + @Schema(description = "印花优先级") private Integer priority; public DesignSinglePrint() { diff --git a/src/main/java/com/ai/da/model/vo/DesignSingleVO.java b/src/main/java/com/ai/da/model/vo/DesignSingleVO.java index 3bae68ff..d71cb97d 100644 --- a/src/main/java/com/ai/da/model/vo/DesignSingleVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignSingleVO.java @@ -1,6 +1,6 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -8,16 +8,16 @@ import java.util.List; @Data public class DesignSingleVO { - @ApiModelProperty("designItemId") + @Schema(description = "designItemId") private Long designItemId; - @ApiModelProperty("全身图") + @Schema(description = "全身图") private String designItemUrl; - @ApiModelProperty("当前全身图") + @Schema(description = "当前全身图") private String currentFullBodyView; - @ApiModelProperty("clothes 数组") + @Schema(description = "clothes 数组") private List clothes; } diff --git a/src/main/java/com/ai/da/model/vo/EditLayersPositionAndScaleVO.java b/src/main/java/com/ai/da/model/vo/EditLayersPositionAndScaleVO.java index 2efe5be8..b18046f0 100644 --- a/src/main/java/com/ai/da/model/vo/EditLayersPositionAndScaleVO.java +++ b/src/main/java/com/ai/da/model/vo/EditLayersPositionAndScaleVO.java @@ -1,15 +1,14 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("编辑图层的位置、大小") +@Schema(description = "编辑图层的位置、大小") public class EditLayersPositionAndScaleVO { - @ApiModelProperty("layers") + @Schema(description = "layers") private ComposeLayersVO layers; - @ApiModelProperty("时区") + @Schema(description = "时区") private String timeZone; } diff --git a/src/main/java/com/ai/da/model/vo/FileVO.java b/src/main/java/com/ai/da/model/vo/FileVO.java index 4934a273..9212dc16 100644 --- a/src/main/java/com/ai/da/model/vo/FileVO.java +++ b/src/main/java/com/ai/da/model/vo/FileVO.java @@ -1,19 +1,18 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @AllArgsConstructor @Data -@ApiModel("登入-响应") +@Schema(description = "登入-响应") public class FileVO { - @ApiModelProperty("高度") + @Schema(description = "高度") private Integer high; - @ApiModelProperty("宽度") + @Schema(description = "宽度") private Integer width; } diff --git a/src/main/java/com/ai/da/model/vo/GenerateCaptionVO.java b/src/main/java/com/ai/da/model/vo/GenerateCaptionVO.java index ad725488..ded2e548 100644 --- a/src/main/java/com/ai/da/model/vo/GenerateCaptionVO.java +++ b/src/main/java/com/ai/da/model/vo/GenerateCaptionVO.java @@ -1,7 +1,6 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,10 +8,10 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Data -@ApiModel("生成sketch的caption") +@Schema(description = "生成sketch的caption") public class GenerateCaptionVO { - @ApiModelProperty("caption") + @Schema(description = "caption") private String caption; } diff --git a/src/main/java/com/ai/da/model/vo/GenerateCollectionItemVO.java b/src/main/java/com/ai/da/model/vo/GenerateCollectionItemVO.java index 9c12a8fb..9cc10240 100644 --- a/src/main/java/com/ai/da/model/vo/GenerateCollectionItemVO.java +++ b/src/main/java/com/ai/da/model/vo/GenerateCollectionItemVO.java @@ -1,20 +1,19 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("生成 ConllectionItem响应") +@Schema(description = "生成 ConllectionItem响应") public class GenerateCollectionItemVO { - @ApiModelProperty("generate生成图片的id") + @Schema(description = "generate生成图片的id") private Long generateItemId; - @ApiModelProperty("generate生成图片的url") + @Schema(description = "generate生成图片的url") private String generateItemUrl; - @ApiModelProperty("生成的图片是否已经被like") + @Schema(description = "生成的图片是否已经被like") private Boolean isLiked = Boolean.FALSE; diff --git a/src/main/java/com/ai/da/model/vo/GenerateCollectionVO.java b/src/main/java/com/ai/da/model/vo/GenerateCollectionVO.java index aa8fb7c6..9451e81a 100644 --- a/src/main/java/com/ai/da/model/vo/GenerateCollectionVO.java +++ b/src/main/java/com/ai/da/model/vo/GenerateCollectionVO.java @@ -1,25 +1,24 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel("generate响应vo") +@Schema(description = "generate响应vo") public class GenerateCollectionVO { - @ApiModelProperty("generateId") + @Schema(description = "generateId") private Long generateId; - @ApiModelProperty("collection") + @Schema(description = "collection") private Long collectionId; - @ApiModelProperty("生成的图片信息") + @Schema(description = "生成的图片信息") private List generatedCollectionItems; - @ApiModelProperty("在当前队列中的排序") + @Schema(description = "在当前队列中的排序") private Long rankPosition; public GenerateCollectionVO(Long rankPosition) { diff --git a/src/main/java/com/ai/da/model/vo/GenerateLikeVO.java b/src/main/java/com/ai/da/model/vo/GenerateLikeVO.java index bdc2ffa4..3d1bdb8e 100644 --- a/src/main/java/com/ai/da/model/vo/GenerateLikeVO.java +++ b/src/main/java/com/ai/da/model/vo/GenerateLikeVO.java @@ -1,14 +1,13 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("generate like 响应") +@Schema(description = "generate like 响应") public class GenerateLikeVO { - @ApiModelProperty("like的图片加入library的id") + @Schema(description = "like的图片加入library的id") private Long libraryId; public GenerateLikeVO(Long libraryId) { diff --git a/src/main/java/com/ai/da/model/vo/GenerateResultVO.java b/src/main/java/com/ai/da/model/vo/GenerateResultVO.java index ce983138..9e504c3b 100644 --- a/src/main/java/com/ai/da/model/vo/GenerateResultVO.java +++ b/src/main/java/com/ai/da/model/vo/GenerateResultVO.java @@ -1,12 +1,13 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @Data -@ApiModel("generate result 响应") +@Schema(description = "generate result 响应") @AllArgsConstructor @NoArgsConstructor public class GenerateResultVO { diff --git a/src/main/java/com/ai/da/model/vo/GetNextSysElementVO.java b/src/main/java/com/ai/da/model/vo/GetNextSysElementVO.java index 12dd8e70..a6f8f269 100644 --- a/src/main/java/com/ai/da/model/vo/GetNextSysElementVO.java +++ b/src/main/java/com/ai/da/model/vo/GetNextSysElementVO.java @@ -1,22 +1,21 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @AllArgsConstructor @Data -@ApiModel("切换系统element 响应") +@Schema(description = "切换系统element 响应") public class GetNextSysElementVO { - @ApiModelProperty("对应的上游id") + @Schema(description = "对应的上游id") private Long id; - @ApiModelProperty("对应的类型 有Hairstyle Earring Body") + @Schema(description = "对应的类型 有Hairstyle Earring Body") private String type; - @ApiModelProperty("对应的图片的绝对路径") + @Schema(description = "对应的图片的绝对路径") private String path; public GetNextSysElementVO() { diff --git a/src/main/java/com/ai/da/model/vo/HistoryUpdateVO.java b/src/main/java/com/ai/da/model/vo/HistoryUpdateVO.java index 93d50a73..f57ace4d 100644 --- a/src/main/java/com/ai/da/model/vo/HistoryUpdateVO.java +++ b/src/main/java/com/ai/da/model/vo/HistoryUpdateVO.java @@ -1,7 +1,6 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,13 +8,13 @@ import java.util.List; @AllArgsConstructor @Data -@ApiModel("HistoryUpdateVO-响应") +@Schema(description = "HistoryUpdateVO-响应") public class HistoryUpdateVO { - @ApiModelProperty("分组名") + @Schema(description = "分组名") private String name; - @ApiModelProperty("更新时间") + @Schema(description = "更新时间") private Long updateDate; } diff --git a/src/main/java/com/ai/da/model/vo/LibraryModelPointVO.java b/src/main/java/com/ai/da/model/vo/LibraryModelPointVO.java index f0512a5d..c3986a2e 100644 --- a/src/main/java/com/ai/da/model/vo/LibraryModelPointVO.java +++ b/src/main/java/com/ai/da/model/vo/LibraryModelPointVO.java @@ -1,7 +1,6 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -14,34 +13,34 @@ import java.util.List; * @author easy-generator * @since 2022-11-13 */ -@ApiModel("template打点响应") +@Schema(description = "template打点响应") @Data public class LibraryModelPointVO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("relationId") + @Schema(description = "relationId") private Long relationId; - @ApiModelProperty("templateId") + @Schema(description = "templateId") private Long templateId; - @ApiModelProperty("左肩") + @Schema(description = "左肩") private List shoulderLeft; - @ApiModelProperty("右肩") + @Schema(description = "右肩") private List shoulderRight; - @ApiModelProperty("左腰") + @Schema(description = "左腰") private List waistbandLeft; - @ApiModelProperty("右腰") + @Schema(description = "右腰") private List waistbandRight; - @ApiModelProperty("左手") + @Schema(description = "左手") private List handLeft; - @ApiModelProperty("右手") + @Schema(description = "右手") private List handRight; } diff --git a/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java b/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java index d135196d..2ac222af 100644 --- a/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java +++ b/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java @@ -1,9 +1,9 @@ -package com.ai.da.model.vo; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -15,39 +15,39 @@ import java.io.Serializable; * @since 2022-06-13 */ @Data -@ApiModel("Library上传-响应") +@Schema(description = "Library上传-响应") public class LibraryUpdateVo implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("library ID") + @Schema(description = "library ID") @TableId(value = "id", type = IdType.AUTO) private Long id; private String modelType; - @ApiModelProperty("用户ID") + @Schema(description = "用户ID") private Long accountId; - @ApiModelProperty("一级类型") + @Schema(description = "一级类型") private String level1Type; - @ApiModelProperty("二级类型") + @Schema(description = "二级类型") private String level2Type; - @ApiModelProperty("年龄段") + @Schema(description = "年龄段") private String ageGroup; - @ApiModelProperty("名字") + @Schema(description = "名字") private String name; - @ApiModelProperty("存放地址") + @Schema(description = "存放地址") private String url; - @ApiModelProperty("存放地址") + @Schema(description = "存放地址") private String minIOPath; - @ApiModelProperty("校验md5") + @Schema(description = "校验md5") private Boolean checkMd5; } diff --git a/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java b/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java index b1d19870..66c7af86 100644 --- a/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java +++ b/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java @@ -1,7 +1,6 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,7 +8,7 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; @Data -@ApiModel("generate result 响应") +@Schema(description = "generate result 响应") @AllArgsConstructor @NoArgsConstructor public class MagicToolResultVO { @@ -42,7 +41,7 @@ public class MagicToolResultVO { private String errorMessage; - @ApiModelProperty("用户输入的提示词") + @Schema(description = "用户输入的提示词") private String prompt; public MagicToolResultVO(String taskId, String status) { diff --git a/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java b/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java index e00404d7..21156ae4 100644 --- a/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java +++ b/src/main/java/com/ai/da/model/vo/ModuleChooseVO.java @@ -1,10 +1,10 @@ package com.ai.da.model.vo; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.ToProductElement; import com.ai.da.model.dto.PortfolioDTO; import com.ai.da.model.dto.ToProductImageDTO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -14,7 +14,7 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Data -@ApiModel("用户choose详细-响应") +@Schema(description = "用户choose详细-响应") public class ModuleChooseVO { private Long projectId; private Long collectionId; diff --git a/src/main/java/com/ai/da/model/vo/PageQueryBaseVo.java b/src/main/java/com/ai/da/model/vo/PageQueryBaseVo.java index fa4f8b8f..1cbd0569 100644 --- a/src/main/java/com/ai/da/model/vo/PageQueryBaseVo.java +++ b/src/main/java/com/ai/da/model/vo/PageQueryBaseVo.java @@ -1,22 +1,21 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import jakarta.validation.constraints.Min; - - -@Data -@ApiModel("分页查询") -public class PageQueryBaseVo { - - @ApiModelProperty("页码") - @Min(value = 0, message = "page最小值为1") - private Integer page = 1; - - @ApiModelProperty("每页数量") - @Min(value = 0, message = "The minimum size is 1") -// @Max(value = 50, message = "The maximum size is 50") - private Integer size = 20; -} +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import jakarta.validation.constraints.Min; + + +@Data +@Schema(description = "分页查询") +public class PageQueryBaseVo { + + @Schema(description = "页码") + @Min(value = 0, message = "page最小值为1") + private Integer page = 1; + + @Schema(description = "每页数量") + @Min(value = 0, message = "The minimum size is 1") +// @Max(value = 50, message = "The maximum size is 50") + private Integer size = 20; +} diff --git a/src/main/java/com/ai/da/model/vo/PantoneVO.java b/src/main/java/com/ai/da/model/vo/PantoneVO.java index 1c3cf218..c5e353a2 100644 --- a/src/main/java/com/ai/da/model/vo/PantoneVO.java +++ b/src/main/java/com/ai/da/model/vo/PantoneVO.java @@ -1,41 +1,40 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @NoArgsConstructor @Data -@ApiModel("潘通-响应") +@Schema(description = "潘通-响应") public class PantoneVO { - @ApiModelProperty("id -> pantoneIndex") + @Schema(description = "id -> pantoneIndex") private Integer id; - @ApiModelProperty("名字") + @Schema(description = "名字") private String name; - @ApiModelProperty("tcx值") + @Schema(description = "tcx值") private String tcx; - @ApiModelProperty("r") + @Schema(description = "r") private Integer r; - @ApiModelProperty("g") + @Schema(description = "g") private Integer g; - @ApiModelProperty("b") + @Schema(description = "b") private Integer b; - @ApiModelProperty("h") + @Schema(description = "h") private Integer h; - @ApiModelProperty("s") + @Schema(description = "s") private Integer s; - @ApiModelProperty("v") + @Schema(description = "v") private Integer v; public PantoneVO(String name, String tcx) { diff --git a/src/main/java/com/ai/da/model/vo/PaymentInfoVO.java b/src/main/java/com/ai/da/model/vo/PaymentInfoVO.java index 98ac7f14..9bf3262b 100644 --- a/src/main/java/com/ai/da/model/vo/PaymentInfoVO.java +++ b/src/main/java/com/ai/da/model/vo/PaymentInfoVO.java @@ -1,35 +1,35 @@ package com.ai.da.model.vo; +import io.swagger.v3.oas.annotations.media.Schema; + import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; @NoArgsConstructor @Data -@ApiModel("交易记录详情") +@Schema(description = "交易记录详情") public class PaymentInfoVO { private Long id; - @ApiModelProperty("付款用户名") + @Schema(description = "付款用户名") private String payer; - @ApiModelProperty("付款者邮箱") + @Schema(description = "付款者邮箱") private String email; - @ApiModelProperty("选择的支付平台 PayPal || Stripe || Alipay-HK") + @Schema(description = "选择的支付平台 PayPal || Stripe || Alipay-HK") private String platform; - @ApiModelProperty("支付的金额 单位:HKD") + @Schema(description = "支付的金额 单位:HKD") private String payerTotal; - @ApiModelProperty("商品种类 new || renewal || credits") + @Schema(description = "商品种类 new || renewal || credits") private String type; - @ApiModelProperty("交易状态 Success || Fail || Pending") + @Schema(description = "交易状态 Success || Fail || Pending") private String status; - @ApiModelProperty("付款人所在国家") + @Schema(description = "付款人所在国家") private String country; - @ApiModelProperty("付款人所在城市") + @Schema(description = "付款人所在城市") private String city; - @ApiModelProperty("使用Stripe具体的支付方式") + @Schema(description = "使用Stripe具体的支付方式") private String paymentMethod; - @ApiModelProperty("信用卡支付的卡号后四位") + @Schema(description = "信用卡支付的卡号后四位") private String last4; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private String createTime; diff --git a/src/main/java/com/ai/da/model/vo/PersonalHomepageVO.java b/src/main/java/com/ai/da/model/vo/PersonalHomepageVO.java index b6f0f058..2f31a225 100644 --- a/src/main/java/com/ai/da/model/vo/PersonalHomepageVO.java +++ b/src/main/java/com/ai/da/model/vo/PersonalHomepageVO.java @@ -1,31 +1,30 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("个人主页返回信息") +@Schema(description = "个人主页返回信息") public class PersonalHomepageVO { - @ApiModelProperty("用户名") + @Schema(description = "用户名") private String userName; - @ApiModelProperty("用户头像") + @Schema(description = "用户头像") private String avatar; - @ApiModelProperty("用户作品总数") + @Schema(description = "用户作品总数") private Long portfolioCount; - @ApiModelProperty("粉丝总数") + @Schema(description = "粉丝总数") private Long followerCount; - @ApiModelProperty("关注者总数") + @Schema(description = "关注者总数") private Long followeeCount; - @ApiModelProperty("个人主页总浏览量") + @Schema(description = "个人主页总浏览量") private Long homepageViewCount; - @ApiModelProperty("是否关注了主页用户") + @Schema(description = "是否关注了主页用户") private Integer isFollow; } diff --git a/src/main/java/com/ai/da/model/vo/PrepareForGenerateVO.java b/src/main/java/com/ai/da/model/vo/PrepareForGenerateVO.java index 733141d8..c07c9170 100644 --- a/src/main/java/com/ai/da/model/vo/PrepareForGenerateVO.java +++ b/src/main/java/com/ai/da/model/vo/PrepareForGenerateVO.java @@ -1,19 +1,18 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel("prepare for generate响应vo") +@Schema(description = "prepare for generate响应vo") public class PrepareForGenerateVO { - @ApiModelProperty("uniqueId") + @Schema(description = "uniqueId") private List uniqueId; - @ApiModelProperty("剩余使用次数") + @Schema(description = "剩余使用次数") private Integer status; public PrepareForGenerateVO(List uniqueId, Integer status) { diff --git a/src/main/java/com/ai/da/model/vo/ProjectChooseVO.java b/src/main/java/com/ai/da/model/vo/ProjectChooseVO.java index 309e971a..8b873c42 100644 --- a/src/main/java/com/ai/da/model/vo/ProjectChooseVO.java +++ b/src/main/java/com/ai/da/model/vo/ProjectChooseVO.java @@ -1,8 +1,8 @@ package com.ai.da.model.vo; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.model.dto.PortfolioDTO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -10,7 +10,7 @@ import java.util.List; @AllArgsConstructor @Data -@ApiModel("用户choose详细-响应") +@Schema(description = "用户choose详细-响应") public class ProjectChooseVO { private Long id; diff --git a/src/main/java/com/ai/da/model/vo/ProjectVO.java b/src/main/java/com/ai/da/model/vo/ProjectVO.java index 498c4060..1ce50b3d 100644 --- a/src/main/java/com/ai/da/model/vo/ProjectVO.java +++ b/src/main/java/com/ai/da/model/vo/ProjectVO.java @@ -1,22 +1,22 @@ package com.ai.da.model.vo; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.Project; import com.ai.da.mapper.primary.entity.UserLikeGroup; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data -@ApiModel("用户savedCollection分组-响应") +@Schema(description = "用户savedCollection分组-响应") public class ProjectVO extends Project { -// @ApiModelProperty("分组ID") +// @Schema(description = "分组ID") // private Long id; private UserLikeGroupVO userLikeGroupVO; -// @ApiModelProperty("更新时间") +// @Schema(description = "更新时间") private Long updateDate; } diff --git a/src/main/java/com/ai/da/model/vo/QueryLibraryPageVO.java b/src/main/java/com/ai/da/model/vo/QueryLibraryPageVO.java index b46a8159..3f17fba9 100644 --- a/src/main/java/com/ai/da/model/vo/QueryLibraryPageVO.java +++ b/src/main/java/com/ai/da/model/vo/QueryLibraryPageVO.java @@ -1,43 +1,42 @@ -package com.ai.da.model.vo; - -import com.ai.da.model.enums.BizJson; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel("Library分页-响应") -public class QueryLibraryPageVO { - - @ApiModelProperty("Library ID") - private Long id; - - @ApiModelProperty("用户ID") - private Long accountId; - - @ApiModelProperty("一级类型") - private String level1Type; - - @ApiModelProperty("二级类型") - private String level2Type; - - @ApiModelProperty("三级类型") - private String level3Type; - - @ApiModelProperty("design类型 用户design生成时候区别library和collection") - private String designType; - - @ApiModelProperty("图片名字") - private String name; - - @ApiModelProperty("图片地址") - private String url; - - @ApiModelProperty("图片minio地址") - private String minIOPath; - - @ApiModelProperty("template 打点内容 level1Type为Models才传") - private LibraryModelPointVO libraryModelPoint; - - private BizJson level2TypeEnum; -} +package com.ai.da.model.vo; + +import com.ai.da.model.enums.BizJson; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "Library分页-响应") +public class QueryLibraryPageVO { + + @Schema(description = "Library ID") + private Long id; + + @Schema(description = "用户ID") + private Long accountId; + + @Schema(description = "一级类型") + private String level1Type; + + @Schema(description = "二级类型") + private String level2Type; + + @Schema(description = "三级类型") + private String level3Type; + + @Schema(description = "design类型 用户design生成时候区别library和collection") + private String designType; + + @Schema(description = "图片名字") + private String name; + + @Schema(description = "图片地址") + private String url; + + @Schema(description = "图片minio地址") + private String minIOPath; + + @Schema(description = "template 打点内容 level1Type为Models才传") + private LibraryModelPointVO libraryModelPoint; + + private BizJson level2TypeEnum; +} diff --git a/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java b/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java index 37422556..852ca839 100644 --- a/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java +++ b/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java @@ -1,7 +1,6 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +8,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("按条件筛选试用用户") +@Schema(description = "按条件筛选试用用户") public class QueryUserConditionsVO extends PageQueryBaseVo { @@ -27,7 +26,7 @@ public class QueryUserConditionsVO extends PageQueryBaseVo { private String endTime; - @ApiModelProperty("Ascending（升序） || Descending（降序）") + @Schema(description = "Ascending（升序） || Descending（降序）") private String order; // by id | time | credits diff --git a/src/main/java/com/ai/da/model/vo/SubscriptionPlanVO.java b/src/main/java/com/ai/da/model/vo/SubscriptionPlanVO.java index 9a9897f2..03ed784c 100644 --- a/src/main/java/com/ai/da/model/vo/SubscriptionPlanVO.java +++ b/src/main/java/com/ai/da/model/vo/SubscriptionPlanVO.java @@ -1,6 +1,6 @@ package com.ai.da.model.vo; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; @@ -9,28 +9,28 @@ import java.time.LocalDateTime; @Data public class SubscriptionPlanVO { - @ApiModelProperty("id") + @Schema(description = "id") private Long id; - @ApiModelProperty("组织id") + @Schema(description = "组织id") private Long organizationId; - @ApiModelProperty("当前订阅开始时间") + @Schema(description = "当前订阅开始时间") private Long currentPeriodStart; - @ApiModelProperty("当前订阅结束时间") + @Schema(description = "当前订阅结束时间") private Long currentPeriodEnd; - @ApiModelProperty("当前订阅总的子账号数量") + @Schema(description = "当前订阅总的子账号数量") private Integer accountNum; - @ApiModelProperty("当前订阅可用积分上限") + @Schema(description = "当前订阅可用积分上限") private BigDecimal creditLimit; - @ApiModelProperty("管理员账户id") + @Schema(description = "管理员账户id") private Long adminAccId; - @ApiModelProperty("创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; diff --git a/src/main/java/com/ai/da/model/vo/SysFileVO.java b/src/main/java/com/ai/da/model/vo/SysFileVO.java index dd03260d..abac50f5 100644 --- a/src/main/java/com/ai/da/model/vo/SysFileVO.java +++ b/src/main/java/com/ai/da/model/vo/SysFileVO.java @@ -1,12 +1,13 @@ -package com.ai.da.model.vo; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.annotations.ApiModel; import lombok.Data; import java.io.Serializable; @Data -@ApiModel("系统文件-响应") +@Schema(description = "系统文件-响应") public class SysFileVO implements Serializable { /** diff --git a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java index 72c28642..8b4b8cc5 100644 --- a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java +++ b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java @@ -1,11 +1,11 @@ package com.ai.da.model.vo; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.TDesignPythonOutfitDetail; import lombok.Data; import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; - /** * design item详情表视图实体类 * @@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModel; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "TDesignPythonOutfitDetailVO对象", description = "design item详情表") +@Schema(description = "design item详情表") public class TDesignPythonOutfitDetailVO extends TDesignPythonOutfitDetail { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java index 065d963b..53282ae7 100644 --- a/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java +++ b/src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java @@ -1,12 +1,12 @@ package com.ai.da.model.vo; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.TDesignPythonOutfit; import lombok.Data; import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; - /** * design item表 存对应design的8张图片视图实体类 * @@ -15,7 +15,7 @@ import io.swagger.annotations.ApiModel; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "TDesignPythonOutfitVO对象", description = "design item表 存对应design的8张图片") +@Schema(description = "design item表 存对应design的8张图片") public class TDesignPythonOutfitVO extends TDesignPythonOutfit { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java b/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java index 1ce7ebc8..771c4f1c 100644 --- a/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java +++ b/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java @@ -1,7 +1,8 @@ package com.ai.da.model.vo; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.ToProductImageResult; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @@ -12,8 +13,8 @@ public class ToProductImageResultVO extends ToProductImageResult implements AllC private Long userLikeSortId; private String relationType; private Long parentId; - @ApiModelProperty("用户输入的提示词") + @Schema(description = "用户输入的提示词") private String prompt; - @ApiModelProperty("姿势序号") + @Schema(description = "姿势序号") private Integer poseId; } diff --git a/src/main/java/com/ai/da/model/vo/ToProductImageVO.java b/src/main/java/com/ai/da/model/vo/ToProductImageVO.java index baadca86..5332fefc 100644 --- a/src/main/java/com/ai/da/model/vo/ToProductImageVO.java +++ b/src/main/java/com/ai/da/model/vo/ToProductImageVO.java @@ -1,14 +1,15 @@ package com.ai.da.model.vo; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.mapper.primary.entity.ToProductImageResult; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class ToProductImageVO extends ToProductImageResult { - @ApiModelProperty("collection sort中的parentId, 在这里是父级的userLikeSortId") + @Schema(description = "collection sort中的parentId, 在这里是父级的userLikeSortId") private Long parentId; - @ApiModelProperty("collection sort中的id, 在这里是用的子集里元素的userLikeSortId") + @Schema(description = "collection sort中的id, 在这里是用的子集里元素的userLikeSortId") private Long userLikeSortId; } diff --git a/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java b/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java index 0bbc9230..d44c67ca 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java @@ -1,8 +1,8 @@ -package com.ai.da.model.vo; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import com.ai.da.model.dto.PortfolioDTO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -10,16 +10,16 @@ import java.util.List; @AllArgsConstructor @Data -@ApiModel("用户choose详细-响应") +@Schema(description = "用户choose详细-响应") public class UserLikeChooseVO { - @ApiModelProperty("分组id") + @Schema(description = "分组id") private Long userGroupId; - @ApiModelProperty("分组详细数组") + @Schema(description = "分组详细数组") private List userLikeDetails; - @ApiModelProperty("关联的collection") + @Schema(description = "关联的collection") private UserLikeCollectionVO collection; private String sex; diff --git a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java index 8850ae66..f436412b 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java @@ -1,7 +1,6 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,31 +8,31 @@ import java.util.List; @Data @EqualsAndHashCode -@ApiModel("用户关联的collection-响应") +@Schema(description = "用户关联的collection-响应") public class UserLikeCollectionVO { - @ApiModelProperty("collectionId") + @Schema(description = "collectionId") private Long collectionId; - @ApiModelProperty("mood版本id 没有传null") + @Schema(description = "mood版本id 没有传null") private String moodTemplateId; private String moodTemplateUrl; private String moodTemplateName; - @ApiModelProperty("情绪板图片 数组") + @Schema(description = "情绪板图片 数组") private List moodBoards; - @ApiModelProperty("印花板图片 数组") + @Schema(description = "印花板图片 数组") private List printBoards; - @ApiModelProperty("颜色板RGB值 数组") + @Schema(description = "颜色板RGB值 数组") private List colorBoards; - @ApiModelProperty("手稿板图片 数组") + @Schema(description = "手稿板图片 数组") private List sketchBoards; - @ApiModelProperty("市场手稿板图片 数组") + @Schema(description = "市场手稿板图片 数组") private List marketingSketchs; private String moodboardPosition; diff --git a/src/main/java/com/ai/da/model/vo/UserLikeGroupVO.java b/src/main/java/com/ai/da/model/vo/UserLikeGroupVO.java index 34d207b6..4ba69b88 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeGroupVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeGroupVO.java @@ -1,25 +1,24 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel("用户savedCollection分组-响应") +@Schema(description = "用户savedCollection分组-响应") public class UserLikeGroupVO { - @ApiModelProperty("分组ID") + @Schema(description = "分组ID") private Long id; - @ApiModelProperty("collectionId") + @Schema(description = "collectionId") private Long collectionId; - @ApiModelProperty("分组名") + @Schema(description = "分组名") private String name; - @ApiModelProperty("创建者") + @Schema(description = "创建者") private String author; private Integer original; @@ -28,13 +27,13 @@ public class UserLikeGroupVO { private Long originalPortfolioId; - @ApiModelProperty("更新时间") + @Schema(description = "更新时间") private Long updateDate; - @ApiModelProperty("sketchCount") + @Schema(description = "sketchCount") private Integer sketchCount; - @ApiModelProperty("分组对应的详情 一次行带出来") + @Schema(description = "分组对应的详情 一次行带出来") private List groupDetails; private String originalAccountName; diff --git a/src/main/java/com/ai/da/model/vo/UserLikeVO.java b/src/main/java/com/ai/da/model/vo/UserLikeVO.java index c5e3adcd..04544636 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeVO.java @@ -1,28 +1,27 @@ -package com.ai.da.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel("用户分组详情-响应") +@Schema(description = "用户分组详情-响应") public class UserLikeVO implements AllCollectionVO{ - @ApiModelProperty("分组详情id") + @Schema(description = "分组详情id") private Long id; private Long userLikeGroupId; - @ApiModelProperty("designId") + @Schema(description = "designId") private Long designId; - @ApiModelProperty("designItemId") + @Schema(description = "designItemId") private Long designItemId; - @ApiModelProperty("designPythonOutfitId") + @Schema(description = "designPythonOutfitId") private Long designOutfitId; - @ApiModelProperty("图片路径") + @Schema(description = "图片路径") private String url; - @ApiModelProperty("图片路径") + @Schema(description = "图片路径") private String designOutfitUrl; private String pictureName; diff --git a/src/main/java/com/ai/da/model/vo/UserPreferenceLogTestDTO.java b/src/main/java/com/ai/da/model/vo/UserPreferenceLogTestDTO.java index e69de29b..20fb8a21 100644 --- a/src/main/java/com/ai/da/model/vo/UserPreferenceLogTestDTO.java +++ b/src/main/java/com/ai/da/model/vo/UserPreferenceLogTestDTO.java @@ -0,0 +1,17 @@ +package com.ai.da.model.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +public class UserPreferenceLogTestDTO implements Serializable { + private static final long serialVersionUID = 1L; + + private Long id; + private Long userLikeGroupId; + private Long accountId; + private String path; + private LocalDateTime dataTime; +} diff --git a/src/main/java/com/ai/da/model/vo/ValidateElementVO.java b/src/main/java/com/ai/da/model/vo/ValidateElementVO.java index 682b3da2..a3cdb8ff 100644 --- a/src/main/java/com/ai/da/model/vo/ValidateElementVO.java +++ b/src/main/java/com/ai/da/model/vo/ValidateElementVO.java @@ -1,17 +1,18 @@ -package com.ai.da.model.vo; +package com.ai.da.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; import com.ai.da.mapper.primary.entity.CollectionElement; import com.ai.da.model.dto.CollectionColorDTO; import com.ai.da.model.dto.MannequinDTO; import com.ai.da.python.vo.DesignPythonItemPrint; import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModel; import lombok.Data; import java.util.List; @Data -@ApiModel("校验element响应") +@Schema(description = "校验element响应") public class ValidateElementVO { List MoodBoardElements; diff --git a/src/main/java/com/ai/da/model/vo/WorkspaceVO.java b/src/main/java/com/ai/da/model/vo/WorkspaceVO.java index 5a117ac5..0b26d08e 100644 --- a/src/main/java/com/ai/da/model/vo/WorkspaceVO.java +++ b/src/main/java/com/ai/da/model/vo/WorkspaceVO.java @@ -1,13 +1,13 @@ package com.ai.da.model.vo; +import io.swagger.v3.oas.annotations.media.Schema; + import com.ai.da.common.response.PageBaseResponse; import com.ai.da.mapper.primary.entity.Workspace; import com.ai.da.model.enums.BizJson; import lombok.Data; import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; - import java.util.List; import java.util.Map; @@ -19,7 +19,7 @@ import java.util.Map; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "WorkspaceVO对象", description = "WorkspaceVO对象") +@Schema(description = "WorkspaceVO对象") public class WorkspaceVO extends Workspace { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java b/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java index 70e6521e..26e47afc 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java @@ -1,7 +1,7 @@ package com.ai.da.python.vo; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; import java.util.List; @@ -9,15 +9,15 @@ import java.util.List; @Data public class DesignPythonItemElement { - @ApiModelProperty("print的位置 传 [[0.2, 0.2]]") + @Schema(description = "print的位置 传 [[0.2, 0.2]]") private List> location = new ArrayList<>(); private List element_path_list = new ArrayList<>(); - @ApiModelProperty("print的缩放比例 传 [0.2, 0.2]") + @Schema(description = "print的缩放比例 传 [0.2, 0.2]") private List> element_scale_list = new ArrayList<>(); - @ApiModelProperty("print的旋转角度 传 [0.2, 0.2]") + @Schema(description = "print的旋转角度 传 [0.2, 0.2]") private List element_angle_list = new ArrayList<>(); public DesignPythonItemElement() { diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java index a4f980bb..d73dc809 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java @@ -1,47 +1,47 @@ package com.ai.da.python.vo; -import com.alibaba.fastjson.annotation.JSONField; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import com.alibaba.fastjson.annotation.JSONField; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; @Data public class DesignPythonItemPrint { /** * print 绝对路径 */ - @ApiModelProperty("图片绝对路径") + @Schema(description = "图片绝对路径") private String path; private List print_path_list = new ArrayList<>(); - @ApiModelProperty("上传时候对应的类型,一级类型 Printboard ") + @Schema(description = "上传时候对应的类型,一级类型 Printboard ") private String level1Type; /** * print_scale */ - @ApiModelProperty("print_scale") + @Schema(description = "print_scale") private Float scale; /** * 是否打点 */ - @ApiModelProperty("是否打点 是传true 否则false") + @Schema(description = "是否打点 是传true 否则false") private Boolean ifSingle; - @ApiModelProperty("print的位置 传 [[0.2, 0.2]]") + @Schema(description = "print的位置 传 [[0.2, 0.2]]") private List> location = new ArrayList<>(); - @ApiModelProperty("print的缩放比例 传 [0.2, 0.2]") + @Schema(description = "print的缩放比例 传 [0.2, 0.2]") private List> print_scale_list = new ArrayList<>(); - @ApiModelProperty("print的旋转角度 传 [0.2, 0.2]") + @Schema(description = "print的旋转角度 传 [0.2, 0.2]") private List print_angle_list = new ArrayList<>(); @JSONField(name = "IfSingle")