From 252cd0a69cde85f695b911fb34c5a2775eb63e57 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 25 Jun 2025 11:30:36 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:design=20=E6=B2=A1=E6=9C=89=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E6=B8=90=E5=8F=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/model/vo/CollectionColorVO.java    | 4 ++++
 .../java/com/ai/da/service/impl/CollectionServiceImpl.java | 7 +++++++
 .../com/ai/da/service/impl/UserLikeGroupServiceImpl.java   | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ai/da/model/vo/CollectionColorVO.java b/src/main/java/com/ai/da/model/vo/CollectionColorVO.java
index 475e159a..0f9608d1 100644
--- a/src/main/java/com/ai/da/model/vo/CollectionColorVO.java
+++ b/src/main/java/com/ai/da/model/vo/CollectionColorVO.java
@@ -1,5 +1,6 @@
 package com.ai.da.model.vo;
 
+import com.ai.da.mapper.primary.entity.Gradient;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,4 +25,7 @@ public class CollectionColorVO {
     @ApiModelProperty("潘通RGB值")
     private String rgbValue;
 
+    @ApiModelProperty("渐变色信息")
+    private Gradient gradient;
+
 }
diff --git a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
index 454b3258..af14e0c7 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
@@ -12,6 +12,7 @@ import com.ai.da.mapper.primary.CollectionMapper;
 import com.ai.da.mapper.primary.MoodboardPositionMapper;
 import com.ai.da.mapper.primary.entity.Collection;
 import com.ai.da.mapper.primary.entity.CollectionElement;
+import com.ai.da.mapper.primary.entity.Gradient;
 import com.ai.da.mapper.primary.entity.MoodboardPosition;
 import com.ai.da.model.vo.CollectionColorVO;
 import com.ai.da.model.vo.CollectionElementVO;
@@ -278,6 +279,12 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
                 }
             }
             d.setRgbValue(o.getColorRgb());
+            // 渐变色
+            Gradient gradient = JSONObject.parseObject(o.getGradientString(), Gradient.class);
+            if (!Objects.isNull(gradient) && !StringUtil.isNullOrEmpty(gradient.getColorImg())){
+                gradient.setColorImg(null);
+            }
+            d.setGradient(gradient);
         });
     }
 }
diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
index 79c8133f..cfba0be1 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -2116,7 +2116,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                     collectionElement.setHasPin((byte) 0);
                     collectionElement.setColorRgb(board.getRgbValue());
                     collectionElement.setMd5("0");
-                    collectionElement.setGradientString(board.getGradientString());
+                    collectionElement.setGradientString(JSON.toJSONString(board.getGradient()));
                     collectionElement.setCreateDate(new Date());
                     collectionElementMapper.insert(collectionElement);
                 }