From 76618de38635ff16702a4526984f25077a1adce8 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 27 May 2024 18:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=AD=89=E6=AF=94=E7=BC=A9=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/common/RabbitMQ/MQConfig.java | 8 ++--- .../ai/da/model/dto/DesignSingleItemDTO.java | 2 +- .../ai/da/model/vo/DesignPythonOutfitVO.java | 4 +-- .../com/ai/da/python/vo/DesignPythonItem.java | 4 +-- .../da/python/vo/OutfitDetailPythonItem.java | 4 +-- .../service/impl/DesignItemServiceImpl.java | 3 +- .../ai/da/service/impl/DesignServiceImpl.java | 8 +++-- .../TDesignPythonOutfitDetailServiceImpl.java | 30 ++++++++++++++++++- 8 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java b/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java index 637fc94e..7079f02a 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java @@ -12,16 +12,16 @@ public class MQConfig { // public static final String GENERATE_QUEUE = "generate-queue-test"; // ================================================================== // public static final String GENERATE_QUEUE = "generate-queue-local"; - public static final String GENERATE_QUEUE = "generate-queue-prod"; + public static final String GENERATE_QUEUE = "generate-queue-dev"; // public static final String SR_QUEUE = "SR-queue-local"; - public static final String SR_QUEUE = "SR-queue-prod"; + public static final String SR_QUEUE = "SR-queue-dev"; // public static final String SR_RESULT_QUEUE = "SuperResolution-local"; - public static final String SR_RESULT_QUEUE = "SuperResolution-prod"; + public static final String SR_RESULT_QUEUE = "SuperResolution-dev"; // public static final String GENERATE_RESULT_QUEUE = "GenerateImage-local"; - public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod"; + public static final String GENERATE_RESULT_QUEUE = "GenerateImage-dev"; public MQConfig() { } 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 11bbd0ed..0716bf86 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java @@ -44,7 +44,7 @@ public class DesignSingleItemDTO implements Serializable { private List offset; @ApiModelProperty("图层缩放比例") - private Float scale; + private Float[] scale; @NotNull(message = "priority.cannot.be.empty") @ApiModelProperty("图层优先级") 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 37711ff1..ad19d19b 100644 --- a/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java +++ b/src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java @@ -23,7 +23,7 @@ public class DesignPythonOutfitVO { private String imageCategory; /** - * 图层大小 + * 图层大小(前后片大小) */ @ApiModelProperty(value = "图层大小") private List imageSize; @@ -55,7 +55,7 @@ public class DesignPythonOutfitVO { * 图层缩放比例 */ @ApiModelProperty(value = "缩放比例") - private Float scale = 1.0f; + private Float[] scale = new Float[]{1.0f,1.0f}; /** * 图层优先级 从10开始，优先级数字越大越靠近上层 */ diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItem.java b/src/main/java/com/ai/da/python/vo/DesignPythonItem.java index b2416fe8..1139c24a 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItem.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItem.java @@ -72,7 +72,7 @@ public class DesignPythonItem { /** * 图层缩放大小 */ - private Float resize_scale; + private Float[] resize_scale; /** * 图层优先级 */ @@ -114,7 +114,7 @@ public class DesignPythonItem { } public DesignPythonItem(String type, String path, String color, DesignPythonItemPrint print, Long businessId, - Long image_id, List offset, Float resize_scale, Integer priority, String gradient, String gradientString) { + Long image_id, List offset, Float[] resize_scale, Integer priority, String gradient, String gradientString) { this.type = type; this.path = path; this.color = color; diff --git a/src/main/java/com/ai/da/python/vo/OutfitDetailPythonItem.java b/src/main/java/com/ai/da/python/vo/OutfitDetailPythonItem.java index 92c1f7e8..34d21617 100644 --- a/src/main/java/com/ai/da/python/vo/OutfitDetailPythonItem.java +++ b/src/main/java/com/ai/da/python/vo/OutfitDetailPythonItem.java @@ -13,7 +13,7 @@ public class OutfitDetailPythonItem { private List image_size; - private Float scale; + private Float[] scale; private String image_url; @@ -22,7 +22,7 @@ public class OutfitDetailPythonItem { public OutfitDetailPythonItem() { } - public OutfitDetailPythonItem(String image_category, List position, List image_size, Float scale, String image_url, String mask_url) { + public OutfitDetailPythonItem(String image_category, List position, List image_size, Float[] scale, String image_url, String mask_url) { this.image_category = image_category; this.position = position; this.image_size = image_size; diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index 691c4a39..afb5d07e 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -586,7 +586,8 @@ public class DesignItemServiceImpl extends ServiceImpl { ArrayList imageSize = new ArrayList<>(); for (int i = 0; i < layer.getImageSize().size(); i++) { - imageSize.add((long) (layer.getImageSize().get(i) * layer.getScale())); + // todo check这里的计算是否正确 + imageSize.add((long) (layer.getImageSize().get(i) * layer.getScale()[i])); } layer.setImageSize(imageSize); if (!StringUtil.isNullOrEmpty(layer.getImageUrl())) { diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index 97a0553f..3ac8fe25 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -350,7 +350,7 @@ public class DesignServiceImpl extends ServiceImpl impleme list.add(1L); list.add(1L); item.setOffset(list); - item.setResize_scale(1f); + item.setResize_scale(new Float[]{1.0f,1.0f}); String path = item.getPath(); if (StringUtils.isEmpty(path)) { String bodyPath = item.getBody_path(); @@ -434,7 +434,7 @@ public class DesignServiceImpl extends ServiceImpl impleme list.add(1L); list.add(1L); item.setOffset(list); - item.setResize_scale(1f); + item.setResize_scale(new Float[]{1.0f,1.0f}); String path = item.getPath(); if (StringUtils.isEmpty(path)) { String bodyPath = item.getBody_path(); @@ -631,7 +631,9 @@ public class DesignServiceImpl extends ServiceImpl impleme print.setPath(designItemDetail.getPrintPath()); print.setSingleOrOverall("overall"); print.setPosition("[0.0,0.0]"); - print.setScale(1d); +// print.setScale(1d); + // todo mark 将print默认scale置为0.3 + print.setScale(0.3d); print.setAngle(0.0); print.setPriority(1); print.setCreateDate(LocalDateTime.now()); diff --git a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java index a83b84d8..875ed0a5 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java @@ -61,7 +61,8 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl) JSON.parse(detail.getOffset())); designPythonOutfitVO.setPriority(Math.abs(detail.getPriority())); // designPythonOutfitVO.setOffset(CollectionUtil.isEmpty(offset) ? Arrays.asList(0L, 0L) : offset); @@ -77,6 +78,33 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>();