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().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 MoodBoard\PrintBoard\SketchBoard - List> countGenerate = generateService.getCountByUserAndTime(startTime, endTime, ids); +// List> countGenerate = generateService.getCountByUserAndTime(startTime, endTime, ids); + List> countGenerate = generateMapper.getByTypeAndTime(startTime, endTime, ids); // 使用Stream API和lambda表达式将数据合并到一个Map中 Map 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 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 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;