aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
This commit is contained in:
shahaibo
2023-09-13 10:34:09 +08:00
parent 7a6d70c2cf 41111bc0e4
commit a08300f095
101 changed files with 1597 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java
View File

@@ -3,10 +3,8 @@ package com.ai.da.model.vo;
import com.ai.da.python.vo.DesignPythonItemPrint;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
@@ -26,8 +24,12 @@ public class DesignItemClothesDetailVO {
private String path;
@ApiModelProperty(" 颜色 存 RGB值 中间空格分隔 比如 58 58 169")
private String color;
// private String color;
private PantoneVO color;
@ApiModelProperty("对应的print图片对象")
private DesignPythonItemPrint printObject;
@ApiModelProperty("对应图层信息")
private List<DesignPythonOutfitVO> layersObject;
}

1
src/main/java/com/ai/da/model/vo/DesignItemDetailVO.java
View File

@@ -15,6 +15,7 @@ public class DesignItemDetailVO {
private Long designItemId;
@ApiModelProperty("designItem图片")
// private DesignPythonOutfitVO designItemUrl;
private String designItemUrl;
@ApiModelProperty("design高级图片")

8
src/main/java/com/ai/da/model/vo/DesignItemOthersDetailVO.java
View File

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel("designItem detail others 响应")
public class DesignItemOthersDetailVO {
@@ -19,8 +21,12 @@ public class DesignItemOthersDetailVO {
private String path;
@ApiModelProperty(" 颜色 存 RGB值 中间空格分隔 比如 58 58 169")
private String color;
// private String color;
private PantoneVO color;
@ApiModelProperty("对应的print图片的绝对路径")
private DesignPythonItemPrint printObject;
@ApiModelProperty("对应图层信息")
private List<DesignPythonOutfitVO> layersObject;
}

28
src/main/java/com/ai/da/model/vo/DesignPythonOutfitDetailVO.java Normal file
View File

@@ -0,0 +1,28 @@
package com.ai.da.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("designItem detail layer响应")
public class DesignPythonOutfitDetailVO {
@ApiModelProperty("各图层id")
private Long id;
@ApiModelProperty("图片所属分类 earring_back/front,hairstyle_back/front,skirt_back/front,shoes_left/right,body 等")
private String imageCategory;
@ApiModelProperty("图片url")
private String imageUrl;
@ApiModelProperty("蒙版url")
private String maskUrl;
@ApiModelProperty("坐标")
private String position;
@ApiModelProperty("优先级")
private Integer priority;
}

37
src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java Normal file
View File

@@ -0,0 +1,37 @@
package com.ai.da.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("designItem detail从python端获取的合成图+各图层响应")
public class DesignPythonOutfitVO {
/**
* ID
*/
@ApiModelProperty(value = "ID")
private Long id;
/**
* 图层
*/
@ApiModelProperty(value = "图层名")
private String imageCategory;
/**
* 对应的图片的绝对路径
*/
@ApiModelProperty(value = "对应的图片的绝对路径")
private String imageUrl;
/**
* mask_url
*/
@ApiModelProperty(value = "遮罩")
private String maskUrl;
/**
* 位置
*/
@ApiModelProperty(value = "位置")
private String position;
}

18
src/main/java/com/ai/da/model/vo/GenerateCaptionVO.java Normal file
View File

@@ -0,0 +1,18 @@
package com.ai.da.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@Data
@ApiModel("生成sketch的caption")
public class GenerateCaptionVO {
@ApiModelProperty("caption")
private String caption;
}

16
src/main/java/com/ai/da/model/vo/GenerateCollectionItemVO.java Normal file
View File

@@ -0,0 +1,16 @@
package com.ai.da.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("生成 ConllectionItem响应")
public class GenerateCollectionItemVO {
@ApiModelProperty("generate生成图片的id")
private Long generateItemId;
@ApiModelProperty("generate生成图片的url")
private String generateItemUrl;
}

30
src/main/java/com/ai/da/model/vo/GenerateCollectionVO.java Normal file
View File

@@ -0,0 +1,30 @@
package com.ai.da.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel("generate响应vo")
public class GenerateCollectionVO {
@ApiModelProperty("generateId")
private Long generateId;
@ApiModelProperty("collection")
private Long collectionId;
@ApiModelProperty("生成的图片信息")
private List<GenerateCollectionItemVO> generatedCollectionItems;
public GenerateCollectionVO(Long generateId, Long collectionId, List<GenerateCollectionItemVO> generatedCollectionItems) {
this.generateId = generateId;
this.collectionId = collectionId;
this.generatedCollectionItems = generatedCollectionItems;
}
public GenerateCollectionVO() {
}
}

20
src/main/java/com/ai/da/model/vo/GenerateLikeVO.java Normal file
View File

@@ -0,0 +1,20 @@
package com.ai.da.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("generate like 响应")
public class GenerateLikeVO {
@ApiModelProperty("like的图片加入library的id")
private Long libraryId;
public GenerateLikeVO(Long libraryId) {
this.libraryId = libraryId;
}
public GenerateLikeVO() {
}
}

6
src/main/java/com/ai/da/model/vo/PantoneVO.java
View File

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank;
@ApiModel("潘通-响应")
public class PantoneVO {
@ApiModelProperty("id")
@ApiModelProperty("id -> pantoneIndex")
private Integer id;
@ApiModelProperty("名字")
@@ -23,10 +23,10 @@ public class PantoneVO {
@ApiModelProperty("r")
private Integer r;
@ApiModelProperty("r")
@ApiModelProperty("g")
private Integer g;
@ApiModelProperty("r")
@ApiModelProperty("b")
private Integer b;
@ApiModelProperty("h")

1
src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java
View File

@@ -1,6 +1,5 @@
package com.ai.da.model.vo;
import com.ai.da.model.dto.CollectionColorDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

4
src/main/java/com/ai/da/model/vo/ValidateElementVO.java
View File

@@ -1,17 +1,13 @@
package com.ai.da.model.vo;
import com.ai.da.common.enums.CurrentDesignPrintPictureTypeEnum;
import com.ai.da.mapper.entity.CollectionElement;
import com.ai.da.mapper.entity.Library;
import com.ai.da.model.dto.CollectionColorDTO;
import com.ai.da.python.vo.DesignPythonItemPrint;
import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Objects;
@Data
@ApiModel("校验element响应")