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

增加form表单

Browse Source
This commit is contained in:
dengqichen 2025-10-28 16:48:49 +08:00
parent fdfc951e2d
commit 93551ef55f
6 changed files with 15 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package com.qqchen.deploy.backend.deploy.dto;
import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum; import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum;
import com.qqchen.deploy.backend.framework.dto.BaseDTO; import com.qqchen.deploy.backend.framework.dto.BaseDTO;
import com.qqchen.deploy.backend.system.model.ExternalSystemDTO;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -24,13 +23,10 @@ public class ApplicationDTO extends BaseDTO {
@NotNull(message = "开发语言") @NotNull(message = "开发语言")
private DevelopmentLanguageTypeEnum language; private DevelopmentLanguageTypeEnum language;
@NotNull(message = "三方系统ID不能为空") @Schema(description = "代码仓库组ID")
private Long externalSystemId;
@NotNull(message = "代码仓库组ID不能为空")
private Long repoGroupId; private Long repoGroupId;
@NotNull(message = "代码仓库项目ID不能为空") @Schema(description = "代码仓库项目ID")
private Long repoProjectId; private Long repoProjectId;
@NotNull(message = "所属项目组ID不能为空") @NotNull(message = "所属项目组ID不能为空")
@ -42,8 +38,6 @@ public class ApplicationDTO extends BaseDTO {
@NotNull(message = "排序号不能为空") @NotNull(message = "排序号不能为空")
private Integer sort; private Integer sort;
private ExternalSystemDTO externalSystem;
private RepositoryGroupDTO repositoryGroup; private RepositoryGroupDTO repositoryGroup;
private RepositoryProjectDTO repositoryProject; private RepositoryProjectDTO repositoryProject;

9
backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java
View File

@ -1,8 +1,5 @@
package com.qqchen.deploy.backend.deploy.dto; package com.qqchen.deploy.backend.deploy.dto;
import com.fasterxml.jackson.databind.JsonNode;
import com.qqchen.deploy.backend.deploy.enums.BuildTypeEnum;
import com.qqchen.deploy.backend.deploy.enums.DeployTypeEnum;
import com.qqchen.deploy.backend.framework.dto.BaseDTO; import com.qqchen.deploy.backend.framework.dto.BaseDTO;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
@ -32,12 +29,6 @@ public class EnvironmentDTO extends BaseDTO {
@Schema(description = "环境描述") @Schema(description = "环境描述")
private String envDesc; private String envDesc;
@Schema(description = "构建方式：JENKINS-Jenkins构建, GITLAB_RUNNER-GitLab Runner构建, GITHUB_ACTION-GitHub Action构建")
private BuildTypeEnum buildType;
@Schema(description = "部署方式：K8S-Kubernetes集群部署, DOCKER-Docker容器部署, VM-虚拟机部署")
private DeployTypeEnum deployType;
@NotNull(message = "启用字段不能为空") @NotNull(message = "启用字段不能为空")
private Boolean enabled; private Boolean enabled;

7
backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Application.java
View File

@ -42,19 +42,16 @@ public class Application extends Entity<Long> {
@Column(name = "language") @Column(name = "language")
private DevelopmentLanguageTypeEnum language; private DevelopmentLanguageTypeEnum language;
@Column(name = "external_system_id", nullable = false)
private Long externalSystemId;
/** /**
* 代码仓库组ID * 代码仓库组ID
*/ */
@Column(name = "repo_group_id", nullable = false) @Column(name = "repo_group_id")
private Long repoGroupId; private Long repoGroupId;
/** /**
* 代码仓库项目ID * 代码仓库项目ID
*/ */
@Column(name = "repo_project_id", nullable = false) @Column(name = "repo_project_id")
private Long repoProjectId; private Long repoProjectId;
/** /**

19
backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java
View File

@ -1,15 +1,10 @@
package com.qqchen.deploy.backend.deploy.entity; package com.qqchen.deploy.backend.deploy.entity;
import com.qqchen.deploy.backend.deploy.enums.BuildTypeEnum;
import com.qqchen.deploy.backend.deploy.enums.DeployTypeEnum;
import com.qqchen.deploy.backend.framework.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.ArrayList;
import java.util.List;
/** /**
* 环境实体 * 环境实体
*/ */
@ -43,20 +38,6 @@ public class Environment extends Entity<Long> {
@Column(name = "env_desc") @Column(name = "env_desc")
private String envDesc; private String envDesc;
/**
* 构建方式
*/
@Enumerated(EnumType.STRING)
@Column(name = "build_type")
private BuildTypeEnum buildType;
/**
* 部署方式
*/
@Enumerated(EnumType.STRING)
@Column(name = "deploy_type")
private DeployTypeEnum deployType;
@Column(name = "enabled") @Column(name = "enabled")
private Boolean enabled; private Boolean enabled;

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

@ -70,16 +70,16 @@ public class ApplicationServiceImpl extends BaseServiceImpl<Application, Applica
projectGroupOptional.ifPresent(projectGroup -> application.setProjectGroup(projectGroupConverter.toDto(projectGroup))); projectGroupOptional.ifPresent(projectGroup -> application.setProjectGroup(projectGroupConverter.toDto(projectGroup)));
// 查询并设置代码仓库组信息 // 查询并设置代码仓库组信息
Optional<RepositoryGroup> repositoryGroupOptional = repositoryGroupRepository.findByRepoGroupId(application.getRepoGroupId()); if (application.getRepoGroupId() != null) {
repositoryGroupOptional.ifPresent(repositoryGroup -> application.setRepositoryGroup(repositoryGroupConverter.toDto(repositoryGroup))); Optional<RepositoryGroup> repositoryGroupOptional = repositoryGroupRepository.findByRepoGroupId(application.getRepoGroupId());
repositoryGroupOptional.ifPresent(repositoryGroup -> application.setRepositoryGroup(repositoryGroupConverter.toDto(repositoryGroup)));
}
// 查询并设置代码仓库项目信息 // 查询并设置代码仓库项目信息
Optional<RepositoryProject> repositoryProjectOptional = repositoryProjectRepository.findByRepoProjectId(application.getRepoProjectId()); if (application.getRepoProjectId() != null) {
repositoryProjectOptional.ifPresent(repositoryProject -> application.setRepositoryProject(repositoryProjectConverter.toDto(repositoryProject))); Optional<RepositoryProject> repositoryProjectOptional = repositoryProjectRepository.findByRepoProjectId(application.getRepoProjectId());
repositoryProjectOptional.ifPresent(repositoryProject -> application.setRepositoryProject(repositoryProjectConverter.toDto(repositoryProject)));
// 查询并设置外部系统信息 }
Optional<ExternalSystem> externalSystemOptional = externalSystemRepository.findById(application.getExternalSystemId());
externalSystemOptional.ifPresent(externalSystem -> application.setExternalSystem(externalSystemConverter.toDto(externalSystem)));
}).collect(toList()); }).collect(toList());
return new PageImpl<>(result, page.getPageable(), page.getTotalElements()); return new PageImpl<>(result, page.getPageable(), page.getTotalElements());
} }

