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

TASK:模块化；

Browse Source
This commit is contained in:
shahaibo
2025-04-02 15:18:20 +08:00
parent 8764e750ff
commit ca9778a416
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/ai/da/model/vo/ProjectChooseVO.java
View File

@@ -30,6 +30,7 @@ public class ProjectChooseVO {
// //
//// private Portfolio portfolio; //// private Portfolio portfolio;
// private PortfolioDTO portfolioDTO; // private PortfolioDTO portfolioDTO;
private String name;
private WorkspaceVO workspaceVO; private WorkspaceVO workspaceVO;

9
src/main/java/com/ai/da/model/vo/ProjectVO.java
View File

@@ -1,5 +1,6 @@
package com.ai.da.model.vo; package com.ai.da.model.vo;
import com.ai.da.mapper.primary.entity.Project;
import com.ai.da.mapper.primary.entity.UserLikeGroup; import com.ai.da.mapper.primary.entity.UserLikeGroup;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,13 @@ import java.util.List;
@Data @Data
@ApiModel("用户savedCollection分组-响应") @ApiModel("用户savedCollection分组-响应")
public class ProjectVO { public class ProjectVO extends Project {
@ApiModelProperty("分组ID") // @ApiModelProperty("分组ID")
private Long id; // private Long id;
private UserLikeGroupVO userLikeGroupVO; private UserLikeGroupVO userLikeGroupVO;
@ApiModelProperty("更新时间") // @ApiModelProperty("更新时间")
private Long updateDate; private Long updateDate;
} }

3
src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
View File

@@ -266,6 +266,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
WorkspaceVO workspaceVO = workspaceService.getByIdForProject(workspaceId); WorkspaceVO workspaceVO = workspaceService.getByIdForProject(workspaceId);
String process = project.getProcess(); String process = project.getProcess();
String name = project.getName();
// UserLikeGroup group = getByProjectId(projectDTO.getId()); // UserLikeGroup group = getByProjectId(projectDTO.getId());
// if (Objects.isNull(group)) { // if (Objects.isNull(group)) {
@@ -327,7 +328,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
// beenPublished = 1; // beenPublished = 1;
// portfolioDTO.setTagsDTO(tagsMapper.getTagByPortfolioId(portfolioDTO.getId())); // portfolioDTO.setTagsDTO(tagsMapper.getTagByPortfolioId(portfolioDTO.getId()));
// } // }
return new ProjectChooseVO(projectDTO.getId(), workspaceVO, process); return new ProjectChooseVO(projectDTO.getId(), name, workspaceVO, process);
} }
@Override @Override

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

@@ -408,6 +408,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
libraryQueryWrapper.lambda().eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName()); libraryQueryWrapper.lambda().eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName());
libraryQueryWrapper.lambda().eq(Library::getLevel2Type, sex); libraryQueryWrapper.lambda().eq(Library::getLevel2Type, sex);
libraryQueryWrapper.lambda().eq(Library::getLevel3Type, ageGroup); libraryQueryWrapper.lambda().eq(Library::getLevel3Type, ageGroup);
libraryQueryWrapper.lambda().orderByDesc(Library::getCreateDate);
List<Library> libraries = libraryMapper.selectList(libraryQueryWrapper); List<Library> libraries = libraryMapper.selectList(libraryQueryWrapper);
if (!CollectionUtils.isEmpty(libraries)) { if (!CollectionUtils.isEmpty(libraries)) {
List<ModelVO> modelVOList = new ArrayList<>(); List<ModelVO> modelVOList = new ArrayList<>();