diff --git a/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java b/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java index d3441eb7..9a8afa96 100644 --- a/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/LibraryLevel1TypeEnum.java @@ -28,7 +28,9 @@ public enum LibraryLevel1TypeEnum { * 模特 */ MODELS("Models"), - DESIGN_ELEMENTS("DesignElements"); + DESIGN_ELEMENTS("DesignElements"), + + BRAND_DNA("BrandDNA"); private String realName; diff --git a/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java b/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java index 82235e8c..641fbd77 100644 --- a/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java +++ b/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java @@ -28,7 +28,7 @@ public final class LocalCacheUtils { private static LoadingCache loadTokenCache() { LoadingCache tokenCache = CacheBuilder.newBuilder() .concurrencyLevel(10) - .expireAfterWrite(24 * 100, TimeUnit.HOURS) + .expireAfterWrite(24 * 7 - 1, TimeUnit.HOURS) .initialCapacity(100) .maximumSize(10000) .recordStats() diff --git a/src/main/java/com/ai/da/model/dto/QueryLibraryPageDTO.java b/src/main/java/com/ai/da/model/dto/QueryLibraryPageDTO.java index 8aa40cdc..d658158a 100644 --- a/src/main/java/com/ai/da/model/dto/QueryLibraryPageDTO.java +++ b/src/main/java/com/ai/da/model/dto/QueryLibraryPageDTO.java @@ -29,4 +29,6 @@ public class QueryLibraryPageDTO extends PageQueryBaseVo { @ApiModelProperty("交集还是并集:1交集2并集") private Integer intersection; + + private Long brandId; } 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 0ee65f73..bf28811f 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -7,6 +7,7 @@ import com.ai.da.common.context.UserContext; import com.ai.da.common.enums.CollectionLevel1TypeEnum; import com.ai.da.common.enums.CreditsEventsEnum; import com.ai.da.common.enums.DesignTypeEnum; +import com.ai.da.common.enums.LibraryLevel1TypeEnum; import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.response.ResultEnum; import com.ai.da.common.utils.*; @@ -1167,7 +1168,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl