BUGFIX: cloudTask数据插入的时间晚于python端向MQ中发消息的时间
This commit is contained in:
@@ -2509,6 +2509,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
||||
}
|
||||
|
||||
private String designBatch(DesignCollectionDTO designDTO, AuthPrincipalVo userInfo, Long collectionIdParam, ValidateElementVO elementVO, CloudTaskDTO cloudTaskDTO, Long projectId) {
|
||||
AuthPrincipalVo userHolder = UserContext.getUserHolder();
|
||||
//保存collection
|
||||
Long collectionId;
|
||||
if (null == collectionIdParam) {
|
||||
@@ -2521,6 +2522,21 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
||||
collectionElementService.relationCollection(elementIds, collectionId);
|
||||
//保存design
|
||||
Long designId = saveOne(designDTO, collectionId, userInfo.getId());
|
||||
String requestId = UUID.randomUUID().toString() + "_" + userInfo.getId();
|
||||
|
||||
CloudTask cloudTask = CopyUtil.copyObject(cloudTaskDTO, CloudTask.class);
|
||||
cloudTask.setProjectId(projectId);
|
||||
cloudTask.setDesignId(designId);
|
||||
cloudTask.setCollectionId(collectionId);
|
||||
cloudTask.setTaskId(requestId);
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
cloudTask.setCreateTime(now);
|
||||
cloudTask.setUpdateTime(now);
|
||||
cloudTask.setStatus(0);
|
||||
cloudTask.setAccountId(userInfo.getId());
|
||||
cloudTaskMapper.insert(cloudTask);
|
||||
// 解除锁后可以获取下一个序号
|
||||
projectService.clearLockedSequence(userHolder.getId());
|
||||
|
||||
//组装design入参
|
||||
long startTime = System.currentTimeMillis();
|
||||
@@ -2537,9 +2553,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
||||
log.info("增加image_id关联运行时间:" + totalTimeInSeconds + " 秒");
|
||||
//design
|
||||
startTime = System.currentTimeMillis();
|
||||
String requestId = UUID.randomUUID().toString() + "_" + userInfo.getId();
|
||||
pythonObjects.setRequestId(requestId);
|
||||
AuthPrincipalVo userHolder = UserContext.getUserHolder();
|
||||
String taskId = pythonService.designBatch(pythonObjects, userHolder.getId(), elementVO.getDesignNum(), requestId);
|
||||
|
||||
endTime = System.currentTimeMillis();
|
||||
@@ -2568,19 +2582,6 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
||||
|
||||
// 将上下文存入全局设计上下文中
|
||||
designContext.put(taskId, context);
|
||||
CloudTask cloudTask = CopyUtil.copyObject(cloudTaskDTO, CloudTask.class);
|
||||
cloudTask.setProjectId(projectId);
|
||||
cloudTask.setDesignId(designId);
|
||||
cloudTask.setCollectionId(collectionId);
|
||||
cloudTask.setTaskId(taskId);
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
cloudTask.setCreateTime(now);
|
||||
cloudTask.setUpdateTime(now);
|
||||
cloudTask.setStatus(0);
|
||||
cloudTask.setAccountId(userInfo.getId());
|
||||
cloudTaskMapper.insert(cloudTask);
|
||||
// 解除锁后可以获取下一个序号
|
||||
projectService.clearLockedSequence(userHolder.getId());
|
||||
return taskId;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user