From 054c9fd604c4204623cc47cda1903804329b9a15 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Fri, 6 Jun 2025 10:46:57 +0800 Subject: [PATCH] TASK:cloud; --- .../com/ai/da/model/dto/ProjectQueryDTO.java | 2 ++ .../com/ai/da/model/enums/DesignProcess.java | 7 +++++- .../com/ai/da/service/ProjectService.java | 2 ++ .../ai/da/service/impl/DesignServiceImpl.java | 25 +++++++++++++++++++ .../da/service/impl/ProjectServiceImpl.java | 7 ++++++ .../impl/UserLikeGroupServiceImpl.java | 5 +++- 6 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java index 4b499993..bcd255c7 100644 --- a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java @@ -34,4 +34,6 @@ public class ProjectQueryDTO extends PageQueryBaseVo { @ApiModelProperty("1交集2并集") private Integer intersection; + + private String process; } diff --git a/src/main/java/com/ai/da/model/enums/DesignProcess.java b/src/main/java/com/ai/da/model/enums/DesignProcess.java index 4a0d3c33..cefe57a2 100644 --- a/src/main/java/com/ai/da/model/enums/DesignProcess.java +++ b/src/main/java/com/ai/da/model/enums/DesignProcess.java @@ -9,7 +9,12 @@ public enum DesignProcess implements IEnumDisplay { FINISHED_PRODUCT("Finished product"), PRINT_DESIGN("Print design"), SKETCH_COLLAGE_PROCESS("Sketch Collage process"), - THREE_D_PLATE_MAKING("3D plate making"); + THREE_D_PLATE_MAKING("3D plate making"), + TO_PRODUCT_IMAGE("To product image"), + RELIGHT("Relight"), + POSE_TRANSFER("Pose transfer"), + CANVAS("Canvas"), + ; private final String value; diff --git a/src/main/java/com/ai/da/service/ProjectService.java b/src/main/java/com/ai/da/service/ProjectService.java index fc369cc0..85e01edd 100644 --- a/src/main/java/com/ai/da/service/ProjectService.java +++ b/src/main/java/com/ai/da/service/ProjectService.java @@ -25,4 +25,6 @@ import java.util.Set; public interface ProjectService extends IService { Set getChildProjectIdSet(Long projectId); + + List getByProjectNameLike(String projectName); } 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 67449e3e..46d69c24 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -15,6 +15,7 @@ import com.ai.da.mapper.primary.entity.Collection; import com.ai.da.model.dto.*; import com.ai.da.model.enums.BuildType; import com.ai.da.model.enums.CollectionType; +import com.ai.da.model.enums.DesignProcess; import com.ai.da.model.vo.*; import com.ai.da.python.PythonService; import com.ai.da.python.vo.*; @@ -1853,6 +1854,18 @@ public class DesignServiceImpl extends ServiceImpl impleme String batchTaskId = UUID.randomUUID() + "-" + userHolder.getId(); Long projectId = cloudTaskDTO.getProjectId(); + if (null == projectId) { + Project project = new Project(); + project.setName(DesignProcess.TO_PRODUCT_IMAGE.getValue()); + project.setProcess(DesignProcess.TO_PRODUCT_IMAGE.name()); + project.setOriginal(1); + project.setAccountId(userHolder.getId()); + LocalDateTime now = LocalDateTime.now(); + project.setCreateTime(now); + project.setUpdateTime(now); + projectService.save(project); + projectId = project.getId(); + } UserLikeGroup userLikeGroup = userLikeGroupService.getByProjectId(projectId); Long userLikeGroupId = null; ToProductImageRecord toProductImageRecord = new ToProductImageRecord(); @@ -2012,6 +2025,18 @@ public class DesignServiceImpl extends ServiceImpl impleme AuthPrincipalVo userHolder = UserContext.getUserHolder(); String batchTaskId = UUID.randomUUID() + "-" + userHolder.getId(); Long projectId = cloudTaskDTO.getProjectId(); + if (null == projectId) { + Project project = new Project(); + project.setName(DesignProcess.TO_PRODUCT_IMAGE.getValue()); + project.setProcess(DesignProcess.TO_PRODUCT_IMAGE.name()); + project.setOriginal(1); + project.setAccountId(userHolder.getId()); + LocalDateTime now = LocalDateTime.now(); + project.setCreateTime(now); + project.setUpdateTime(now); + projectService.save(project); + projectId = project.getId(); + } UserLikeGroup userLikeGroup = userLikeGroupService.getByProjectId(projectId); Long userLikeGroupId = null; diff --git a/src/main/java/com/ai/da/service/impl/ProjectServiceImpl.java b/src/main/java/com/ai/da/service/impl/ProjectServiceImpl.java index c5736e7b..0631e0fc 100644 --- a/src/main/java/com/ai/da/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ProjectServiceImpl.java @@ -65,4 +65,11 @@ public class ProjectServiceImpl extends ServiceImpl impl } return new HashSet<>(); } + + @Override + public List getByProjectNameLike(String projectName) { + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().like(Project::getName, projectName); + return projectMapper.selectList(qw); + } } \ No newline at end of file diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index f52b316c..407a60de 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -1308,7 +1308,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("account_id", authPrincipalVo.getId()); - queryWrapper.isNull("parent_id"); +// queryWrapper.isNull("parent_id"); if (!StringUtils.isEmpty(query.getProjectName())) { queryWrapper.like("name", query.getProjectName()); } @@ -1318,6 +1318,9 @@ public class UserLikeGroupServiceImpl extends ServiceImpl projectIdList = new ArrayList<>();