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

BUGFIX: 1.系统消息已读需判断接收人员 2.本地模型视频生成失败时，发送站内信

Browse Source
This commit is contained in:
xupei
2025-11-19 15:57:47 +08:00
parent cefdac133e
commit 0f525c6c00
4 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/service/GenerateService.java
View File

@@ -57,6 +57,8 @@ public interface GenerateService extends IService<Generate> {
void processPoseTransformResult(String taskId, String gifUrl, String videoUrl, String imageUrl);
void processPTFailSituation(String taskId);
List<PoseTransformationVO> getPoseTransformationResult(List<String> taskIdList, Long projectId, Boolean like);
void updatePoseTransferStatus(String taskId, String status, PoseTransformation poseTransformation);

75
src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
View File

@@ -78,6 +78,7 @@ import java.util.regex.Pattern;
import static com.ai.da.common.enums.CollectionLevel1TypeEnum.*;
import static com.ai.da.common.enums.CreditsEventsEnum.PATTERN;
import static com.ai.da.common.enums.CreditsEventsEnum.POSE_TRANSFORMATION;
import static com.ai.da.common.enums.CreditsEventsEnum.TO_PRODUCT_IMAGE;
import static com.ai.da.common.enums.CreditsEventsEnum.TO_PRODUCT_IMAGE_ADVANCED;
import static com.ai.da.common.enums.WangXiangTaskStatusEnum.FAILED;
@@ -2469,6 +2470,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
Boolean isRequestSuccess = false;
PoseTransformation poseTransformation = new PoseTransformation();
if (!StringUtil.isNullOrEmpty(poseTransformDTO.getModelName()) && poseTransformDTO.getModelName().equals("wx")) {
// 请求生成视频
taskId = animateAnyone(poseTransformDTO, accountId);
if (!StringUtil.isNullOrEmpty(taskId)) {
isRequestSuccess = true;
@@ -2482,6 +2484,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
com.alibaba.fastjson.JSONObject params = createParamsForMotion(poseTransformDTO, taskId);
String api = params.getString("api");
params.remove("api");
// 请求生成视频
isRequestSuccess = pythonService.poseTransformation(params, api);
}
@@ -2564,16 +2567,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
public void processPoseTransformResult(String taskId, String gifUrl, String videoUrl, String imageUrl) {
// 1、存储模型返回的数据
PoseTransformation poseTransformation;
QueryWrapper<PoseTransformation> qw = new QueryWrapper<>();
qw.eq("unique_id", taskId);
List<PoseTransformation> poseTransformations = poseTransformationMapper.selectList(qw);
if (poseTransformations != null && poseTransformations.size() > 1) {
log.warn("通过taskId {} 查询到的PoseTransformation的结果不止一条", taskId);
} else if (poseTransformations == null || poseTransformations.isEmpty()) {
PoseTransformation poseTransformation = getPoseTransformationByTaskId(taskId);
if (Objects.isNull(poseTransformation)) {
return;
}
poseTransformation = poseTransformations.get(0);
poseTransformation.setGifUrl(gifUrl);
poseTransformation.setVideoUrl(videoUrl);
poseTransformation.setFirstFrameUrl(imageUrl);
@@ -2596,10 +2594,42 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
Boolean flag = creditsService.taskCreditsDeduction(Long.parseLong(accountId), taskId);
if (flag) creditsService.updateChangedCredits(accountId, taskId);
// 发消息
sendSysMsgForPT(poseTransformation, true);
}
// 处理PoseTransformation失败的情况
public void processPTFailSituation(String taskId) {
PoseTransformation poseTransformation = getPoseTransformationByTaskId(taskId);
if (Objects.isNull(poseTransformation)) {
return;
}
// 更新生成记录的状态
poseTransformation.setTaskStatus("Fail");
poseTransformation.setUpdateTime(LocalDateTime.now());
poseTransformationMapper.updateById(poseTransformation);
// 发消息
sendSysMsgForPT(poseTransformation, false);
}
private PoseTransformation getPoseTransformationByTaskId(String taskId) {
QueryWrapper<PoseTransformation> qw = new QueryWrapper<>();
qw.eq("unique_id", taskId);
List<PoseTransformation> poseTransformations = poseTransformationMapper.selectList(qw);
if (poseTransformations != null && poseTransformations.size() > 1) {
log.warn("通过taskId {} 查询到的PoseTransformation的结果不止一条", taskId);
} else if (poseTransformations == null || poseTransformations.isEmpty()) {
return null;
}
return poseTransformations.get(0);
}
public void sendSysMsgForPT(PoseTransformation poseTransformation, boolean isSuccess){
Project project = projectService.getById(poseTransformation.getProjectId());
// 发通知
if (Objects.nonNull(project) && !StringUtil.isNullOrEmpty(project.getName())) {
messageCenterService.videoFinishedMsg(poseTransformation.getAccountId(), project.getName(), true);
messageCenterService.videoFinishedMsg(poseTransformation.getAccountId(), project.getName(), isSuccess);
}
}
@@ -2641,7 +2671,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
}
private PoseTransformationVO buildPoseTransformationVO(String taskId, PoseTransformation dbItem) {
String type = resolveModelType(taskId, CreditsEventsEnum.POSE_TRANSFORMATION.getValue());
String type = resolveModelType(taskId, POSE_TRANSFORMATION.getName());
String key = generateResultKey + ":" + taskId;
String resultJson = redisUtil.getFromString(key);
@@ -3020,16 +3050,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
@Transactional
public void processPoseTransformResultBatch(String taskId, String gifUrl, String videoUrl, String imageUrl, String progress) {
// 1、存储模型返回的数据
PoseTransformation poseTransformation;
QueryWrapper<PoseTransformation> qw = new QueryWrapper<>();
qw.eq("unique_id", taskId);
List<PoseTransformation> poseTransformations = poseTransformationMapper.selectList(qw);
if (poseTransformations != null && poseTransformations.size() > 1) {
log.warn("通过taskId {} 查询到的PoseTransformation的结果不止一条", taskId);
} else if (poseTransformations == null || poseTransformations.isEmpty()) {
PoseTransformation poseTransformation = getPoseTransformationByTaskId(taskId);
if (Objects.isNull(poseTransformation)) {
return;
}
poseTransformation = poseTransformations.get(0);
poseTransformation.setGifUrl(gifUrl);
poseTransformation.setVideoUrl(videoUrl);
poseTransformation.setFirstFrameUrl(imageUrl);
@@ -3072,17 +3097,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
@Transactional
public void processPoseTransformResultBatch(String progress, String taskId) {
// 1、存储模型返回的数据
PoseTransformation poseTransformation;
QueryWrapper<PoseTransformation> qw = new QueryWrapper<>();
qw.eq("unique_id", taskId);
List<PoseTransformation> poseTransformations = poseTransformationMapper.selectList(qw);
log.info("poseTransformations : {}", poseTransformations);
if (poseTransformations != null && poseTransformations.size() > 1) {
log.warn("通过taskId {} 查询到的PoseTransformation的结果不止一条", taskId);
} else if (poseTransformations == null || poseTransformations.isEmpty()) {
PoseTransformation poseTransformation = getPoseTransformationByTaskId(taskId);
if (Objects.isNull(poseTransformation)) {
return;
}
poseTransformation = poseTransformations.get(0);
String taskIdBatch = poseTransformation.getTaskIdBatch();
log.info("progress:{}", progress);
log.info("taskIdBatch:{}", taskIdBatch);
@@ -3914,7 +3933,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
private String resolveModelType(String taskId, String func) {
// 判断当前task来自哪个模型
if (!StringUtil.isNullOrEmpty(func)
&& func.equals(CreditsEventsEnum.POSE_TRANSFORMATION.getValue())) {
&& func.equals(POSE_TRANSFORMATION.getName())) {
List<PoseTransformation> poseTransformations = poseTransformationMapper.selectList(
new QueryWrapper<PoseTransformation>().eq("unique_id", taskId));
if (!poseTransformations.isEmpty()

12
src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
View File

@@ -287,9 +287,15 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
public void setReadStatusSystem(List<Long> notificationIdList) {
Long id = UserContext.getUserHolder().getId();
for (Long notificationId : notificationIdList) {
SysNotificationReadStatus sysNotificationReadStatus = new SysNotificationReadStatus(notificationId, id);
sysNotificationReadStatus.setCreateTime(LocalDateTime.now());
sysNotificationReadStatusMapper.insert(sysNotificationReadStatus);
Notification notification = getById(notificationId);
if (Objects.nonNull(notification) && notification.getType().equals("system")) {
// 当系统消息指定了接收人员时，不允许其他人员已读
if (Objects.isNull(notification.getReceiverId()) || notification.getReceiverId().equals(id)) {
SysNotificationReadStatus sysNotificationReadStatus = new SysNotificationReadStatus(notificationId, id);
sysNotificationReadStatus.setCreateTime(LocalDateTime.now());
sysNotificationReadStatusMapper.insert(sysNotificationReadStatus);
}
}
}
}