diff --git a/src/main/java/com/ai/da/mapper/primary/CloudTaskMapper.java b/src/main/java/com/ai/da/mapper/primary/CloudTaskMapper.java index 92aa2588..d1544895 100644 --- a/src/main/java/com/ai/da/mapper/primary/CloudTaskMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/CloudTaskMapper.java @@ -2,10 +2,15 @@ package com.ai.da.mapper.primary; import com.ai.da.common.config.mybatis.plus.CommonMapper; import com.ai.da.mapper.primary.entity.CloudTask; +import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; public interface CloudTaskMapper extends CommonMapper { @Update("UPDATE cloud_task SET completed_num = completed_num + 1, update_time = NOW() WHERE task_id = #{taskIdBatch}") + @Options(useGeneratedKeys = false, flushCache = Options.FlushCachePolicy.TRUE) void increaseCompletedNum(@Param("taskIdBatch") String taskIdBatch); + @Select("SELECT * FROM cloud_task WHERE task_id = #{taskId} FOR UPDATE") + CloudTask selectForUpdate(String taskId); } diff --git a/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java b/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java index 3ff6be8a..aeede94b 100644 --- a/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java +++ b/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java @@ -32,6 +32,8 @@ public class PoseTransformationVO implements AllCollectionVO{ private Long userLikeSortId; private String relationType; + private Long parentId; + public PoseTransformationVO(Long id, String taskId, String gifUrl, String videoUrl, String firstFrameUrl, byte isLiked, String status) { this.id = id; this.taskId = taskId; diff --git a/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java b/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java index 7d455154..5be3caf5 100644 --- a/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java +++ b/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java @@ -10,4 +10,5 @@ public class ToProductImageResultVO extends ToProductImageResult implements AllC private Integer sort; private Long userLikeSortId; private String relationType; + private Long parentId; } diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index 11a120bc..f37fddd2 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -1269,6 +1269,8 @@ public class DesignServiceImpl extends ServiceImpl impleme qw.lambda().eq(CollectionSort::getProjectId, projectId); if (null != parentId) { qw.lambda().eq(CollectionSort::getParentId, parentId); + }else { + qw.lambda().isNull(CollectionSort::getParentId); } List userLikeSorts = collectionSortMapper.selectList(qw); if (CollectionUtils.isEmpty(userLikeSorts)) { @@ -2515,6 +2517,7 @@ public class DesignServiceImpl extends ServiceImpl impleme } @Override + @Transactional public void processDesignBatch(Map designBatchResult) { Object progress = designBatchResult.get("progress"); if (progress instanceof String) { 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 0a220a8e..aada87b2 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1426,6 +1426,7 @@ public class GenerateServiceImpl extends ServiceImpl i } @Override + @Transactional public void processPoseTransformResultBatch(String taskId, String gifUrl, String videoUrl, String imageUrl, String progress) { // 1、存储模型返回的数据 PoseTransformation poseTransformation; diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 02e33a08..2ddbc065 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -1706,6 +1706,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.lambda().eq(ToProductImageResult::getTaskId, taskId); @@ -2538,6 +2542,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.lambda().eq(ToProductImageResult::getTaskId, taskId);