From 0155154664763b0f009b6c6498e392a6dd974d82 Mon Sep 17 00:00:00 2001 From: xupei Date: Thu, 17 Jul 2025 11:48:38 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=20cloudTask=E6=95=B0=E6=8D=AE=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=97=B6=E9=97=B4=E6=99=9A=E4=BA=8Epython?= =?UTF-8?q?=E7=AB=AF=E5=90=91MQ=E4=B8=AD=E5=8F=91=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/service/impl/DesignServiceImpl.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) 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 0dc3b721..e7f84c23 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -2509,6 +2509,7 @@ public class DesignServiceImpl extends ServiceImpl 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 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 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 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; }