TASK:design 渐变色;
This commit is contained in:
@@ -64,6 +64,8 @@ public class DesignItemDetail implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private String color;
|
private String color;
|
||||||
|
|
||||||
|
private String gradientString;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 对应的print图片的绝对路径
|
* 对应的print图片的绝对路径
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class CollectionColorDTO {
|
|||||||
|
|
||||||
private Gradient gradient;
|
private Gradient gradient;
|
||||||
|
|
||||||
// private String gradientString;
|
private String gradientString;
|
||||||
|
|
||||||
private String gradientMinioUrl;
|
private String gradientMinioUrl;
|
||||||
|
|
||||||
|
|||||||
@@ -1551,6 +1551,7 @@ public class PythonService {
|
|||||||
CollectionColorDTO randomColor = getRandomColor(elementVO.getColorBoards());
|
CollectionColorDTO randomColor = getRandomColor(elementVO.getColorBoards());
|
||||||
pythonItem.setColor(randomColor.getRgbValue());
|
pythonItem.setColor(randomColor.getRgbValue());
|
||||||
pythonItem.setGradient(randomColor.getGradientMinioUrl());
|
pythonItem.setGradient(randomColor.getGradientMinioUrl());
|
||||||
|
pythonItem.setGradientString(randomColor.getGradientString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1916,6 +1917,7 @@ public class PythonService {
|
|||||||
CollectionColorDTO randomColor = getRandomColor(elementVO.getColorBoards());
|
CollectionColorDTO randomColor = getRandomColor(elementVO.getColorBoards());
|
||||||
designPythonItemBlouse.setColor(randomColor.getRgbValue());
|
designPythonItemBlouse.setColor(randomColor.getRgbValue());
|
||||||
designPythonItemBlouse.setGradient(randomColor.getGradientMinioUrl());
|
designPythonItemBlouse.setGradient(randomColor.getGradientMinioUrl());
|
||||||
|
designPythonItemBlouse.setGradientString(randomColor.getGradientString());
|
||||||
if (!elementVO.getDesignPythonItemPrint().getPath().equals("none")
|
if (!elementVO.getDesignPythonItemPrint().getPath().equals("none")
|
||||||
&& elementVO.getDesignPrintPictureTypeLayoutList().contains(type)) {
|
&& elementVO.getDesignPrintPictureTypeLayoutList().contains(type)) {
|
||||||
DesignPythonItemPrint designPythonItemPrint = CopyUtil.copyObject(elementVO.getDesignPythonItemPrint(), DesignPythonItemPrint.class);
|
DesignPythonItemPrint designPythonItemPrint = CopyUtil.copyObject(elementVO.getDesignPythonItemPrint(), DesignPythonItemPrint.class);
|
||||||
@@ -1944,6 +1946,7 @@ public class PythonService {
|
|||||||
CollectionColorDTO randomColor = getRandomColor(elementVO.getColorBoards());
|
CollectionColorDTO randomColor = getRandomColor(elementVO.getColorBoards());
|
||||||
designPythonItemBlouse.setColor(randomColor.getRgbValue());
|
designPythonItemBlouse.setColor(randomColor.getRgbValue());
|
||||||
designPythonItemBlouse.setGradient(randomColor.getGradientMinioUrl());
|
designPythonItemBlouse.setGradient(randomColor.getGradientMinioUrl());
|
||||||
|
designPythonItemBlouse.setGradientString(randomColor.getGradientString());
|
||||||
if (!elementVO.getDesignPythonItemPrint().getPath().equals("none")
|
if (!elementVO.getDesignPythonItemPrint().getPath().equals("none")
|
||||||
&& elementVO.getDesignPrintPictureTypeLayoutList().contains(collectionElement.getLevel2Type())) {
|
&& elementVO.getDesignPrintPictureTypeLayoutList().contains(collectionElement.getLevel2Type())) {
|
||||||
DesignPythonItemPrint designPythonItemPrint = CopyUtil.copyObject(elementVO.getDesignPythonItemPrint(), DesignPythonItemPrint.class);
|
DesignPythonItemPrint designPythonItemPrint = CopyUtil.copyObject(elementVO.getDesignPythonItemPrint(), DesignPythonItemPrint.class);
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ public class DesignPythonItem {
|
|||||||
|
|
||||||
private String gradient;
|
private String gradient;
|
||||||
|
|
||||||
|
private String gradientString;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 对应的print图片的绝对路径
|
* 对应的print图片的绝对路径
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -360,6 +360,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
|
|||||||
String gradientMinioUrl = minioUtil.uploadImageFromBase64(gradientBucketName, base64Data, imageType);
|
String gradientMinioUrl = minioUtil.uploadImageFromBase64(gradientBucketName, base64Data, imageType);
|
||||||
colorBoard.setGradientMinioUrl(gradientMinioUrl);
|
colorBoard.setGradientMinioUrl(gradientMinioUrl);
|
||||||
colorBoard.getGradient().setColorImg(null);
|
colorBoard.getGradient().setColorImg(null);
|
||||||
|
colorBoard.setGradientString(JSON.toJSONString(colorBoard.getGradient()));
|
||||||
}
|
}
|
||||||
elementVO.setColorBoards(colorBoards);
|
elementVO.setColorBoards(colorBoards);
|
||||||
List<Long> usedElementIds = elementVO.getUsedElementIds();
|
List<Long> usedElementIds = elementVO.getUsedElementIds();
|
||||||
|
|||||||
Reference in New Issue
Block a user