aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX:色块重复

Browse Source
This commit is contained in:
shahaibo
2024-05-23 16:38:40 +08:00
parent 031d71bf99
commit 02b3a407a9
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/model/vo/CollectionColorVO.java
View File

@@ -3,10 +3,12 @@ package com.ai.da.model.vo;
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;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@Data @Data
@EqualsAndHashCode
@ApiModel("设计Collection颜色板 响应") @ApiModel("设计Collection颜色板 响应")
public class CollectionColorVO { public class CollectionColorVO {

2
src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java
View File

@@ -3,10 +3,12 @@ package com.ai.da.model.vo;
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;
import lombok.EqualsAndHashCode;
import java.util.List; import java.util.List;
@Data @Data
@EqualsAndHashCode
@ApiModel("用户关联的collection-响应") @ApiModel("用户关联的collection-响应")
public class UserLikeCollectionVO { public class UserLikeCollectionVO {

2
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -673,7 +673,7 @@ public class PythonService {
} }
if (attributeRetrievalAttrDict.getOpeningType() != null) { if (attributeRetrievalAttrDict.getOpeningType() != null) {
nonNullFields.add("openingType"); 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"); nonNullFields.remove("openingType");
attributeRetrievalAttrDict.setOpeningType(null); attributeRetrievalAttrDict.setOpeningType(null);
} }

10
src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
View File

@@ -187,11 +187,11 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
if (CollectionUtils.isEmpty(ids)) { if (CollectionUtils.isEmpty(ids)) {
return; return;
} }
QueryWrapper<CollectionElement> queryWrapper = new QueryWrapper<>(); // QueryWrapper<CollectionElement> queryWrapper = new QueryWrapper<>();
queryWrapper.in("id", ids); // queryWrapper.in("id", ids);
CollectionElement collectionElement = new CollectionElement(); // CollectionElement collectionElement = new CollectionElement();
collectionElement.setCollectionId(0L); // collectionElement.setCollectionId(0L);
collectionElementMapper.update(collectionElement, queryWrapper); collectionElementMapper.deleteBatchIds(ids);
} }
@Override @Override

7
src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.ai.da.service.impl; 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.config.exception.BusinessException;
import com.ai.da.common.enums.CollectionLevel1TypeEnum; import com.ai.da.common.enums.CollectionLevel1TypeEnum;
import com.ai.da.common.enums.DesignTypeEnum; import com.ai.da.common.enums.DesignTypeEnum;
@@ -129,6 +130,12 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
default: default:
} }
}); });
if (CollectionUtil.isNotEmpty(response.getColorBoards())) {
List<CollectionColorVO> collect = response.getColorBoards().stream()
.distinct()
.collect(Collectors.toList());
response.setColorBoards(collect);
}
return response; return response;
} }