From 35e6bb8cd96c3c5c1f71dca331df94a137b0abe3 Mon Sep 17 00:00:00 2001
From: xupei <1779019091@qq.com>
Date: Wed, 15 Nov 2023 13:22:15 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=E5=8F=96=E6=B6=88like=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=86=8Dlike=E5=90=8C=E4=B8=80=E5=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=20=E5=85=B6=E4=BB=96=EF=BC=9Agenerate--sketchboard=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0gender=20=E4=BF=AE=E6=94=B9generate=20like?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E5=91=BD=E5=90=8D--=E5=BD=93?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E5=8D=81=E4=BD=8D=E6=97=B6=E9=97=B4=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/common/utils/DateUtil.java  | 13 +++++++++++++
 .../java/com/ai/da/model/dto/GenerateLikeDTO.java   |  3 +++
 .../com/ai/da/service/impl/GenerateServiceImpl.java |  9 +++++++--
 src/main/resources/messages_en.properties           |  1 +
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/common/utils/DateUtil.java b/src/main/java/com/ai/da/common/utils/DateUtil.java
index e15ffb24..94269826 100644
--- a/src/main/java/com/ai/da/common/utils/DateUtil.java
+++ b/src/main/java/com/ai/da/common/utils/DateUtil.java
@@ -68,4 +68,17 @@ public class DateUtil {
         return date;
     }
 
+    /**
+     * 获取指定时区的时间戳的前十位
+     * @param timeZone 时区
+     * @return 当前时间戳的前十位
+     */
+    public static String getTimeStamp(String timeZone){
+        ZoneId zoneId = ZoneId.of(timeZone);
+
+        long epochSecond = Instant.now().atZone(zoneId).toEpochSecond();
+
+        return String.valueOf(epochSecond).substring(0, 10);
+    }
+
 }
diff --git a/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java b/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java
index 46d24b35..69b37038 100644
--- a/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java
+++ b/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java
@@ -22,6 +22,9 @@ public class GenerateLikeDTO {
     @ApiModelProperty("当一级类型为Sketchboard时，二级类型 Outwear Dress Blouse Skirt Trousers")
     private String level2Type;
 
+    @ApiModelProperty("性别")
+    private String gender;
+
     @NotBlank(message = "timeZone.cannot.be.empty")
     @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
     private String timeZone;
diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
index 6108aa2c..6f07e9fd 100644
--- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
@@ -168,6 +168,9 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
             if (StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type())){
                 throw new BusinessException("level2Type.cannot.be.empty");
             }
+            if (StringUtil.isNullOrEmpty(generateLikeDTO.getGender())){
+                throw new BusinessException("gender.cannot.be.empty");
+            }
         }
         // 1.2 判断参数是否真实有效
         Long generateDetailId = generateLikeDTO.getGenerateDetailId();
@@ -183,7 +186,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         // 2、将like的图片信息存入library
         // 2.1、不能重复喜欢
         Library libraryDetail = libraryService.getById(generateDetail.getLibraryId());
-        if (Objects.nonNull(generateDetail.getLibraryId()) || Objects.nonNull(libraryDetail)){
+        if ( (Objects.nonNull(generateDetail.getLibraryId()) && !generateDetail.getLibraryId().equals(0L))
+                || Objects.nonNull(libraryDetail)){
             throw new BusinessException("duplicate.likes.are.not.allowed");
         }
         // 2.2、添加到library
@@ -227,7 +231,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         library.setAccountId(accountId);
         library.setLevel1Type(generateLikeDTO.getLevel1Type());
         library.setLevel2Type(StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type()) ? null : generateLikeDTO.getLevel2Type());
-        library.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD));
+        library.setLevel3Type(StringUtil.isNullOrEmpty(generateLikeDTO.getGender()) ? null : generateLikeDTO.getGender());
+        library.setName(DateUtil.getTimeStamp(generateLikeDTO.getTimeZone()) + "_N_G");
         library.setUrl(imageUrl);
         try {
             library.setMd5(MD5Utils.encryptFile(minioUtil.download(imageUrl)));
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 9f778d8c..bf662987 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -127,6 +127,7 @@ design.item.does.not.exist=design item does not exist.
 layers.does.not.exists=layers does not exists.
 unknown.generate.type=unknown generate type.
 the.workspace.lastIndex.not.found=The workspace lastIndex not found.
+gender.cannot.be.empty=gender cannot be empty.
 
 # 可能会报异常
 # Informative: