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 057cca64..475e159a 100644 --- a/src/main/java/com/ai/da/model/vo/CollectionColorVO.java +++ b/src/main/java/com/ai/da/model/vo/CollectionColorVO.java @@ -3,10 +3,12 @@ package com.ai.da.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; @Data +@EqualsAndHashCode @ApiModel("设计Collection颜色板 响应") public class CollectionColorVO { diff --git a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java index 4e5f5721..ac87037f 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java @@ -3,10 +3,12 @@ package com.ai.da.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode @ApiModel("用户关联的collection-响应") public class UserLikeCollectionVO { diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 37c292d4..9c00eb84 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -673,7 +673,7 @@ public class PythonService { } if (attributeRetrievalAttrDict.getOpeningType() != null) { nonNullFields.add("openingType"); - if (tableName.equals("male_outwear") || tableName.equals("male_top")) { + if (tableName.equals("male_outwear") || tableName.equals("male_top") || tableName.equals("male_bottom")) { nonNullFields.remove("openingType"); attributeRetrievalAttrDict.setOpeningType(null); } 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 fc1455ec..dccabd81 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -187,11 +187,11 @@ public class CollectionElementServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", ids); - CollectionElement collectionElement = new CollectionElement(); - collectionElement.setCollectionId(0L); - collectionElementMapper.update(collectionElement, queryWrapper); +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.in("id", ids); +// CollectionElement collectionElement = new CollectionElement(); +// collectionElement.setCollectionId(0L); + collectionElementMapper.deleteBatchIds(ids); } @Override 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 6b911d49..6cd25d76 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java @@ -1,5 +1,6 @@ package com.ai.da.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.enums.CollectionLevel1TypeEnum; import com.ai.da.common.enums.DesignTypeEnum; @@ -129,6 +130,12 @@ public class CollectionServiceImpl extends ServiceImpl collect = response.getColorBoards().stream() + .distinct() + .collect(Collectors.toList()); + response.setColorBoards(collect); + } return response; }