From 3398992bcd212140d4ac75b2bb67ec5b0a8f7f34 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Fri, 28 Mar 2025 09:37:42 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E6=A8=A1=E5=9D=97=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/common/enums/LibraryLevel1TypeEnum.java   |  4 +++-
 .../com/ai/da/common/utils/LocalCacheUtils.java  |  2 +-
 .../com/ai/da/model/dto/QueryLibraryPageDTO.java |  2 ++
 .../service/impl/UserLikeGroupServiceImpl.java   | 16 +++++++++++-----
 4 files changed, 17 insertions(+), 7 deletions(-)

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<String, String> loadTokenCache() {
         LoadingCache<String, String> 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<UserLikeGroupMapper, U
             String gender = library.getLevel2Type();
 
             // 提取sketch
-            JSONObject sketchList =  pythonService.segProduct(url);
+            JSONObject jsonObject =  pythonService.segProduct(url);
             String clothCategory = pythonService.getClothCategory(url, gender);
             JSONObject attributeRecognition = pythonService.getAttributeRecognition(url, clothCategory, gender);
             JSONObject data = attributeRecognition.getJSONObject("data");
@@ -1893,9 +1894,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
     public Boolean brandDNASaveOrUpdate(BrandDNADTO brandDNADTO) {
         if (brandDNADTO.getId() != null) {
             BrandDNA brandDNA = CopyUtil.copyObject(brandDNADTO, BrandDNA.class);
+            brandDNA.setUpdateTime(LocalDateTime.now());
             brandDNAMapper.updateById(brandDNA);
         }else {
             BrandDNA brandDNA = CopyUtil.copyObject(brandDNADTO, BrandDNA.class);
+            AuthPrincipalVo userHolder = UserContext.getUserHolder();
+            brandDNA.setAccountId(userHolder.getId());
+            brandDNA.setCreateTime(LocalDateTime.now());
             brandDNAMapper.insert(brandDNA);
         }
         return Boolean.TRUE;
@@ -1908,7 +1913,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
         String upload = minioUtil.upload("aida-users", path, file);
         Library library = new Library();
         library.setAccountId(userHolder.getId());
-        library.setLevel1Type("BrandDNA");
+        library.setLevel1Type(LibraryLevel1TypeEnum.BRAND_DNA.getRealName());
         library.setName(file.getOriginalFilename());
         library.setUrl(upload);
         library.setMd5(MD5Utils.encryptFile(file.getInputStream()));
@@ -1943,9 +1948,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
     public BrandDNAGenerateVO brandDNAGenerate(String prompt) {
         BrandDNAGenerateVO vo = new BrandDNAGenerateVO();
         JSONObject jsonObject = pythonService.brandDNAGenerate(prompt);
-        vo.setBrandSlogan(jsonObject.getString("brand_slogan"));
-        vo.setBrandName(jsonObject.getString("brand_name"));
-        vo.setBrandLogo(jsonObject.getString("brand_logo"));
+        JSONObject data = jsonObject.getJSONObject("data");
+        vo.setBrandSlogan(data.getString("brand_slogan"));
+        vo.setBrandName(data.getString("brand_name"));
+        vo.setBrandLogo(data.getString("brand_logo"));
         vo.setMinioUrl(minioUtil.getPreSignedUrl(vo.getBrandLogo(), 24 * 60));
         return vo;
     }