From dcd63668bd4ad4b0860f954310431ceaf4dcd78c Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 27 Jun 2025 13:09:36 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=20=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/common/config/MyTaskScheduler.java | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index f294e84b..8539c698 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -1420,7 +1420,6 @@ public class MyTaskScheduler { // UserLikeGroup转project userLikeGroupConvertProject(); - // 必须先完成project数据新增后再执行 toProductImage relight数据关联project toProductRelightRelationProject(); @@ -1445,6 +1444,7 @@ public class MyTaskScheduler { portfolioMapper.updateById(portfolio); }else { // TODO:考虑关闭二创 + // 如果没有关联的项目元素等信息，则无法回溯，故设为不可二创 portfolio.setOpenSource(0); portfolioMapper.updateById(portfolio); } @@ -1475,6 +1475,7 @@ public class MyTaskScheduler { if (null != design.getTemplateId()) { project.setProcess(DesignProcess.SERIES_DESIGN.getValue()); workspace.setPosition("Overall"); + // workspace设置模特 if (design.getModelType().equals("System")) { SysFile sysFile = sysFileMapper.selectById(design.getTemplateId()); if (sysFile.getLevel2Type().equals("Male")) { @@ -1509,8 +1510,9 @@ public class MyTaskScheduler { project.setOriginalPortfolioId(portfolio.getOriginalPortfolioId()); project.setOriginalAccountId(portfolio.getOriginalAccountId()); - + // 快照关联项目 projectSnapshot.setProject(project); + // 快照关联workspace projectSnapshot.setWorkspace(workspace); @@ -1529,7 +1531,6 @@ public class MyTaskScheduler { Long designItemIdOld = userLike.getDesignItemId(); DesignItem designItemOld = designItemMapper.selectById(designItemIdOld); - userLikeSnapshot.setDesignItem(designItemOld); userLikeSnapshot.setDesignPythonOutfit(designPythonOutfit); @@ -1583,7 +1584,7 @@ public class MyTaskScheduler { private void toProductRelightRelationProject() { QueryWrapper projectQueryWrapper = new QueryWrapper<>(); - List projects = projectMapper.selectList(projectQueryWrapper); + List projects = projectMapper.selectList(projectQueryWrapper); // 所有project for (Project project : projects) { UserLikeGroup userLikeGroup = userLikeGroupService.getByProjectId(project.getId()); if (Objects.nonNull(userLikeGroup)) { @@ -1612,11 +1613,12 @@ public class MyTaskScheduler { qw.lambda().ne(UserLikeGroup::getAccountId, -1); List userLikeGroups = userLikeGroupMapper.selectList(qw); for (UserLikeGroup userLikeGroup : userLikeGroups) { + // 创建project Project project = new Project(); project.setAccountId(userLikeGroup.getAccountId()); project.setName(userLikeGroup.getName()); project.setCreateTime(LocalDateTime.ofInstant(userLikeGroup.getCreateDate().toInstant(), ZoneId.systemDefault())); - project.setUpdateTime(LocalDateTime.ofInstant(userLikeGroup.getUpdateDate().toInstant(), ZoneId.systemDefault())); +// project.setUpdateTime(LocalDateTime.ofInstant(userLikeGroup.getUpdateDate().toInstant(), ZoneId.systemDefault())); project.setOriginal(userLikeGroup.getOriginal()); project.setOriginalAccountId(userLikeGroup.getOriginalAccountId()); project.setOriginalPortfolioId(userLikeGroup.getOriginalPortfolioId()); @@ -1625,25 +1627,29 @@ public class MyTaskScheduler { designQueryWrapper.lambda().eq(Design::getCollectionId, userLikeGroup.getCollectionId()); Design design = designMapper.selectOne(designQueryWrapper); if (Objects.isNull(design)) { - System.out.println(userLikeGroup.getCollectionId()); + log.info("collection_id {},对应design为空 ", userLikeGroup.getCollectionId()); continue; } + // 设置项目类型 系列设计 || 单品设计 if (design.getSingleOverall().equals("overall")) { project.setProcess(DesignProcess.SERIES_DESIGN.name()); }else { project.setProcess(DesignProcess.SINGLE_DESIGN.name()); } + // 添加项目记录 projectMapper.insert(project); + Long accountId = userLikeGroup.getAccountId(); QueryWrapper workspaceQueryWrapper = new QueryWrapper<>(); workspaceQueryWrapper.lambda().eq(Workspace::getAccountId, accountId); - workspaceQueryWrapper.lambda().eq(Workspace::getIsLastIndex, 1); + workspaceQueryWrapper.lambda().eq(Workspace::getIsLastIndex, 1); // 最后一次使用的workspace的标识 Workspace workspace = workspaceMapper.selectOne(workspaceQueryWrapper); if (Objects.isNull(workspace)) { - System.out.println(accountId); + log.info("用户id {}, 没有最后一次使用的workspace", accountId); continue; } - workspace.setIsLastIndex(0); + workspace.setIsLastIndex(0); // 这个字段后续没有实际作用 + // 关联workspace与project workspace.setProjectId(project.getId()); workspace.setSystemDesignerPercentage(design.getSystemScale().multiply(new BigDecimal("100")).setScale(0, RoundingMode.HALF_UP).intValueExact()); if (!design.getSingleOverall().equals("overall")) { @@ -1651,12 +1657,13 @@ public class MyTaskScheduler { } workspace.setId(null); - workspaceMapper.insert(workspace); + workspaceMapper.insert(workspace); // 新增一条project则需要有对应的workspace记录 QueryWrapper collectionElementQueryWrapper = new QueryWrapper<>(); collectionElementQueryWrapper.lambda().eq(CollectionElement::getCollectionId, userLikeGroup.getCollectionId()); List collectionElements = collectionElementMapper.selectList(collectionElementQueryWrapper); for (CollectionElement collectionElement : collectionElements) { + // 关联collection_element和project collectionElement.setProjectId(project.getId()); collectionElementMapper.updateById(collectionElement); } @@ -1682,7 +1689,8 @@ public class MyTaskScheduler { collectionElement.setMd5(sysFile.getMd5()); collectionElement.setCreateDate(new Date()); collectionElement.setHasPin((byte) 0); - collectionElementMapper.insert(collectionElement); + collectionElementMapper.insert(collectionElement); // 为每个project创建一条模特记录 + CollectionElementRelModel collectionElementRelModel = new CollectionElementRelModel(); collectionElementRelModel.setCollectionElementId(collectionElement.getId()); collectionElementRelModel.setRelationId(sysFile.getId()); @@ -1701,7 +1709,7 @@ public class MyTaskScheduler { collectionElement.setMd5(library.getMd5()); collectionElement.setCreateDate(new Date()); collectionElement.setHasPin((byte) 0); - collectionElementMapper.insert(collectionElement); + collectionElementMapper.insert(collectionElement); // 为每个project创建一条模特记录 CollectionElementRelModel collectionElementRelModel = new CollectionElementRelModel(); collectionElementRelModel.setCollectionElementId(collectionElement.getId()); collectionElementRelModel.setRelationId(library.getId());