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

接口修改: 将designSingle与editLayer接口合并

Browse Source
This commit is contained in:
xupei
2023-10-06 15:56:32 +08:00
parent e8cbe6f244
commit 6eb4f997c3
5 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java
View File

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
@Data
public class DesignSingleItemDTO {
@@ -26,4 +27,10 @@ public class DesignSingleItemDTO {
@ApiModelProperty("对应的print图片对象")
// private DesignPythonItemPrint printObject;
private DesignSinglePrintDTO printObject;
@ApiModelProperty("图层位置")
private List<Long> offset;
@ApiModelProperty("图层缩放比例")
private Float scale;
}

4
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -1348,7 +1348,9 @@ public class PythonService {
"none",
// todo businessId 待确认
designSingleItem.getId(),
pythonTAllInfoService.getImageIdByPath(designSingleItem.getPath())));
pythonTAllInfoService.getImageIdByPath(designSingleItem.getPath()),
designSingleItem.getOffset(),
designSingleItem.getScale()));
});

20
src/main/java/com/ai/da/python/vo/DesignPythonItem.java
View File

@@ -61,6 +61,14 @@ public class DesignPythonItem {
* url在t_sys_file中的id
*/
private Long image_id;
/**
* 图层偏移量（位置）
*/
private List<Long> offset;
/**
* 图层缩放大小
*/
private Float resize_scale;
public static List<String> OUTWEAR_DRESS_BLOUSE = Arrays.asList(CollectionLevel2TypeEnum.OUTWEAR.getRealName(),
@@ -86,6 +94,18 @@ public class DesignPythonItem {
this.image_id = image_id;
}
public DesignPythonItem(String type, String path, String color, DesignPythonItemPrint print, String icon, Long businessId, Long image_id, List<Long> offset, Float resize_scale) {
this.type = type;
this.path = path;
this.color = color;
this.print = print;
this.icon = icon;
this.businessId = businessId;
this.image_id = image_id;
this.offset = offset;
this.resize_scale = resize_scale;
}
public DesignPythonItem(String type, String path, String color, DesignPythonItemPrint print, String icon, Long businessId, Long image_id) {
this.type = type;
this.path = path;

2
src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
View File

@@ -354,7 +354,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
designPythonOutfitDetail.setImageSize(jsonObject.getString("image_size"));
designPythonOutfitDetail.setImageCategory(jsonObject.getString("image_category"));
designPythonOutfitDetail.setMaskUrl(jsonObject.getString("mask_url"));
designPythonOutfitDetail.setScale(Objects.isNull(jsonObject.getString("scale")) ? "1.0" : jsonObject.getString("scale"));
designPythonOutfitDetail.setScale(Objects.isNull(jsonObject.getString("resize_scale")) ? "1.0" : jsonObject.getString("resize_scale"));
designPythonOutfitDetail.setUserId(userId);
list.add(designPythonOutfitDetail);
}

6
src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java
View File

@@ -56,21 +56,21 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl<TDesignPyt
DesignPythonOutfitVO designPythonOutfitVO = CopyUtil.copyObject(detail,DesignPythonOutfitVO.class);
designPythonOutfitVO.setPosition(StringUtil.isNullOrEmpty(detail.getPosition()) ? null : (List<Long>) JSON.parse(detail.getPosition()));
// designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List<Long>) JSON.parse(detail.getImageSize()));
designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List<Long>) JSON.parse(detail.getImageSize()));
designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getImageUrl(),480));
designPythonOutfitVO.setImageMinioUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : detail.getImageUrl());
designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getMaskUrl(),480));
designPythonOutfitVO.setMaskMinioUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : detail.getMaskUrl());
designPythonOutfitVO.setScale(Float.parseFloat(detail.getScale()));
if (!StringUtil.isNullOrEmpty(detail.getImageSize())){
/*if (!StringUtil.isNullOrEmpty(detail.getImageSize())){
List<Long> size = Arrays.stream(detail.getImageSize().replaceAll("\\[|\\]", "").split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
ArrayList<Long> imageSize = new ArrayList<>();
for (Long aLong : size) {
imageSize.add((long) (aLong * Float.parseFloat(detail.getScale())));
}
designPythonOutfitVO.setImageSize(imageSize);
}
}*/
return designPythonOutfitVO;
}