diff --git a/src/main/java/com/aida/lanecarford/common/CommonConstant.java b/src/main/java/com/aida/lanecarford/common/CommonConstant.java deleted file mode 100644 index 34f2d79..0000000 --- a/src/main/java/com/aida/lanecarford/common/CommonConstant.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.aida.lanecarford.common; - -public class CommonConstant { - // 单位 秒 10分钟过期 -// public static final Long TASK_EXPIRE_TIME = 24 * 60 * 60L; - public static final Long TASK_EXPIRE_TIME = 10 * 60L; - // 单位 秒 两天过期 - public static final Long CREDITS_EXPIRE_TIME = 2 * 24 * 60 * 60L; - // 单位 分钟 - public static final Integer MINIO_IMAGE_EXPIRE_TIME = 24 * 60; - // 单位 秒 一天过期 in redis - public static final Long GENERATE_RESULT_EXPIRE_TIME = 24 * 60 * 60L; - // 单位 秒 7天过期 - public static final Long REDIS_SET_EXPIRE_TIME = 24 * 60 * 60 * 7L; -} \ No newline at end of file diff --git a/src/main/java/com/aida/lanecarford/service/impl/TryOnEffectServiceImpl.java b/src/main/java/com/aida/lanecarford/service/impl/TryOnEffectServiceImpl.java index 6af6e64..cf2e1fe 100644 --- a/src/main/java/com/aida/lanecarford/service/impl/TryOnEffectServiceImpl.java +++ b/src/main/java/com/aida/lanecarford/service/impl/TryOnEffectServiceImpl.java @@ -1,7 +1,7 @@ package com.aida.lanecarford.service.impl; import cn.hutool.json.JSONObject; -import com.aida.lanecarford.common.CommonConstant; +import com.aida.lanecarford.common.constant.CommonConstants; import com.aida.lanecarford.config.MinioConfig; import com.aida.lanecarford.config.FaceSwapConfig; import com.aida.lanecarford.common.response.ResultEnum; @@ -21,11 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.auth.oauth2.GoogleCredentials; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.io.IOException; @@ -142,7 +140,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl getFavoriteTryOnEffects(Long visitRecordId) { List tryOnEffects = this.list(new LambdaQueryWrapper() .eq(TryOnEffect::getVisitRecordId, visitRecordId) - .eq(TryOnEffect::getIsFavorite, 1)); + .eq(TryOnEffect::getIsFavorite, 1) + .orderByAsc(TryOnEffect::getCreatedTime)); List tryOnResultVos = new ArrayList<>(); for (TryOnEffect tryOnEffect : tryOnEffects) { TryOnResultVo tryOnResultVo = new TryOnResultVo(); @@ -160,7 +159,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl getTryOnEffectsByStyleId(Long styleId) { List tryOnEffects = this.list(new LambdaQueryWrapper() - .eq(TryOnEffect::getStyleId, styleId)); + .eq(TryOnEffect::getStyleId, styleId) + .orderByAsc(TryOnEffect::getCreatedTime)); List tryOnResultVos = new ArrayList<>(); for (TryOnEffect tryOnEffect : tryOnEffects) { TryOnResultVo tryOnResultVo = new TryOnResultVo(); @@ -192,7 +192,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl