1
This commit is contained in:
parent
33f3811078
commit
132acb1483
@ -1,11 +1,11 @@
|
||||
package com.qqchen.deploy.backend.system.api;
|
||||
package com.qqchen.deploy.backend.deploy.api;
|
||||
|
||||
import com.qqchen.deploy.backend.system.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.framework.api.Response;
|
||||
import com.qqchen.deploy.backend.framework.controller.BaseController;
|
||||
import com.qqchen.deploy.backend.system.model.ExternalSystemDTO;
|
||||
import com.qqchen.deploy.backend.system.model.query.ExternalSystemQuery;
|
||||
import com.qqchen.deploy.backend.system.service.IExternalSystemService;
|
||||
import com.qqchen.deploy.backend.deploy.service.IExternalSystemService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.qqchen.deploy.backend.system.converter;
|
||||
package com.qqchen.deploy.backend.deploy.converter;
|
||||
|
||||
import com.qqchen.deploy.backend.system.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.framework.converter.BaseConverter;
|
||||
import com.qqchen.deploy.backend.system.model.ExternalSystemDTO;
|
||||
import org.mapstruct.Mapper;
|
||||
@ -7,6 +7,7 @@ import jakarta.persistence.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@ -65,7 +66,6 @@ public class Environment extends Entity<Long> {
|
||||
/**
|
||||
* 关联的项目组列表
|
||||
*/
|
||||
// @ManyToMany(mappedBy = "environments")
|
||||
@ManyToMany(mappedBy = "environments")
|
||||
private List<ProjectGroup> projectGroups;
|
||||
private List<ProjectGroup> projectGroups = new ArrayList<>();
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
package com.qqchen.deploy.backend.deploy.entity;
|
||||
|
||||
import com.qqchen.deploy.backend.system.enums.ExternalSystemAuthTypeEnum;
|
||||
import com.qqchen.deploy.backend.system.enums.ExternalSystemSyncStatusEnum;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
package com.qqchen.deploy.backend.deploy.entity;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
@ -16,8 +16,8 @@ import java.time.LocalDateTime;
|
||||
@LogicDelete
|
||||
public class JenkinsBuild extends Entity<Long> {
|
||||
|
||||
@Column(name = "jenkins_id", nullable = false)
|
||||
private Long jenkinsId;
|
||||
@Column(name = "external_system_id", nullable = false)
|
||||
private Long external_system_id;
|
||||
|
||||
@Column(name = "job_id", nullable = false)
|
||||
private Long jobId;
|
||||
@ -34,6 +34,7 @@ public class JenkinsBuild extends Entity<Long> {
|
||||
@Column(name = "start_time", nullable = false)
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Column(name = "duration", nullable = false)
|
||||
private Long duration;
|
||||
|
||||
@Column(name = "trigger_cause", columnDefinition = "TEXT")
|
||||
@ -1,4 +1,4 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
package com.qqchen.deploy.backend.deploy.entity;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
@ -21,8 +21,8 @@ import java.time.LocalDateTime;
|
||||
@LogicDelete
|
||||
public class JenkinsJob extends Entity<Long> {
|
||||
|
||||
@Column(name = "jenkins_id", nullable = false)
|
||||
private Long jenkinsId;
|
||||
@Column(name = "external_system_id", nullable = false)
|
||||
private Long external_system_id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "view_id")
|
||||
@ -1,5 +1,7 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
package com.qqchen.deploy.backend.deploy.entity;
|
||||
|
||||
import com.qqchen.deploy.backend.deploy.enums.ExternalSystemSyncStatus;
|
||||
import com.qqchen.deploy.backend.deploy.enums.JenkinsSyncType;
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
import jakarta.persistence.Column;
|
||||
@ -18,16 +20,16 @@ import java.time.LocalDateTime;
|
||||
@LogicDelete
|
||||
public class JenkinsSyncHistory extends Entity<Long> {
|
||||
|
||||
@Column(name = "jenkins_id", nullable = false)
|
||||
private Long jenkinsId;
|
||||
@Column(name = "external_system_id", nullable = false)
|
||||
private Long external_system_id;
|
||||
|
||||
@Column(name = "sync_type", nullable = false)
|
||||
@Enumerated(EnumType.STRING)
|
||||
private SyncType syncType;
|
||||
private JenkinsSyncType syncType;
|
||||
|
||||
@Column(nullable = false)
|
||||
@Enumerated(EnumType.STRING)
|
||||
private SyncStatus status;
|
||||
private ExternalSystemSyncStatus status;
|
||||
|
||||
@Column(name = "start_time", nullable = false)
|
||||
private LocalDateTime startTime;
|
||||
@ -38,16 +40,4 @@ public class JenkinsSyncHistory extends Entity<Long> {
|
||||
@Column(name = "error_message", columnDefinition = "TEXT")
|
||||
private String errorMessage;
|
||||
|
||||
public enum SyncType {
|
||||
ALL, // 全量同步
|
||||
VIEW, // 同步视图
|
||||
JOB, // 同步作业
|
||||
BUILD // 同步构建记录
|
||||
}
|
||||
|
||||
public enum SyncStatus {
|
||||
SUCCESS, // 同步成功
|
||||
FAILED, // 同步失败
|
||||
RUNNING // 同步中
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
package com.qqchen.deploy.backend.deploy.entity;
|
||||
|
||||
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
@ -15,8 +15,8 @@ import lombok.EqualsAndHashCode;
|
||||
@LogicDelete
|
||||
public class JenkinsView extends Entity<Long> {
|
||||
|
||||
@Column(name = "jenkins_id", nullable = false)
|
||||
private Long jenkinsId;
|
||||
@Column(name = "external_system_id", nullable = false)
|
||||
private Long external_system_id;
|
||||
|
||||
@Column(name = "view_name", nullable = false)
|
||||
private String viewName;
|
||||
@ -4,7 +4,10 @@ import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.SQLDelete;
|
||||
import org.hibernate.annotations.Where;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@ -14,6 +17,8 @@ import java.util.List;
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@jakarta.persistence.Entity
|
||||
@Table(name = "deploy_project_group")
|
||||
@SQLDelete(sql = "UPDATE deploy_project_group SET deleted = true WHERE id = ?; DELETE FROM deploy_project_group_environment WHERE project_group_id = ?")
|
||||
@Where(clause = "deleted = false")
|
||||
public class ProjectGroup extends Entity<Long> {
|
||||
|
||||
/**
|
||||
@ -61,6 +66,5 @@ public class ProjectGroup extends Entity<Long> {
|
||||
joinColumns = @JoinColumn(name = "project_group_id"),
|
||||
inverseJoinColumns = @JoinColumn(name = "environment_id")
|
||||
)
|
||||
private List<Environment> environments;
|
||||
|
||||
private List<Environment> environments = new ArrayList<>();
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
package com.qqchen.deploy.backend.deploy.entity;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
package com.qqchen.deploy.backend.deploy.entity;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
package com.qqchen.deploy.backend.deploy.entity;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
package com.qqchen.deploy.backend.deploy.entity;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
@ -0,0 +1,7 @@
|
||||
package com.qqchen.deploy.backend.deploy.enums;
|
||||
|
||||
public enum ExternalSystemSyncStatus {
|
||||
SUCCESS, // 同步成功
|
||||
FAILED, // 同步失败
|
||||
RUNNING // 同步中
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package com.qqchen.deploy.backend.deploy.enums;
|
||||
|
||||
public enum JenkinsSyncType {
|
||||
ALL, // 全量同步
|
||||
VIEW, // 同步视图
|
||||
JOB, // 同步作业
|
||||
BUILD // 同步构建记录
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
package com.qqchen.deploy.backend.system.integration;
|
||||
package com.qqchen.deploy.backend.deploy.integration;
|
||||
|
||||
import com.qqchen.deploy.backend.system.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum;
|
||||
|
||||
/**
|
||||
@ -1,8 +1,8 @@
|
||||
package com.qqchen.deploy.backend.system.integration.impl;
|
||||
package com.qqchen.deploy.backend.deploy.integration.impl;
|
||||
|
||||
import com.qqchen.deploy.backend.system.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum;
|
||||
import com.qqchen.deploy.backend.system.integration.IExternalSystemIntegration;
|
||||
import com.qqchen.deploy.backend.deploy.integration.IExternalSystemIntegration;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.*;
|
||||
import org.springframework.stereotype.Service;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.qqchen.deploy.backend.system.integration.impl;
|
||||
package com.qqchen.deploy.backend.deploy.integration.impl;
|
||||
|
||||
import com.qqchen.deploy.backend.system.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.deploy.integration.IExternalSystemIntegration;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum;
|
||||
import com.qqchen.deploy.backend.system.integration.IExternalSystemIntegration;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.*;
|
||||
import org.springframework.stereotype.Service;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
package com.qqchen.deploy.backend.deploy.repository;
|
||||
|
||||
import com.qqchen.deploy.backend.system.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum;
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
package com.qqchen.deploy.backend.deploy.repository;
|
||||
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.system.entity.JenkinsBuild;
|
||||
import com.qqchen.deploy.backend.deploy.entity.JenkinsBuild;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
@ -0,0 +1,13 @@
|
||||
package com.qqchen.deploy.backend.deploy.repository;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.deploy.entity.JenkinsJob;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
@Repository
|
||||
public interface IJenkinsJobRepository extends IBaseRepository<JenkinsJob, Long> {
|
||||
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
package com.qqchen.deploy.backend.deploy.repository;
|
||||
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.system.entity.JenkinsSyncHistory;
|
||||
import com.qqchen.deploy.backend.deploy.entity.JenkinsSyncHistory;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
@ -0,0 +1,13 @@
|
||||
package com.qqchen.deploy.backend.deploy.repository;
|
||||
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.deploy.entity.JenkinsView;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Repository
|
||||
public interface IJenkinsViewRepository extends IBaseRepository<JenkinsView, Long> {
|
||||
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
package com.qqchen.deploy.backend.deploy.repository;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.system.entity.RepositoryBranch;
|
||||
import com.qqchen.deploy.backend.deploy.entity.RepositoryBranch;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@ -1,7 +1,7 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
package com.qqchen.deploy.backend.deploy.repository;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.system.entity.RepositoryGroup;
|
||||
import com.qqchen.deploy.backend.deploy.entity.RepositoryGroup;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@ -1,7 +1,7 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
package com.qqchen.deploy.backend.deploy.repository;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.system.entity.RepositoryProject;
|
||||
import com.qqchen.deploy.backend.deploy.entity.RepositoryProject;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
package com.qqchen.deploy.backend.deploy.repository;
|
||||
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.system.entity.RepositorySyncHistory;
|
||||
import com.qqchen.deploy.backend.deploy.entity.RepositorySyncHistory;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.qqchen.deploy.backend.system.service;
|
||||
package com.qqchen.deploy.backend.deploy.service;
|
||||
|
||||
import com.qqchen.deploy.backend.system.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.framework.service.IBaseService;
|
||||
import com.qqchen.deploy.backend.system.model.ExternalSystemDTO;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.qqchen.deploy.backend.system.service.impl;
|
||||
package com.qqchen.deploy.backend.deploy.service.impl;
|
||||
|
||||
import com.qqchen.deploy.backend.system.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ExternalSystem;
|
||||
import com.qqchen.deploy.backend.system.enums.ExternalSystemAuthTypeEnum;
|
||||
import com.qqchen.deploy.backend.system.enums.ExternalSystemSyncStatusEnum;
|
||||
import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum;
|
||||
@ -9,10 +9,10 @@ import com.qqchen.deploy.backend.framework.enums.ResponseCode;
|
||||
import com.qqchen.deploy.backend.framework.exception.BusinessException;
|
||||
import com.qqchen.deploy.backend.framework.exception.UniqueConstraintException;
|
||||
import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
|
||||
import com.qqchen.deploy.backend.system.integration.IExternalSystemIntegration;
|
||||
import com.qqchen.deploy.backend.deploy.integration.IExternalSystemIntegration;
|
||||
import com.qqchen.deploy.backend.system.model.ExternalSystemDTO;
|
||||
import com.qqchen.deploy.backend.system.repository.IExternalSystemRepository;
|
||||
import com.qqchen.deploy.backend.system.service.IExternalSystemService;
|
||||
import com.qqchen.deploy.backend.deploy.repository.IExternalSystemRepository;
|
||||
import com.qqchen.deploy.backend.deploy.service.IExternalSystemService;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@ -4,9 +4,24 @@ import com.qqchen.deploy.backend.deploy.dto.ProjectGroupDTO;
|
||||
import com.qqchen.deploy.backend.deploy.entity.ProjectGroup;
|
||||
import com.qqchen.deploy.backend.deploy.service.IProjectGroupService;
|
||||
import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
|
||||
import jakarta.persistence.Query;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
public class ProjectGroupServiceImpl extends BaseServiceImpl<ProjectGroup, ProjectGroupDTO, Long> implements IProjectGroupService {
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void delete(Long id) {
|
||||
// 1. 先删除中间表数据
|
||||
Query query = entityManager.createNativeQuery(
|
||||
"DELETE FROM deploy_project_group_environment WHERE project_group_id = :projectGroupId"
|
||||
);
|
||||
query.setParameter("projectGroupId", id);
|
||||
query.executeUpdate();
|
||||
|
||||
// 2. 再调用父类的删除方法(逻辑删除ProjectGroup)
|
||||
super.delete(id);
|
||||
}
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
package com.qqchen.deploy.backend.system.converter;
|
||||
|
||||
import com.qqchen.deploy.backend.system.entity.RepositoryGroup;
|
||||
import com.qqchen.deploy.backend.system.entity.RepositoryProject;
|
||||
import com.qqchen.deploy.backend.system.entity.RepositoryBranch;
|
||||
import com.qqchen.deploy.backend.deploy.entity.RepositoryGroup;
|
||||
import com.qqchen.deploy.backend.deploy.entity.RepositoryProject;
|
||||
import com.qqchen.deploy.backend.deploy.entity.RepositoryBranch;
|
||||
import com.qqchen.deploy.backend.system.model.dto.RepositoryGroupDTO;
|
||||
import com.qqchen.deploy.backend.system.model.dto.RepositoryProjectDTO;
|
||||
import com.qqchen.deploy.backend.system.model.dto.RepositoryBranchDTO;
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
package com.qqchen.deploy.backend.system.entity;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
|
||||
import com.qqchen.deploy.backend.framework.domain.Entity;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@jakarta.persistence.Entity
|
||||
@Table(name = "deploy_jenkins_config")
|
||||
@LogicDelete
|
||||
public class JenkinsConfig extends Entity<Long> {
|
||||
|
||||
@Column(nullable = false)
|
||||
private String name;
|
||||
|
||||
@Column(nullable = false)
|
||||
private String url;
|
||||
|
||||
@Column(nullable = false)
|
||||
private String username;
|
||||
|
||||
@Column(nullable = false)
|
||||
private String password;
|
||||
|
||||
private Integer sort;
|
||||
|
||||
private String remark;
|
||||
|
||||
@Column(name = "last_all_sync_time")
|
||||
private LocalDateTime lastAllSyncTime;
|
||||
|
||||
@Column(name = "last_view_sync_time")
|
||||
private LocalDateTime lastViewSyncTime;
|
||||
|
||||
@Column(name = "last_job_sync_time")
|
||||
private LocalDateTime lastJobSyncTime;
|
||||
|
||||
@Column(name = "last_build_sync_time")
|
||||
private LocalDateTime lastBuildSyncTime;
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.system.entity.JenkinsConfig;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
@Repository
|
||||
public interface IJenkinsConfigRepository extends IBaseRepository<JenkinsConfig, Long> {
|
||||
List<JenkinsConfig> findByDeletedFalseOrderBySort();
|
||||
boolean existsByNameAndDeletedFalse(String name);
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.system.entity.JenkinsJob;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
@Repository
|
||||
public interface IJenkinsJobRepository extends IBaseRepository<JenkinsJob, Long> {
|
||||
List<JenkinsJob> findByJenkinsIdAndDeletedFalse(Long jenkinsId);
|
||||
List<JenkinsJob> findByJenkinsIdAndJobNameAndDeletedFalse(Long jenkinsId, String jobName);
|
||||
void deleteByJenkinsIdAndDeletedFalse(Long jenkinsId);
|
||||
|
||||
@Query("SELECT j FROM JenkinsJob j " +
|
||||
"JOIN FETCH j.view v " +
|
||||
"WHERE j.jenkinsId = :jenkinsId " +
|
||||
"AND v.viewName = :viewName " +
|
||||
"AND j.deleted = false " +
|
||||
"AND v.deleted = false")
|
||||
List<JenkinsJob> findJobsByJenkinsIdAndViewName(
|
||||
@Param("jenkinsId") Long jenkinsId,
|
||||
@Param("viewName") String viewName
|
||||
);
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package com.qqchen.deploy.backend.system.repository;
|
||||
|
||||
|
||||
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
|
||||
import com.qqchen.deploy.backend.system.entity.JenkinsView;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Repository
|
||||
public interface IJenkinsViewRepository extends IBaseRepository<JenkinsView, Long> {
|
||||
List<JenkinsView> findByJenkinsIdAndDeletedFalse(Long jenkinsId);
|
||||
List<JenkinsView> findByJenkinsIdAndViewNameAndDeletedFalse(Long jenkinsId, String viewName);
|
||||
void deleteByJenkinsIdAndDeletedFalse(Long jenkinsId);
|
||||
}
|
||||
@ -61,8 +61,6 @@ VALUES
|
||||
(4, '菜单管理', '/system/menu', '/src/pages/system/menu/index', 'MenuOutlined', 2, 1, 30, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
|
||||
-- 部门管理
|
||||
(5, '部门管理', '/system/department', '/src/pages/system/department/index', 'ApartmentOutlined', 2, 1, 40, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
|
||||
-- 三方系统
|
||||
(70, '三方系统', '/system/external', '/src/pages/system/external/index', 'ApiOutlined', 2, 1, 70, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
|
||||
|
||||
-- 工作流管理
|
||||
(100, '工作流管理', '/workflow', 'Layout', 'DeploymentUnitOutlined', 1, NULL, 2, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
|
||||
@ -79,7 +77,9 @@ VALUES
|
||||
|
||||
(203, '项目组管理', '/deploy/project-group', '/src/pages/Deploy/ProjectGroup/List/index', 'ProjectOutlined', 2, 200, 2, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
|
||||
|
||||
(202, '应用管理', '/deploy/applications', '/src/pages/Deploy/Application/List/index', 'AppstoreOutlined', 2, 200, 3, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE);
|
||||
(204, '应用管理', '/deploy/applications', '/src/pages/Deploy/Application/List/index', 'AppstoreOutlined', 2, 200, 3, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
|
||||
-- 三方系统
|
||||
(205, '三方系统管理', '/deploy/external', '/src/pages/Deploy/external/index', 'ApiOutlined', 2, 200, 70, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE);
|
||||
|
||||
-- 初始化角色数据
|
||||
INSERT INTO sys_role (id, create_time, code, name, type, description, sort)
|
||||
@ -118,7 +118,7 @@ SELECT 1, id FROM sys_menu; -- 超级管理员拥有所有菜单权限
|
||||
INSERT INTO sys_role_menu (role_id, menu_id)
|
||||
VALUES
|
||||
(2, 1), (2, 2), (2, 3), (2, 4), (2, 5), -- 系统管理员拥有系统管理相关权限
|
||||
(3, 70); -- 普通用户拥有三方系统权限
|
||||
(3, 205); -- 普通用户拥有三方系统权限
|
||||
|
||||
-- 初始化权限模板
|
||||
INSERT INTO sys_permission_template (id, create_time, code, name, type, description, enabled)
|
||||
@ -131,7 +131,7 @@ INSERT INTO sys_template_menu (template_id, menu_id)
|
||||
SELECT 1, id FROM sys_menu; -- 完整权限模板关联所有菜单
|
||||
|
||||
INSERT INTO sys_template_menu (template_id, menu_id)
|
||||
VALUES (2, 70); -- 基础权限模板关联三方系统菜单
|
||||
VALUES (2, 205); -- 基础权限模板关联三方系统菜单
|
||||
|
||||
-- 初始化权限数据
|
||||
INSERT INTO sys_permission (id, create_time, menu_id, code, name, type, sort)
|
||||
@ -149,12 +149,12 @@ VALUES
|
||||
(8, NOW(), 3, 'system:role:delete', '角色删除', 'FUNCTION', 4),
|
||||
|
||||
-- 三方系统权限
|
||||
(9, NOW(), 70, 'system:external:list', '三方系统列表', 'FUNCTION', 1),
|
||||
(10, NOW(), 70, 'system:external:create', '三方系统创建', 'FUNCTION', 2),
|
||||
(11, NOW(), 70, 'system:external:update', '三方系统修改', 'FUNCTION', 3),
|
||||
(12, NOW(), 70, 'system:external:delete', '三方系统删除', 'FUNCTION', 4),
|
||||
(13, NOW(), 70, 'system:external:test', '连接测试', 'FUNCTION', 5),
|
||||
(14, NOW(), 70, 'system:external:sync', '数据同步', 'FUNCTION', 6);
|
||||
(9, NOW(), 205, 'system:external:list', '三方系统列表', 'FUNCTION', 1),
|
||||
(10, NOW(), 205, 'system:external:create', '三方系统创建', 'FUNCTION', 2),
|
||||
(11, NOW(), 205, 'system:external:update', '三方系统修改', 'FUNCTION', 3),
|
||||
(12, NOW(), 205, 'system:external:delete', '三方系统删除', 'FUNCTION', 4),
|
||||
(13, NOW(), 205, 'system:external:test', '连接测试', 'FUNCTION', 5),
|
||||
(14, NOW(), 205, 'system:external:sync', '数据同步', 'FUNCTION', 6);
|
||||
|
||||
-- --------------------------------------------------------------------------------------
|
||||
-- 初始化外部系统数据
|
||||
|
||||
Loading…
Reference in New Issue
Block a user