增加生成后端服务代码。
This commit is contained in:
parent
be7ca8af20
commit
b4996908e8
@ -4,11 +4,13 @@ import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
|||||||
import com.qqchen.deploy.backend.deploy.entity.DeployLog;
|
import com.qqchen.deploy.backend.deploy.entity.DeployLog;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部署日志 Repository
|
* 部署日志 Repository
|
||||||
*/
|
*/
|
||||||
@Repository
|
@Repository
|
||||||
public interface IDeployLogRepository extends IBaseRepository<DeployLog, Long> {
|
public interface IDeployLogRepository extends IBaseRepository<DeployLog, Long> {
|
||||||
DeployLog findTop1ByApplicationIdOrderByCreateTimeDesc(Long id);
|
Optional<DeployLog> findTop1ByApplicationIdOrderByCreateTimeDesc(Long id);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -87,23 +87,26 @@ public class DeployAppConfigServiceImpl extends BaseServiceImpl<DeployAppConfig,
|
|||||||
public Page<DeployAppConfigDTO> page(DeployAppConfigQuery query) {
|
public Page<DeployAppConfigDTO> page(DeployAppConfigQuery query) {
|
||||||
Page<DeployAppConfigDTO> page = super.page(query);
|
Page<DeployAppConfigDTO> page = super.page(query);
|
||||||
List<DeployAppConfigDTO> result = page.getContent().stream().peek(deployAppConfig -> {
|
List<DeployAppConfigDTO> result = page.getContent().stream().peek(deployAppConfig -> {
|
||||||
|
Optional<WorkflowDefinition> optionalWorkflowDefinition = workflowDefinitionRepository.findById(deployAppConfig.getWorkflowDefinitionId());
|
||||||
|
optionalWorkflowDefinition.ifPresent(workflowDefinition -> deployAppConfig.setPublishedWorkflowDefinition(workflowDefinitionConverter.toDto(workflowDefinition)));
|
||||||
Optional<Application> optionalApplication = applicationRepository.findById(deployAppConfig.getApplicationId());
|
Optional<Application> optionalApplication = applicationRepository.findById(deployAppConfig.getApplicationId());
|
||||||
if (optionalApplication.isPresent()) {
|
if (optionalApplication.isPresent()) {
|
||||||
Application application = optionalApplication.get();
|
Application application = optionalApplication.get();
|
||||||
deployAppConfig.setApplication(applicationConverter.toDto(application));
|
deployAppConfig.setApplication(applicationConverter.toDto(application));
|
||||||
DeployLog lastDeployLog = deployLogRepository.findTop1ByApplicationIdOrderByCreateTimeDesc(application.getId());
|
Optional<DeployLog> lastDeployLogOptional = deployLogRepository.findTop1ByApplicationIdOrderByCreateTimeDesc(application.getId());
|
||||||
Optional<WorkflowInstance> optionalWorkflowInstance = workflowInstanceRepository.findById(lastDeployLog.getWorkflowInstanceId());
|
if (lastDeployLogOptional.isEmpty()) {
|
||||||
if (optionalWorkflowInstance.isPresent()) {
|
return;
|
||||||
WorkflowInstance workflowInstance = optionalWorkflowInstance.get();
|
|
||||||
deployAppConfig.setLastBuildStatus(workflowInstance.getStatus());
|
|
||||||
deployAppConfig.setLastBuildStartTime(workflowInstance.getStartTime());
|
|
||||||
deployAppConfig.setLastBuildEndTime(workflowInstance.getEndTime());
|
|
||||||
}
|
}
|
||||||
|
DeployLog lastDeployLog = lastDeployLogOptional.get();
|
||||||
|
Optional<WorkflowInstance> optionalWorkflowInstance = workflowInstanceRepository.findById(lastDeployLog.getWorkflowInstanceId());
|
||||||
|
if (optionalWorkflowInstance.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
WorkflowInstance workflowInstance = optionalWorkflowInstance.get();
|
||||||
|
deployAppConfig.setLastBuildStatus(workflowInstance.getStatus());
|
||||||
|
deployAppConfig.setLastBuildStartTime(workflowInstance.getStartTime());
|
||||||
|
deployAppConfig.setLastBuildEndTime(workflowInstance.getEndTime());
|
||||||
}
|
}
|
||||||
Optional<WorkflowDefinition> optionalWorkflowDefinition = workflowDefinitionRepository.findById(deployAppConfig.getWorkflowDefinitionId());
|
|
||||||
optionalWorkflowDefinition.ifPresent(workflowDefinition -> deployAppConfig.setPublishedWorkflowDefinition(workflowDefinitionConverter.toDto(workflowDefinition)));
|
|
||||||
|
|
||||||
|
|
||||||
}).collect(toList());
|
}).collect(toList());
|
||||||
return new PageImpl<>(result, page.getPageable(), page.getTotalElements());
|
return new PageImpl<>(result, page.getPageable(), page.getTotalElements());
|
||||||
}
|
}
|
||||||
|
|||||||
@ -107,7 +107,6 @@ public class WorkflowNodeDefinitionServiceImpl extends BaseServiceImpl<WorkflowN
|
|||||||
if (localVariables != null) {
|
if (localVariables != null) {
|
||||||
definedDTO.setLocalVariablesSchema(generateSchema(localVariables));
|
definedDTO.setLocalVariablesSchema(generateSchema(localVariables));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Class<?> formVariables = nodeType.getFormVariables();
|
// Class<?> formVariables = nodeType.getFormVariables();
|
||||||
// if (formVariables != null) {
|
// if (formVariables != null) {
|
||||||
// definedDTO.setFormVariablesSchema(generateSchema(formVariables));
|
// definedDTO.setFormVariablesSchema(generateSchema(formVariables));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user