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

BUGFIX:1、userLikeService中业务划分不清晰导致与generateService出现循环依赖问题。解决：将CollectionSort单独划分为一个Service

Browse Source 
2、新建t_api_generate表用于补偿查询生成结果
This commit is contained in:
xupei
2025-07-25 17:13:06 +08:00
parent e2085190d1
commit 5287d83b82
13 changed files with 322 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
View File

@@ -5,6 +5,7 @@ import com.ai.da.common.utils.RedisUtil;
import com.ai.da.model.dto.GenerateThroughImageTextDTO;
import com.ai.da.model.vo.GenerateResultVO;
import com.ai.da.model.vo.PoseTransformationVO;
import com.ai.da.service.CloudTaskService;
import com.ai.da.service.DesignService;
import com.ai.da.service.GenerateService;
import com.ai.da.service.UserLikeGroupService;
@@ -46,6 +47,9 @@ public class GenerateConsumer {
@Resource
private DesignService designService;
@Resource
private CloudTaskService cloudTaskService;
@Autowired
private RabbitMQProperties rabbitMQProperties;
@@ -394,12 +398,12 @@ public class GenerateConsumer {
} else if (progress.startsWith("0/")) {
String batchTaskId = generateResult.getString("task_id");
if (!StringUtils.isEmpty(batchTaskId)) {
userLikeGroupService.startTask(batchTaskId);
cloudTaskService.startTask(batchTaskId);
}
} else if (progress.equals("OK")) {
String batchTaskId = generateResult.getString("task_id");
if (!StringUtils.isEmpty(batchTaskId)) {
userLikeGroupService.completeTask(batchTaskId);
cloudTaskService.completeTask(batchTaskId);
}
}
} else {
@@ -458,12 +462,12 @@ public class GenerateConsumer {
} else if (progress.startsWith("0/")) {
String batchTaskId = generateResult.getString("task_id");
if (!StringUtils.isEmpty(batchTaskId)) {
userLikeGroupService.startTask(batchTaskId);
cloudTaskService.startTask(batchTaskId);
}
} else if (progress.equals("OK")) {
String batchTaskId = generateResult.getString("task_id");
if (!StringUtils.isEmpty(batchTaskId)) {
userLikeGroupService.completeTask(batchTaskId);
cloudTaskService.completeTask(batchTaskId);
}
}
} else {

6
src/main/java/com/ai/da/common/config/MyTaskScheduler.java
View File

@@ -106,7 +106,7 @@ public class MyTaskScheduler {
List<ToProductImageResult> toProductImageResultList1 = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper1);
if (!CollectionUtils.isEmpty(toProductImageResultList1)) {
for (ToProductImageResult toProductImageResult : toProductImageResultList1) {
designService.addCollectionSort(toProductImageResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(), collectionSort.getProjectId(), collectionSort.getId());
collectionSortService.addCollectionSort(toProductImageResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(), collectionSort.getProjectId(), collectionSort.getId());
QueryWrapper<ToProductImageResult> relightResultQueryWrapper = new QueryWrapper<>();
relightResultQueryWrapper.lambda().eq(ToProductImageResult::getElementId, toProductImageResult.getId());
@@ -115,7 +115,7 @@ public class MyTaskScheduler {
if (!CollectionUtils.isEmpty(toProductImageResultList2)) {
for (ToProductImageResult relight : toProductImageResultList2) {
designService.addCollectionSort(relight.getId(), CollectionType.RELIGHT.getValue(), collectionSort.getProjectId(), collectionSort.getId());
collectionSortService.addCollectionSort(relight.getId(), CollectionType.RELIGHT.getValue(), collectionSort.getProjectId(), collectionSort.getId());
}
}
@@ -153,6 +153,8 @@ public class MyTaskScheduler {
private ExportFileMapper exportFileMapper;
@Resource
private PortfolioMapper portfolioMapper;
@Resource
private CollectionSortService collectionSortService;
// 定时任务，每十五天执行一次
// @Scheduled(cron = "0 0 0 ? * MON")