TASK: 添加注释
This commit is contained in:
@@ -1420,7 +1420,6 @@ public class MyTaskScheduler {
|
|||||||
// UserLikeGroup转project
|
// UserLikeGroup转project
|
||||||
userLikeGroupConvertProject();
|
userLikeGroupConvertProject();
|
||||||
|
|
||||||
|
|
||||||
// 必须先完成project数据新增后再执行 toProductImage relight数据关联project
|
// 必须先完成project数据新增后再执行 toProductImage relight数据关联project
|
||||||
toProductRelightRelationProject();
|
toProductRelightRelationProject();
|
||||||
|
|
||||||
@@ -1445,6 +1444,7 @@ public class MyTaskScheduler {
|
|||||||
portfolioMapper.updateById(portfolio);
|
portfolioMapper.updateById(portfolio);
|
||||||
}else {
|
}else {
|
||||||
// TODO:考虑关闭二创
|
// TODO:考虑关闭二创
|
||||||
|
// 如果没有关联的项目元素等信息,则无法回溯,故设为不可二创
|
||||||
portfolio.setOpenSource(0);
|
portfolio.setOpenSource(0);
|
||||||
portfolioMapper.updateById(portfolio);
|
portfolioMapper.updateById(portfolio);
|
||||||
}
|
}
|
||||||
@@ -1475,6 +1475,7 @@ public class MyTaskScheduler {
|
|||||||
if (null != design.getTemplateId()) {
|
if (null != design.getTemplateId()) {
|
||||||
project.setProcess(DesignProcess.SERIES_DESIGN.getValue());
|
project.setProcess(DesignProcess.SERIES_DESIGN.getValue());
|
||||||
workspace.setPosition("Overall");
|
workspace.setPosition("Overall");
|
||||||
|
// workspace设置模特
|
||||||
if (design.getModelType().equals("System")) {
|
if (design.getModelType().equals("System")) {
|
||||||
SysFile sysFile = sysFileMapper.selectById(design.getTemplateId());
|
SysFile sysFile = sysFileMapper.selectById(design.getTemplateId());
|
||||||
if (sysFile.getLevel2Type().equals("Male")) {
|
if (sysFile.getLevel2Type().equals("Male")) {
|
||||||
@@ -1509,8 +1510,9 @@ public class MyTaskScheduler {
|
|||||||
project.setOriginalPortfolioId(portfolio.getOriginalPortfolioId());
|
project.setOriginalPortfolioId(portfolio.getOriginalPortfolioId());
|
||||||
project.setOriginalAccountId(portfolio.getOriginalAccountId());
|
project.setOriginalAccountId(portfolio.getOriginalAccountId());
|
||||||
|
|
||||||
|
// 快照关联项目
|
||||||
projectSnapshot.setProject(project);
|
projectSnapshot.setProject(project);
|
||||||
|
// 快照关联workspace
|
||||||
projectSnapshot.setWorkspace(workspace);
|
projectSnapshot.setWorkspace(workspace);
|
||||||
|
|
||||||
|
|
||||||
@@ -1529,7 +1531,6 @@ public class MyTaskScheduler {
|
|||||||
|
|
||||||
Long designItemIdOld = userLike.getDesignItemId();
|
Long designItemIdOld = userLike.getDesignItemId();
|
||||||
DesignItem designItemOld = designItemMapper.selectById(designItemIdOld);
|
DesignItem designItemOld = designItemMapper.selectById(designItemIdOld);
|
||||||
|
|
||||||
userLikeSnapshot.setDesignItem(designItemOld);
|
userLikeSnapshot.setDesignItem(designItemOld);
|
||||||
userLikeSnapshot.setDesignPythonOutfit(designPythonOutfit);
|
userLikeSnapshot.setDesignPythonOutfit(designPythonOutfit);
|
||||||
|
|
||||||
@@ -1583,7 +1584,7 @@ public class MyTaskScheduler {
|
|||||||
|
|
||||||
private void toProductRelightRelationProject() {
|
private void toProductRelightRelationProject() {
|
||||||
QueryWrapper<Project> projectQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<Project> projectQueryWrapper = new QueryWrapper<>();
|
||||||
List<Project> projects = projectMapper.selectList(projectQueryWrapper);
|
List<Project> projects = projectMapper.selectList(projectQueryWrapper); // 所有project
|
||||||
for (Project project : projects) {
|
for (Project project : projects) {
|
||||||
UserLikeGroup userLikeGroup = userLikeGroupService.getByProjectId(project.getId());
|
UserLikeGroup userLikeGroup = userLikeGroupService.getByProjectId(project.getId());
|
||||||
if (Objects.nonNull(userLikeGroup)) {
|
if (Objects.nonNull(userLikeGroup)) {
|
||||||
@@ -1612,11 +1613,12 @@ public class MyTaskScheduler {
|
|||||||
qw.lambda().ne(UserLikeGroup::getAccountId, -1);
|
qw.lambda().ne(UserLikeGroup::getAccountId, -1);
|
||||||
List<UserLikeGroup> userLikeGroups = userLikeGroupMapper.selectList(qw);
|
List<UserLikeGroup> userLikeGroups = userLikeGroupMapper.selectList(qw);
|
||||||
for (UserLikeGroup userLikeGroup : userLikeGroups) {
|
for (UserLikeGroup userLikeGroup : userLikeGroups) {
|
||||||
|
// 创建project
|
||||||
Project project = new Project();
|
Project project = new Project();
|
||||||
project.setAccountId(userLikeGroup.getAccountId());
|
project.setAccountId(userLikeGroup.getAccountId());
|
||||||
project.setName(userLikeGroup.getName());
|
project.setName(userLikeGroup.getName());
|
||||||
project.setCreateTime(LocalDateTime.ofInstant(userLikeGroup.getCreateDate().toInstant(), ZoneId.systemDefault()));
|
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.setOriginal(userLikeGroup.getOriginal());
|
||||||
project.setOriginalAccountId(userLikeGroup.getOriginalAccountId());
|
project.setOriginalAccountId(userLikeGroup.getOriginalAccountId());
|
||||||
project.setOriginalPortfolioId(userLikeGroup.getOriginalPortfolioId());
|
project.setOriginalPortfolioId(userLikeGroup.getOriginalPortfolioId());
|
||||||
@@ -1625,25 +1627,29 @@ public class MyTaskScheduler {
|
|||||||
designQueryWrapper.lambda().eq(Design::getCollectionId, userLikeGroup.getCollectionId());
|
designQueryWrapper.lambda().eq(Design::getCollectionId, userLikeGroup.getCollectionId());
|
||||||
Design design = designMapper.selectOne(designQueryWrapper);
|
Design design = designMapper.selectOne(designQueryWrapper);
|
||||||
if (Objects.isNull(design)) {
|
if (Objects.isNull(design)) {
|
||||||
System.out.println(userLikeGroup.getCollectionId());
|
log.info("collection_id {},对应design为空 ", userLikeGroup.getCollectionId());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
// 设置项目类型 系列设计 || 单品设计
|
||||||
if (design.getSingleOverall().equals("overall")) {
|
if (design.getSingleOverall().equals("overall")) {
|
||||||
project.setProcess(DesignProcess.SERIES_DESIGN.name());
|
project.setProcess(DesignProcess.SERIES_DESIGN.name());
|
||||||
}else {
|
}else {
|
||||||
project.setProcess(DesignProcess.SINGLE_DESIGN.name());
|
project.setProcess(DesignProcess.SINGLE_DESIGN.name());
|
||||||
}
|
}
|
||||||
|
// 添加项目记录
|
||||||
projectMapper.insert(project);
|
projectMapper.insert(project);
|
||||||
|
|
||||||
Long accountId = userLikeGroup.getAccountId();
|
Long accountId = userLikeGroup.getAccountId();
|
||||||
QueryWrapper<Workspace> workspaceQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<Workspace> workspaceQueryWrapper = new QueryWrapper<>();
|
||||||
workspaceQueryWrapper.lambda().eq(Workspace::getAccountId, accountId);
|
workspaceQueryWrapper.lambda().eq(Workspace::getAccountId, accountId);
|
||||||
workspaceQueryWrapper.lambda().eq(Workspace::getIsLastIndex, 1);
|
workspaceQueryWrapper.lambda().eq(Workspace::getIsLastIndex, 1); // 最后一次使用的workspace的标识
|
||||||
Workspace workspace = workspaceMapper.selectOne(workspaceQueryWrapper);
|
Workspace workspace = workspaceMapper.selectOne(workspaceQueryWrapper);
|
||||||
if (Objects.isNull(workspace)) {
|
if (Objects.isNull(workspace)) {
|
||||||
System.out.println(accountId);
|
log.info("用户id {}, 没有最后一次使用的workspace", accountId);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
workspace.setIsLastIndex(0);
|
workspace.setIsLastIndex(0); // 这个字段后续没有实际作用
|
||||||
|
// 关联workspace与project
|
||||||
workspace.setProjectId(project.getId());
|
workspace.setProjectId(project.getId());
|
||||||
workspace.setSystemDesignerPercentage(design.getSystemScale().multiply(new BigDecimal("100")).setScale(0, RoundingMode.HALF_UP).intValueExact());
|
workspace.setSystemDesignerPercentage(design.getSystemScale().multiply(new BigDecimal("100")).setScale(0, RoundingMode.HALF_UP).intValueExact());
|
||||||
if (!design.getSingleOverall().equals("overall")) {
|
if (!design.getSingleOverall().equals("overall")) {
|
||||||
@@ -1651,12 +1657,13 @@ public class MyTaskScheduler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
workspace.setId(null);
|
workspace.setId(null);
|
||||||
workspaceMapper.insert(workspace);
|
workspaceMapper.insert(workspace); // 新增一条project则需要有对应的workspace记录
|
||||||
|
|
||||||
QueryWrapper<CollectionElement> collectionElementQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<CollectionElement> collectionElementQueryWrapper = new QueryWrapper<>();
|
||||||
collectionElementQueryWrapper.lambda().eq(CollectionElement::getCollectionId, userLikeGroup.getCollectionId());
|
collectionElementQueryWrapper.lambda().eq(CollectionElement::getCollectionId, userLikeGroup.getCollectionId());
|
||||||
List<CollectionElement> collectionElements = collectionElementMapper.selectList(collectionElementQueryWrapper);
|
List<CollectionElement> collectionElements = collectionElementMapper.selectList(collectionElementQueryWrapper);
|
||||||
for (CollectionElement collectionElement : collectionElements) {
|
for (CollectionElement collectionElement : collectionElements) {
|
||||||
|
// 关联collection_element和project
|
||||||
collectionElement.setProjectId(project.getId());
|
collectionElement.setProjectId(project.getId());
|
||||||
collectionElementMapper.updateById(collectionElement);
|
collectionElementMapper.updateById(collectionElement);
|
||||||
}
|
}
|
||||||
@@ -1682,7 +1689,8 @@ public class MyTaskScheduler {
|
|||||||
collectionElement.setMd5(sysFile.getMd5());
|
collectionElement.setMd5(sysFile.getMd5());
|
||||||
collectionElement.setCreateDate(new Date());
|
collectionElement.setCreateDate(new Date());
|
||||||
collectionElement.setHasPin((byte) 0);
|
collectionElement.setHasPin((byte) 0);
|
||||||
collectionElementMapper.insert(collectionElement);
|
collectionElementMapper.insert(collectionElement); // 为每个project创建一条模特记录
|
||||||
|
|
||||||
CollectionElementRelModel collectionElementRelModel = new CollectionElementRelModel();
|
CollectionElementRelModel collectionElementRelModel = new CollectionElementRelModel();
|
||||||
collectionElementRelModel.setCollectionElementId(collectionElement.getId());
|
collectionElementRelModel.setCollectionElementId(collectionElement.getId());
|
||||||
collectionElementRelModel.setRelationId(sysFile.getId());
|
collectionElementRelModel.setRelationId(sysFile.getId());
|
||||||
@@ -1701,7 +1709,7 @@ public class MyTaskScheduler {
|
|||||||
collectionElement.setMd5(library.getMd5());
|
collectionElement.setMd5(library.getMd5());
|
||||||
collectionElement.setCreateDate(new Date());
|
collectionElement.setCreateDate(new Date());
|
||||||
collectionElement.setHasPin((byte) 0);
|
collectionElement.setHasPin((byte) 0);
|
||||||
collectionElementMapper.insert(collectionElement);
|
collectionElementMapper.insert(collectionElement); // 为每个project创建一条模特记录
|
||||||
CollectionElementRelModel collectionElementRelModel = new CollectionElementRelModel();
|
CollectionElementRelModel collectionElementRelModel = new CollectionElementRelModel();
|
||||||
collectionElementRelModel.setCollectionElementId(collectionElement.getId());
|
collectionElementRelModel.setCollectionElementId(collectionElement.getId());
|
||||||
collectionElementRelModel.setRelationId(library.getId());
|
collectionElementRelModel.setRelationId(library.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user