9
backend/src/main/resources/db/changelog/changes/v1.0.0-schema.sql
View File

@ -708,10 +708,9 @@ CREATE TABLE deploy_application
app_name VARCHAR(100) NOT NULL COMMENT '应用名称', app_name VARCHAR(100) NOT NULL COMMENT '应用名称',
app_desc VARCHAR(255) NULL COMMENT '应用描述', app_desc VARCHAR(255) NULL COMMENT '应用描述',
language VARCHAR(50) NULL COMMENT '开发语言：JAVA、PYTHON、NODEJS', language VARCHAR(50) NULL COMMENT '开发语言：JAVA、PYTHON、NODEJS',
repo_group_id BIGINT NOT NULL COMMENT '代码仓库项目ID', repo_group_id BIGINT NULL COMMENT '代码仓库组ID',
repo_project_id BIGINT NOT NULL COMMENT '代码仓库项目ID', repo_project_id BIGINT NULL COMMENT '代码仓库项目ID',
project_group_id BIGINT NOT NULL COMMENT '所属项目组ID', project_group_id BIGINT NOT NULL COMMENT '所属项目组ID',
external_system_id BIGINT NOT NULL COMMENT '外部系统ID',
enabled BIT NOT NULL DEFAULT 1 COMMENT '是否启用（0：禁用，1：启用）', enabled BIT NOT NULL DEFAULT 1 COMMENT '是否启用（0：禁用，1：启用）',
sort INT NOT NULL DEFAULT 0 COMMENT '排序号', sort INT NOT NULL DEFAULT 0 COMMENT '排序号',
-- 基础字段 -- 基础字段
@ -741,9 +740,7 @@ CREATE TABLE deploy_environment
env_code VARCHAR(50) NOT NULL COMMENT '环境编码', env_code VARCHAR(50) NOT NULL COMMENT '环境编码',
env_name VARCHAR(100) NOT NULL COMMENT '环境名称', env_name VARCHAR(100) NOT NULL COMMENT '环境名称',
env_desc VARCHAR(255) NULL COMMENT '环境描述', env_desc VARCHAR(255) NULL COMMENT '环境描述',
build_type VARCHAR(100) NULL COMMENT '构建类型：JENKINS-Jenkins构建,GITLAB_RUNNER-GitLab Runner构建,GITHUB_ACTION-GitHub Action构建', enabled BIT NOT NULL DEFAULT 1 COMMENT '是否启用（0：禁用，1：启用）',
deploy_type VARCHAR(100) NULL COMMENT '部署方式：K8S-Kubernetes集群部署, DOCKER-Docker容器部署, VM-虚拟机部署',
enabled BIT NOT NULL DEFAULT 1 COMMENT '是否启用（0：禁用，1：启用）',
sort INT NOT NULL DEFAULT 0 COMMENT '排序号', sort INT NOT NULL DEFAULT 0 COMMENT '排序号',
-- 基础字段 -- 基础字段