From d2dfc0f0e12111139a6a3d6d593b160d7244cc74 Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Thu, 15 May 2025 18:26:01 +0800 Subject: [PATCH] 0515 ljc --- .../framework/tenant/config/OpsTenantAutoConfiguration.java | 2 +- .../ci/process/process/dataObject/pipeline/PipPipeline.java | 3 +++ .../ci/process/process/dataObject/resource/PipResource.java | 3 +++ .../cd/casic/ci/process/process/dataObject/stage/PipStage.java | 2 -- .../cd/casic/ci/process/process/dataObject/task/PipTask.java | 3 +++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/framework/spring-boot-starter-biz-tenant/src/main/java/cd/casic/framework/tenant/config/OpsTenantAutoConfiguration.java b/framework/spring-boot-starter-biz-tenant/src/main/java/cd/casic/framework/tenant/config/OpsTenantAutoConfiguration.java index d8583d8..121f726 100644 --- a/framework/spring-boot-starter-biz-tenant/src/main/java/cd/casic/framework/tenant/config/OpsTenantAutoConfiguration.java +++ b/framework/spring-boot-starter-biz-tenant/src/main/java/cd/casic/framework/tenant/config/OpsTenantAutoConfiguration.java @@ -51,7 +51,7 @@ public class OpsTenantAutoConfiguration { // ========== DB ========== - @Bean +// @Bean public TenantLineInnerInterceptor tenantLineInnerInterceptor(TenantProperties properties, MybatisPlusInterceptor interceptor) { TenantLineInnerInterceptor inner = new TenantLineInnerInterceptor(new TenantDatabaseInterceptor(properties)); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java index bfc1b27..949eb13 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java @@ -1,5 +1,7 @@ package cd.casic.ci.process.process.dataObject.pipeline; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.time.LocalDateTime; @@ -9,6 +11,7 @@ public class PipPipeline { /** * 主键id */ + @TableId(type = IdType.ASSIGN_ID) private String id; /** diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java index cf580a9..9c322d7 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java @@ -1,5 +1,7 @@ package cd.casic.ci.process.process.dataObject.resource; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.time.LocalDateTime; @@ -9,6 +11,7 @@ public class PipResource { /** * 主键id */ + @TableId(type = IdType.ASSIGN_ID) private String id; /** diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java index c2b9e06..3f17c84 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java @@ -39,8 +39,6 @@ public class PipStage { //@ApiProperty(name = "stageList",desc="阶段") @TableField(exist = false) private List stageList; - // 执行实例id - private String instanceId; private LocalDateTime updateTime; private Long createUserId; private Long updateUserId; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java index fb21e33..b1f440d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java @@ -1,5 +1,7 @@ package cd.casic.ci.process.process.dataObject.task; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import org.json.JSONObject; @@ -8,6 +10,7 @@ import java.time.LocalDateTime; @Data public class PipTask { //@ApiProperty(name="taskId",desc="配置id") + @TableId(type = IdType.ASSIGN_ID) private String taskId; //@ApiProperty(name="createTime",desc="创建时间")