aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX:1.添加系统sketch到个人library 2.video生成结束后总是发送失败站内信

Browse Source
This commit is contained in:
xupei
2025-11-20 11:09:20 +08:00
parent 65b17fe109
commit c14db62c0a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/common/task/GenerateTask.java
View File

@@ -107,7 +107,7 @@ public class GenerateTask {
for (APIGenerate apiGenerate : apiGenerates){ for (APIGenerate apiGenerate : apiGenerates){
String taskId = apiGenerate.getTaskId(); String taskId = apiGenerate.getTaskId();
PoseTransformation poseTransformation = poseTransformationMapper.selectOne(new QueryWrapper<PoseTransformation>().eq("unique_id", taskId)); 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())){ if (!DateUtil.isMoreThanOneDayApart(poseTransformation.getCreateTime())){
try { try {

5
src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
@Resource @Resource
private AccountLoginLogService accountLoginLogService; private AccountLoginLogService accountLoginLogService;
@Resource @Resource
private GenerateService generateService; private GenerateMapper generateMapper;
@Resource @Resource
private ToProductImageResultMapper toProductImageResultMapper; private ToProductImageResultMapper toProductImageResultMapper;
@Resource @Resource
@@ -452,7 +452,8 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
Long singleDesignTimes = designItemService.getCountByUserAndTime(startTime, endTime, ids); Long singleDesignTimes = designItemService.getCountByUserAndTime(startTime, endTime, ids);
// generate -> MoodBoard\PrintBoard\SketchBoard // 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中 // 使用Stream API和lambda表达式将数据合并到一个Map中
Map<String, Long> countGenerateMerge = countGenerate.stream() Map<String, Long> countGenerateMerge = countGenerate.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(

3
src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
View File

@@ -1068,7 +1068,7 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
// 2. 是。获取当前用户id,随机生成4位数 // 2. 是。获取当前用户id,随机生成4位数
String sourceObject = path.substring(path.indexOf("/") + 1); 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 gender = subPath.substring(0, subPath.indexOf("/")).equals("female") ? "Female" : "Male";
String category = subPath.substring(subPath.indexOf("/") + 1, subPath.lastIndexOf("/")); String category = subPath.substring(subPath.indexOf("/") + 1, subPath.lastIndexOf("/"));
CollectionLevel2TypeEnum collectionLevel2TypeEnum = CollectionLevel2TypeEnum.ofWithLoweCase(category); CollectionLevel2TypeEnum collectionLevel2TypeEnum = CollectionLevel2TypeEnum.ofWithLoweCase(category);
@@ -1079,6 +1079,7 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
} }
String suffix = sourceObject.substring(sourceObject.lastIndexOf(".") + 1); String suffix = sourceObject.substring(sourceObject.lastIndexOf(".") + 1);
Long userId = UserContext.getUserHolder().getId(); Long userId = UserContext.getUserHolder().getId();
// 由于允许将同一张系统sketch多次添加到个人library，但是路径相对固定，所以这里添加随机数以作区分
String name = subPath.substring(subPath.lastIndexOf("/") + 1) + "_" + RandomsUtil.generateVerifyCode(1000L, 9999L); String name = subPath.substring(subPath.lastIndexOf("/") + 1) + "_" + RandomsUtil.generateVerifyCode(1000L, 9999L);
String targetObject = userId + "/sketchboard/" + gender.toLowerCase() + "/" + category + "/" + String targetObject = userId + "/sketchboard/" + gender.toLowerCase() + "/" + category + "/" +
name + "." + suffix; name + "." + suffix;