diff --git a/docker-compose.yml b/docker-compose.yml index a8852edc..193d043f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,13 @@ version: "3" services: aida_back: - container_name: stable-version-aida-back + container_name: develop-version-aida-back build: . volumes: # 数据挂载 - /workspace/home/aida/file/:/workspace/home/aida/file/ ports: - - "10086:5567" + - "10088:5567" # mysql8.0: # # 镜像名 # image: mysql:8.0.21 diff --git a/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java b/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java index 198a337b..91de0dce 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java @@ -20,4 +20,6 @@ public class UserLikeChooseVO { @ApiModelProperty("关联的collection") private UserLikeCollectionVO collection; + + private String sex; } diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java index af6ad6e7..e6bcd51c 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -418,7 +418,7 @@ public class LibraryServiceImpl extends ServiceImpl impl .map(Library::getId) .collect(Collectors.toList()); List 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)) { diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index b9e73868..f8cb2752 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -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 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 i public List getGroupDetail(Long userGroupId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_like_group_id", userGroupId); + queryWrapper.orderByDesc("create_time"); List userLikes = userLikeMapper.selectList(queryWrapper); if (CollectionUtils.isEmpty(userLikes)) { return Lists.newArrayList(); diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index df57ff00..c677edc7 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -136,7 +136,7 @@ priority.cannot.be.repeated=priority cannot be repeated. # 当用户输入不符合预设规则时,比如格式错误或者值的范围不正确,这种错误通常可以由用户自行更正。 userName.does.not.exist=Username or password is incorrect. Please check your entry and try again. password.error=Username or password is incorrect. Please check your entry and try again. -email.error=Email format is incorrect. Please enter a valid email address. +email.error=Email is incorrect, please enter the correct bound email. email.does.not.exist=Email address does not exist in our records. Please check and try again. the.verification.code.has.expired=Verification code has expired. Please request a new code to proceed. verification.code.error=Verification code entered is incorrect. Please check and try again.