From 40aad9d1a30cf690b8219da375f753b21c6366c0 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Tue, 28 May 2024 11:32:49 +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/CollectionElement.java | 2 +- .../ai/da/model/dto/CollectionColorDTO.java | 6 ++-- .../java/com/ai/da/python/PythonService.java | 12 +++---- .../impl/CollectionElementServiceImpl.java | 36 +++++++++---------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java b/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java index fa3a6df0..764ccdb2 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java @@ -75,7 +75,7 @@ public class CollectionElement implements Serializable { */ private String md5; - private String gradientString; +// private String gradientString; /** * 创建时间 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 d5581ee9..2820b1a9 100644 --- a/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java +++ b/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java @@ -26,9 +26,9 @@ public class CollectionColorDTO { @ApiModelProperty("潘通RGB值") private String rgbValue; - private Gradient gradient; - - private String gradientString; +// private Gradient gradient; +// +// private String gradientString; private String gradientMinioUrl; diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 9e9d82b0..9c77054c 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -1556,8 +1556,8 @@ public class PythonService { if (SysFileLevel2TypeEnum.SHOES.getRealName().equals(type)) { CollectionColorDTO randomColor = getRandomColor(elementVO.getColorBoards()); pythonItem.setColor(randomColor.getRgbValue()); - pythonItem.setGradient(randomColor.getGradientMinioUrl()); - pythonItem.setGradientString(randomColor.getGradientString()); +// pythonItem.setGradient(randomColor.getGradientMinioUrl()); +// pythonItem.setGradientString(randomColor.getGradientString()); } } } @@ -1922,8 +1922,8 @@ public class PythonService { designPythonItemBlouse.setIcon("none"); CollectionColorDTO randomColor = getRandomColor(elementVO.getColorBoards()); designPythonItemBlouse.setColor(randomColor.getRgbValue()); - designPythonItemBlouse.setGradient(randomColor.getGradientMinioUrl()); - designPythonItemBlouse.setGradientString(randomColor.getGradientString()); +// designPythonItemBlouse.setGradient(randomColor.getGradientMinioUrl()); +// designPythonItemBlouse.setGradientString(randomColor.getGradientString()); if (!elementVO.getDesignPythonItemPrint().getPath().equals("none") && elementVO.getDesignPrintPictureTypeLayoutList().contains(type)) { DesignPythonItemPrint designPythonItemPrint = CopyUtil.copyObject(elementVO.getDesignPythonItemPrint(), DesignPythonItemPrint.class); @@ -1951,8 +1951,8 @@ public class PythonService { designPythonItemBlouse.setIcon("none"); CollectionColorDTO randomColor = getRandomColor(elementVO.getColorBoards()); designPythonItemBlouse.setColor(randomColor.getRgbValue()); - designPythonItemBlouse.setGradient(randomColor.getGradientMinioUrl()); - designPythonItemBlouse.setGradientString(randomColor.getGradientString()); +// designPythonItemBlouse.setGradient(randomColor.getGradientMinioUrl()); +// designPythonItemBlouse.setGradientString(randomColor.getGradientString()); if (!elementVO.getDesignPythonItemPrint().getPath().equals("none") && elementVO.getDesignPrintPictureTypeLayoutList().contains(collectionElement.getLevel2Type())) { DesignPythonItemPrint designPythonItemPrint = CopyUtil.copyObject(elementVO.getDesignPythonItemPrint(), DesignPythonItemPrint.class); diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 3f873a9b..0d91c379 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -351,20 +351,20 @@ public class CollectionElementServiceImpl extends ServiceImpl colorBoards = elementVO.getColorBoards(); - for (CollectionColorDTO colorBoard : colorBoards) { - if (Objects.nonNull(colorBoard.getGradient())) { - String colorImg = colorBoard.getGradient().getColorImg(); - String[] parts = colorImg.split(","); - String imageType = parts[0].split("/")[1].split(";")[0]; - String base64Data = parts[1]; - String gradientMinioUrl = minioUtil.uploadImageFromBase64(gradientBucketName, base64Data, imageType); - colorBoard.setGradientMinioUrl(gradientMinioUrl); - colorBoard.getGradient().setColorImg(null); - colorBoard.setGradientString(JSON.toJSONString(colorBoard.getGradient())); - } - } - elementVO.setColorBoards(colorBoards); +// List colorBoards = elementVO.getColorBoards(); +// for (CollectionColorDTO colorBoard : colorBoards) { +// if (Objects.nonNull(colorBoard.getGradient())) { +// String colorImg = colorBoard.getGradient().getColorImg(); +// String[] parts = colorImg.split(","); +// String imageType = parts[0].split("/")[1].split(";")[0]; +// String base64Data = parts[1]; +// String gradientMinioUrl = minioUtil.uploadImageFromBase64(gradientBucketName, base64Data, imageType); +// colorBoard.setGradientMinioUrl(gradientMinioUrl); +// colorBoard.getGradient().setColorImg(null); +// colorBoard.setGradientString(JSON.toJSONString(colorBoard.getGradient())); +// } +// } +// elementVO.setColorBoards(colorBoards); List usedElementIds = elementVO.getUsedElementIds(); List libraryCollectionElements = elementVO.getLibraryCollectionElements(); List generateCollectionElements = elementVO.getGenerateCollectionElements(); @@ -783,10 +783,10 @@ public class CollectionElementServiceImpl extends ServiceImpl