大声道撒旦
This commit is contained in:
parent
906a400640
commit
3bd1d1eb1e
@ -26,6 +26,9 @@ public class DeployAppConfigDTO extends BaseDTO {
|
||||
@NotNull(message = "应用ID不能为空")
|
||||
private Long applicationId;
|
||||
|
||||
@Schema(description = "应用")
|
||||
private ApplicationDTO application;
|
||||
|
||||
@Schema(description = "构建类型")
|
||||
@NotNull(message = "构建类型不能为空")
|
||||
private BuildTypeEnum buildType;
|
||||
|
||||
@ -4,6 +4,7 @@ package com.qqchen.deploy.backend.deploy.entity;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.qqchen.deploy.backend.deploy.enums.BuildTypeEnum;
|
||||
import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum;
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
import com.vladmihalcea.hibernate.type.json.JsonType;
|
||||
import jakarta.persistence.Column;
|
||||
@ -18,6 +19,7 @@ import org.hibernate.annotations.Type;
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@jakarta.persistence.Entity
|
||||
@Table(name = "deploy_app_config")
|
||||
@LogicDelete
|
||||
public class DeployAppConfig extends Entity<Long> {
|
||||
|
||||
|
||||
|
||||
@ -1,20 +1,31 @@
|
||||
package com.qqchen.deploy.backend.deploy.service.impl;
|
||||
|
||||
import com.qqchen.deploy.backend.deploy.converter.ApplicationConverter;
|
||||
import com.qqchen.deploy.backend.deploy.dto.ApplicationDTO;
|
||||
import com.qqchen.deploy.backend.deploy.dto.BuildConfigDefinedDTO;
|
||||
import com.qqchen.deploy.backend.deploy.dto.DeployAppConfigDTO;
|
||||
import com.qqchen.deploy.backend.deploy.entity.Application;
|
||||
import com.qqchen.deploy.backend.deploy.entity.DeployAppConfig;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ProjectGroup;
|
||||
import com.qqchen.deploy.backend.deploy.enums.BuildTypeEnum;
|
||||
import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum;
|
||||
import com.qqchen.deploy.backend.deploy.query.ApplicationQuery;
|
||||
import com.qqchen.deploy.backend.deploy.query.DeployAppConfigQuery;
|
||||
import com.qqchen.deploy.backend.deploy.repository.IApplicationRepository;
|
||||
import com.qqchen.deploy.backend.deploy.service.IDeployAppConfigService;
|
||||
import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import static com.qqchen.deploy.backend.workflow.util.GenerateSchemaUtils.generateSchema;
|
||||
import static java.util.stream.Collectors.toList;
|
||||
|
||||
/**
|
||||
* 应用配置服务实现类
|
||||
@ -23,6 +34,21 @@ import static com.qqchen.deploy.backend.workflow.util.GenerateSchemaUtils.genera
|
||||
@Service
|
||||
public class DeployAppConfigServiceImpl extends BaseServiceImpl<DeployAppConfig, DeployAppConfigDTO, DeployAppConfigQuery, Long> implements IDeployAppConfigService {
|
||||
|
||||
@Resource
|
||||
private IApplicationRepository applicationRepository;
|
||||
|
||||
@Resource
|
||||
private ApplicationConverter applicationConverter;
|
||||
|
||||
@Override
|
||||
public Page<DeployAppConfigDTO> page(DeployAppConfigQuery query) {
|
||||
Page<DeployAppConfigDTO> page = super.page(query);
|
||||
List<DeployAppConfigDTO> result = page.getContent().stream().peek(deployAppConfig -> {
|
||||
Optional<Application> optionalApplication = applicationRepository.findById(deployAppConfig.getApplicationId());
|
||||
optionalApplication.ifPresent(application -> deployAppConfig.setApplication(applicationConverter.toDto(application)));
|
||||
}).collect(toList());
|
||||
return new PageImpl<>(result, page.getPageable(), page.getTotalElements());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BuildConfigDefinedDTO> defined() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user