From 3dc7866fba546d4b6d4e1bcab504022bae50c4d6 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Tue, 28 May 2024 11:52:33 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=E6=B8=90=E5=8F=98=E8=89=B2=E5=9B=9E?= =?UTF-8?q?=E9=80=80;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primary/entity/DesignItemDetail.java | 2 +- .../ai/da/model/dto/CollectionColorDTO.java | 2 +- .../ai/da/model/dto/DesignSingleItemDTO.java | 4 ++-- .../java/com/ai/da/python/PythonService.java | 22 +++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java index 969c306b..bfba71d1 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java @@ -64,7 +64,7 @@ public class DesignItemDetail implements Serializable { */ private String color; - private String gradientString; +// private String gradientString; /** * 对应的print图片的绝对路径 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 2820b1a9..72e59a93 100644 --- a/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java +++ b/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java @@ -30,6 +30,6 @@ public class CollectionColorDTO { // // private String gradientString; - private String gradientMinioUrl; +// private String gradientMinioUrl; } 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 0716bf86..e9f051bc 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java @@ -50,7 +50,7 @@ public class DesignSingleItemDTO implements Serializable { @ApiModelProperty("图层优先级") private Integer priority; - @ApiModelProperty("渐变 颜色") - private Gradient gradient; +// @ApiModelProperty("渐变 颜色") +// private Gradient gradient; } diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 0883dd1f..e356357a 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -2621,17 +2621,17 @@ public class PythonService { // 判断是否是渐变色 // String minioPath = null; // String gradientString = null; - if (!Objects.isNull(designSingleItem.getGradient())){ - String colorImg = designSingleItem.getGradient().getColorImg(); - if (StringUtil.isNullOrEmpty(colorImg)){ - throw new BusinessException("The base64 data of the image is empty"); - } -// minioPath = minioUtil.base64Upload(colorImg, gradientBucketName); -// designSingleItem.getGradient().setColorImg(null); -// gradientString = JSONObject.toJSONString(designSingleItem.getGradient()); - - // todo 当渐变色不为空时,是否需要将颜色置为 0 0 0 - } +// if (!Objects.isNull(designSingleItem.getGradient())){ +// String colorImg = designSingleItem.getGradient().getColorImg(); +// if (StringUtil.isNullOrEmpty(colorImg)){ +// throw new BusinessException("The base64 data of the image is empty"); +// } +//// minioPath = minioUtil.base64Upload(colorImg, gradientBucketName); +//// designSingleItem.getGradient().setColorImg(null); +//// gradientString = JSONObject.toJSONString(designSingleItem.getGradient()); +// +// // todo 当渐变色不为空时,是否需要将颜色置为 0 0 0 +// } response.add(new DesignPythonItem( designSingleItem.getType(),