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

Merge branch 'dev/dev_xp' into dev/3.1_release_merge

Browse Source
This commit is contained in:
xupei
2025-09-22 17:50:06 +08:00
parent 41759ca44b efa26d912d
commit 227a20f6f2
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -865,6 +865,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
DesignPythonItemPrint printObject = detail.getPrint().getOverall();
// designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
designItemDetail.setPrintPath(CollectionUtils.isEmpty(printObject.getPrint_path_list()) ? "" : printObject.getPrint_path_list().get(0));
designItemDetail.setUndividedLayer(detail.getSeg_mask_url());
}
designItemDetailService.save(designItemDetail);
if (!SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType()) && !StringUtil.isNullOrEmpty(designItemDetail.getPrintPath())) {

6
src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
View File

@@ -38,6 +38,8 @@ import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import static com.ai.da.common.utils.RedisUtil.UNNAMED_PROJECT_SEQ;
/**
* 服务实现类
@@ -89,6 +91,8 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
private CollectionElementMapper collectionElementMapper;
@Resource
private CollectionElementRelModelMapper collectionElementRelModelMapper;
@Resource
private RedisUtil redisUtil;
@Override
public IPage<WorkspaceVO> selectWorkspacePage(IPage<WorkspaceVO> page, WorkspaceVO workspace) {
@@ -777,6 +781,8 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
Project project = CopyUtil.copyObject(projectDTO, Project.class);
project.setAccountId(userInfo.getId());
LocalDateTime now = LocalDateTime.now();
Long seq = redisUtil.increaseCount(UNNAMED_PROJECT_SEQ + userInfo.getId());
project.setName("Untitled_" + seq);
project.setCreateTime(now);
project.setUpdateTime(now);
project.setOriginal(1);