BUGFIX:design 没有存储渐变色
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
package com.ai.da.model.vo;
|
package com.ai.da.model.vo;
|
||||||
|
|
||||||
|
import com.ai.da.mapper.primary.entity.Gradient;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -24,4 +25,7 @@ public class CollectionColorVO {
|
|||||||
@ApiModelProperty("潘通RGB值")
|
@ApiModelProperty("潘通RGB值")
|
||||||
private String rgbValue;
|
private String rgbValue;
|
||||||
|
|
||||||
|
@ApiModelProperty("渐变色信息")
|
||||||
|
private Gradient gradient;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import com.ai.da.mapper.primary.CollectionMapper;
|
|||||||
import com.ai.da.mapper.primary.MoodboardPositionMapper;
|
import com.ai.da.mapper.primary.MoodboardPositionMapper;
|
||||||
import com.ai.da.mapper.primary.entity.Collection;
|
import com.ai.da.mapper.primary.entity.Collection;
|
||||||
import com.ai.da.mapper.primary.entity.CollectionElement;
|
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.mapper.primary.entity.MoodboardPosition;
|
||||||
import com.ai.da.model.vo.CollectionColorVO;
|
import com.ai.da.model.vo.CollectionColorVO;
|
||||||
import com.ai.da.model.vo.CollectionElementVO;
|
import com.ai.da.model.vo.CollectionElementVO;
|
||||||
@@ -278,6 +279,12 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
d.setRgbValue(o.getColorRgb());
|
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);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2116,7 +2116,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
collectionElement.setHasPin((byte) 0);
|
collectionElement.setHasPin((byte) 0);
|
||||||
collectionElement.setColorRgb(board.getRgbValue());
|
collectionElement.setColorRgb(board.getRgbValue());
|
||||||
collectionElement.setMd5("0");
|
collectionElement.setMd5("0");
|
||||||
collectionElement.setGradientString(board.getGradientString());
|
collectionElement.setGradientString(JSON.toJSONString(board.getGradient()));
|
||||||
collectionElement.setCreateDate(new Date());
|
collectionElement.setCreateDate(new Date());
|
||||||
collectionElementMapper.insert(collectionElement);
|
collectionElementMapper.insert(collectionElement);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user