From c14db62c0a8c010e92b457484c6232114ca7d6e4 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Thu, 20 Nov 2025 11:09:20 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:1.=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9Fsk?=
 =?UTF-8?q?etch=E5=88=B0=E4=B8=AA=E4=BA=BAlibrary=202.video=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=BB=93=E6=9D=9F=E5=90=8E=E6=80=BB=E6=98=AF=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=A4=B1=E8=B4=A5=E7=AB=99=E5=86=85=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/common/task/GenerateTask.java        | 2 +-
 .../com/ai/da/service/impl/ConvenientInquiryServiceImpl.java | 5 +++--
 src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ai/da/common/task/GenerateTask.java b/src/main/java/com/ai/da/common/task/GenerateTask.java
index 4a11e4e4..604b8b2c 100644
--- a/src/main/java/com/ai/da/common/task/GenerateTask.java
+++ b/src/main/java/com/ai/da/common/task/GenerateTask.java
@@ -107,7 +107,7 @@ public class GenerateTask {
             for (APIGenerate apiGenerate : apiGenerates){
                 String taskId = apiGenerate.getTaskId();
                 PoseTransformation poseTransformation = poseTransformationMapper.selectOne(new QueryWrapper<PoseTransformation>().eq("unique_id", taskId));
-                if (Objects.nonNull(poseTransformation) && "Pending".equals(poseTransformation.getTaskStatus())){
+                if (Objects.nonNull(poseTransformation) && ("Pending".equals(poseTransformation.getTaskStatus()) || "Executing".equals(poseTransformation.getTaskStatus()))){
                     // 判断当前任务的超时状态
                     if (!DateUtil.isMoreThanOneDayApart(poseTransformation.getCreateTime())){
                         try {
diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
index 3381c369..684a25b8 100644
--- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
@@ -57,7 +57,7 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
     @Resource
     private AccountLoginLogService accountLoginLogService;
     @Resource
-    private GenerateService generateService;
+    private GenerateMapper generateMapper;
     @Resource
     private ToProductImageResultMapper toProductImageResultMapper;
     @Resource
@@ -452,7 +452,8 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
         Long singleDesignTimes = designItemService.getCountByUserAndTime(startTime, endTime, ids);
 
         // generate -> MoodBoard\PrintBoard\SketchBoard
-        List<Map<String, Object>> countGenerate = generateService.getCountByUserAndTime(startTime, endTime, ids);
+//        List<Map<String, Object>> countGenerate = generateService.getCountByUserAndTime(startTime, endTime, ids);
+        List<Map<String, Object>> countGenerate = generateMapper.getByTypeAndTime(startTime, endTime, ids);
         // 使用Stream API和lambda表达式将数据合并到一个Map中
         Map<String, Long> countGenerateMerge = countGenerate.stream()
                 .collect(Collectors.toMap(
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 8a9b55e5..1296cfab 100644
--- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
@@ -1068,7 +1068,7 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
 
         // 2. 是。获取当前用户id,随机生成4位数
         String sourceObject = path.substring(path.indexOf("/") + 1);
-        String subPath = sourceObject.substring(sourceObject.indexOf("images/") + 1, sourceObject.lastIndexOf("."));
+        String subPath = sourceObject.substring(sourceObject.indexOf("images/") + "images/".length(), sourceObject.lastIndexOf("."));
         String gender = subPath.substring(0, subPath.indexOf("/")).equals("female") ? "Female" : "Male";
         String category = subPath.substring(subPath.indexOf("/") + 1, subPath.lastIndexOf("/"));
         CollectionLevel2TypeEnum collectionLevel2TypeEnum = CollectionLevel2TypeEnum.ofWithLoweCase(category);
@@ -1079,6 +1079,7 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
         }
         String suffix = sourceObject.substring(sourceObject.lastIndexOf(".") + 1);
         Long userId = UserContext.getUserHolder().getId();
+        // 由于允许将同一张系统sketch多次添加到个人library，但是路径相对固定，所以这里添加随机数以作区分
         String name = subPath.substring(subPath.lastIndexOf("/") + 1) + "_" + RandomsUtil.generateVerifyCode(1000L, 9999L);
         String targetObject = userId + "/sketchboard/" + gender.toLowerCase() + "/" + category + "/" +
                 name + "." + suffix;