ai-coding/deploy-ease-platform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大声道撒旦

Browse Source
This commit is contained in:
dengqichen 2025-01-10 15:07:34 +08:00
parent 931665f6e1
commit f774063821
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/ApplicationDTO.java
View File

@ -31,9 +31,13 @@ public class ApplicationDTO extends BaseDTO {
@NotNull(message = "代码仓库组ID不能为空") @NotNull(message = "代码仓库组ID不能为空")
private Long repoGroupId; private Long repoGroupId;
private RepositoryGroupDTO repositoryGroup;
@NotNull(message = "代码仓库项目ID不能为空") @NotNull(message = "代码仓库项目ID不能为空")
private Long repoProjectId; private Long repoProjectId;
private RepositoryProjectDTO repositoryProject;
@NotNull(message = "所属项目组ID不能为空") @NotNull(message = "所属项目组ID不能为空")
private Long projectGroupId; private Long projectGroupId;

28
backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ApplicationServiceImpl.java
View File

@ -2,13 +2,19 @@ package com.qqchen.deploy.backend.deploy.service.impl;
import com.qqchen.deploy.backend.deploy.converter.ApplicationConverter; import com.qqchen.deploy.backend.deploy.converter.ApplicationConverter;
import com.qqchen.deploy.backend.deploy.converter.ProjectGroupConverter; import com.qqchen.deploy.backend.deploy.converter.ProjectGroupConverter;
import com.qqchen.deploy.backend.deploy.converter.RepositoryGroupConverter;
import com.qqchen.deploy.backend.deploy.converter.RepositoryProjectConverter;
import com.qqchen.deploy.backend.deploy.dto.ApplicationDTO; import com.qqchen.deploy.backend.deploy.dto.ApplicationDTO;
import com.qqchen.deploy.backend.deploy.dto.DevelopmentLanguageTypeDTO; import com.qqchen.deploy.backend.deploy.dto.DevelopmentLanguageTypeDTO;
import com.qqchen.deploy.backend.deploy.entity.Application; import com.qqchen.deploy.backend.deploy.entity.Application;
import com.qqchen.deploy.backend.deploy.entity.ProjectGroup; import com.qqchen.deploy.backend.deploy.entity.ProjectGroup;
import com.qqchen.deploy.backend.deploy.entity.RepositoryGroup;
import com.qqchen.deploy.backend.deploy.entity.RepositoryProject;
import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum; import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum;
import com.qqchen.deploy.backend.deploy.query.ApplicationQuery; import com.qqchen.deploy.backend.deploy.query.ApplicationQuery;
import com.qqchen.deploy.backend.deploy.repository.IProjectGroupRepository; import com.qqchen.deploy.backend.deploy.repository.IProjectGroupRepository;
import com.qqchen.deploy.backend.deploy.repository.IRepositoryGroupRepository;
import com.qqchen.deploy.backend.deploy.repository.IRepositoryProjectRepository;
import com.qqchen.deploy.backend.deploy.service.IApplicationService; import com.qqchen.deploy.backend.deploy.service.IApplicationService;
import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -26,18 +32,38 @@ import static java.util.stream.Collectors.toList;
@Service @Service
public class ApplicationServiceImpl extends BaseServiceImpl<Application, ApplicationDTO, ApplicationQuery, Long> implements IApplicationService { public class ApplicationServiceImpl extends BaseServiceImpl<Application, ApplicationDTO, ApplicationQuery, Long> implements IApplicationService {
@Resource @Resource
private IProjectGroupRepository projectGroupRepository; private IProjectGroupRepository projectGroupRepository;
@Resource @Resource
private ProjectGroupConverter projectGroupConverter; private ProjectGroupConverter projectGroupConverter;
@Resource
private IRepositoryGroupRepository repositoryGroupRepository;
@Resource
private IRepositoryProjectRepository repositoryProjectRepository;
@Resource
private RepositoryGroupConverter repositoryGroupConverter;
@Resource
private RepositoryProjectConverter repositoryProjectConverter;
public Page<ApplicationDTO> page(ApplicationQuery query) { public Page<ApplicationDTO> page(ApplicationQuery query) {
Page<ApplicationDTO> page = super.page(query); Page<ApplicationDTO> page = super.page(query);
List<ApplicationDTO> result = page.getContent().stream().peek(application -> { List<ApplicationDTO> result = page.getContent().stream().peek(application -> {
// 查询并设置项目组信息
Optional<ProjectGroup> projectGroupOptional = projectGroupRepository.findById(application.getProjectGroupId()); Optional<ProjectGroup> projectGroupOptional = projectGroupRepository.findById(application.getProjectGroupId());
projectGroupOptional.ifPresent(projectGroup -> application.setProjectGroup(projectGroupConverter.toDto(projectGroup))); projectGroupOptional.ifPresent(projectGroup -> application.setProjectGroup(projectGroupConverter.toDto(projectGroup)));
// 查询并设置代码仓库组信息
Optional<RepositoryGroup> repositoryGroupOptional = repositoryGroupRepository.findById(application.getRepoGroupId());
repositoryGroupOptional.ifPresent(repositoryGroup -> application.setRepositoryGroup(repositoryGroupConverter.toDto(repositoryGroup)));
// 查询并设置代码仓库项目信息
Optional<RepositoryProject> repositoryProjectOptional = repositoryProjectRepository.findById(application.getRepoProjectId());
repositoryProjectOptional.ifPresent(repositoryProject -> application.setRepositoryProject(repositoryProjectConverter.toDto(repositoryProject)));
}).collect(toList()); }).collect(toList());
return new PageImpl<>(result, page.getPageable(), page.getTotalElements()); return new PageImpl<>(result, page.getPageable(), page.getTotalElements());
} }