diff --git a/pom.xml b/pom.xml index f816c5ca..966478f8 100644 --- a/pom.xml +++ b/pom.xml @@ -232,7 +232,6 @@ 25.0.0 - diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Gradient.java b/src/main/java/com/ai/da/mapper/primary/entity/Gradient.java index e8d40d3b..688918f1 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Gradient.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Gradient.java @@ -2,10 +2,11 @@ package com.ai.da.mapper.primary.entity; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class Gradient { +public class Gradient implements Serializable { private List gradientList; private int angle; private int selectIndex; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/GradientItem.java b/src/main/java/com/ai/da/mapper/primary/entity/GradientItem.java index 37a8c8ca..717cf157 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/GradientItem.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/GradientItem.java @@ -2,8 +2,10 @@ package com.ai.da.mapper.primary.entity; import lombok.Data; +import java.io.Serializable; + @Data -public class GradientItem { +public class GradientItem implements Serializable { private RGBA rgba; private String left; } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/RGBA.java b/src/main/java/com/ai/da/mapper/primary/entity/RGBA.java index 9ee98a71..b0548615 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/RGBA.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/RGBA.java @@ -2,8 +2,10 @@ package com.ai.da.mapper.primary.entity; import lombok.Data; +import java.io.Serializable; + @Data -public class RGBA { +public class RGBA implements Serializable { private int r; private int g; private int b; diff --git a/src/main/java/com/ai/da/model/dto/DesignSingleIncludeLayersDTO.java b/src/main/java/com/ai/da/model/dto/DesignSingleIncludeLayersDTO.java index b2b5828d..bed41e4e 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleIncludeLayersDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleIncludeLayersDTO.java @@ -5,10 +5,11 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.List; @Data -public class DesignSingleIncludeLayersDTO { +public class DesignSingleIncludeLayersDTO implements Serializable { @ApiModelProperty("designItemId") @NotNull(message = "designItemId.cannot.be.empty") 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 4c76d5cc..11bbd0ed 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java @@ -7,10 +7,11 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.List; @Data -public class DesignSingleItemDTO { +public class DesignSingleItemDTO implements Serializable { @NotNull(message = "id.cannot.be.empty") @ApiModelProperty("切换图片对应的id") diff --git a/src/main/java/com/ai/da/model/dto/DesignSinglePrintDTO.java b/src/main/java/com/ai/da/model/dto/DesignSinglePrintDTO.java index 5d70a929..eebc36c8 100644 --- a/src/main/java/com/ai/da/model/dto/DesignSinglePrintDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignSinglePrintDTO.java @@ -5,11 +5,12 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data @ApiModel("design single 印花请求信息") -public class DesignSinglePrintDTO { +public class DesignSinglePrintDTO implements Serializable { // @ApiModelProperty("印花url") // private String path; diff --git a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java index 54818442..1d231b3d 100644 --- a/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java +++ b/src/main/java/com/ai/da/model/vo/DesignSinglePrint.java @@ -6,11 +6,12 @@ import lombok.Data; import org.hibernate.validator.constraints.Range; import javax.validation.constraints.Min; +import java.io.Serializable; import java.util.List; @Data @ApiModel("design single 印花详情") -public class DesignSinglePrint { +public class DesignSinglePrint implements Serializable { @ApiModelProperty("印花是用户上传的还是从library中选的 collection/library") private String designType; diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index ae26cc7e..691c4a39 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.SerializationUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -415,7 +416,15 @@ public class DesignItemServiceImpl extends ServiceImpl " + designSingleIncludeLayersDTO.toString()); + // 记录入参 base64数据太长,所以这里去掉 + DesignSingleIncludeLayersDTO clone = SerializationUtils.clone(designSingleIncludeLayersDTO); + clone.getDesignSingleItemDTOList().forEach( i -> { + if (!Objects.isNull(i.getGradient()) && !StringUtil.isNullOrEmpty(i.getGradient().getColorImg())){ + i.getGradient().setColorImg(null); + } + }); + + log.info("designSingle request入参 ==> " + JSONObject.toJSONString(clone)); Long userId = UserContext.getUserHolder().getId(); DesignItem designItem = selectById(designSingleIncludeLayersDTO.getDesignItemId());