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

Merge remote-tracking branch 'origin/dev/dev' into develop

Browse Source 
# Conflicts:
#	docker-compose.yml
This commit is contained in:
shahaibo
2023-12-13 17:26:48 +08:00
parent a14188ee35 b71a1c834d
commit 79cff13edb
6 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,4 +20,6 @@ public class UserLikeChooseVO {
@ApiModelProperty("关联的collection")
private UserLikeCollectionVO collection;
private String sex;
}

2
src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
View File

@@ -418,7 +418,7 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
.map(Library::getId)
.collect(Collectors.toList());
List<Long> maleModelIds = librarys.stream()
.filter(o -> o.getLevel1Type().equals(LibraryLevel1TypeEnum.MODELS.getRealName()) && o.getLevel2Type().equals(Sex.FEMALE.getValue()))
.filter(o -> o.getLevel1Type().equals(LibraryLevel1TypeEnum.MODELS.getRealName()) && o.getLevel2Type().equals(Sex.MALE.getValue()))
.map(Library::getId)
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(femaleModelIds)) {

24
src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
View File

@@ -4,12 +4,12 @@ import cn.hutool.core.collection.CollectionUtil;
import com.ai.da.common.config.exception.BusinessException;
import com.ai.da.common.utils.DateUtil;
import com.ai.da.common.utils.MinioUtil;
import com.ai.da.mapper.TDesignPythonOutfitMapper;
import com.ai.da.mapper.UserLikeGroupMapper;
import com.ai.da.mapper.UserLikeMapper;
import com.ai.da.mapper.*;
import com.ai.da.mapper.entity.Design;
import com.ai.da.mapper.entity.TDesignPythonOutfit;
import com.ai.da.mapper.entity.UserLike;
import com.ai.da.mapper.entity.UserLikeGroup;
import com.ai.da.model.enums.ModelType;
import com.ai.da.model.vo.*;
import com.ai.da.service.AccountService;
import com.ai.da.service.CollectionService;
@@ -53,6 +53,12 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
@Resource
private TDesignPythonOutfitMapper designPythonOutfitMapper;
@Resource
private DesignMapper designMapper;
@Resource
private SysFileMapper sysFileMapper;
@Resource
private LibraryMapper libraryMapper;
@Override
public void deleteUserGroup(Long userGroupId) {
@@ -116,6 +122,16 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
throw new BusinessException("history.not.found");
}
List<UserLikeVO> userLikeVOS = userLikeService.getGroupDetail(userGroupId);
String sex = null;
if (CollectionUtil.isNotEmpty(userLikeVOS)) {
Long designId = userLikeVOS.get(0).getDesignId();
Design design = designMapper.selectById(designId);
if (design.getModelType().equals(ModelType.SYSTEM.getValue())) {
sex = sysFileMapper.selectById(design.getTemplateId()).getLevel2Type();
}else {
sex = libraryMapper.selectById(design.getTemplateId()).getLevel2Type();
}
}
userLikeVOS.forEach(o -> {
TDesignPythonOutfit tDesignPythonOutfit1 = designPythonOutfitMapper.selectById(o.getDesignOutfitId());
o.setUrl(tDesignPythonOutfit1.getDesignUrl());
@@ -133,7 +149,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
}
});
UserLikeCollectionVO userLikeCollection = collectionService.chooseCollection(group.getCollectionId());
return new UserLikeChooseVO(userGroupId, userLikeVOS, userLikeCollection);
return new UserLikeChooseVO(userGroupId, userLikeVOS, userLikeCollection, sex);
}
@Override

1
src/main/java/com/ai/da/service/impl/UserLikeServiceImpl.java
View File

@@ -37,6 +37,7 @@ public class UserLikeServiceImpl extends ServiceImpl<UserLikeMapper, UserLike> i
public List<UserLikeVO> getGroupDetail(Long userGroupId) {
QueryWrapper<UserLike> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_like_group_id", userGroupId);
queryWrapper.orderByDesc("create_time");
List<UserLike> userLikes = userLikeMapper.selectList(queryWrapper);
if (CollectionUtils.isEmpty(userLikes)) {
return Lists.newArrayList();