From 32e3dc13b8005efce21c8be0ed8c0e58a3ae0cda Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Sat, 19 Apr 2025 22:39:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=93=9D=E7=BB=BF=E6=89=A7=E8=A1=8C=E7=AD=96?= =?UTF-8?q?=E7=95=A5=20#[1402157146800128]=E5=8F=91=E5=B8=83=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=93=9D=E7=BB=BF=E6=89=A7=E8=A1=8C=E7=AD=96=E7=95=A5?= =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?= =?UTF-8?q?47543040/939050947543042/1402157146800128?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/dto/app/DeployBlueGreenVo.java | 69 +++++++++++++++ .../dto/app/DeployInstanceBlueGreenVo.java | 85 +++++++++++++++++++ .../app/DeployJobPhaseNodeBlueGreenVo.java | 75 ++++++++++++++++ 3 files changed, 229 insertions(+) create mode 100644 src/main/java/neatlogic/framework/deploy/dto/app/DeployBlueGreenVo.java create mode 100644 src/main/java/neatlogic/framework/deploy/dto/app/DeployInstanceBlueGreenVo.java create mode 100644 src/main/java/neatlogic/framework/deploy/dto/app/DeployJobPhaseNodeBlueGreenVo.java diff --git a/src/main/java/neatlogic/framework/deploy/dto/app/DeployBlueGreenVo.java b/src/main/java/neatlogic/framework/deploy/dto/app/DeployBlueGreenVo.java new file mode 100644 index 0000000..d02be79 --- /dev/null +++ b/src/main/java/neatlogic/framework/deploy/dto/app/DeployBlueGreenVo.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2025 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.deploy.dto.app; + +import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.common.dto.BaseEditorVo; +import neatlogic.framework.restful.annotation.EntityField; +import neatlogic.framework.util.SnowflakeUtil; + +public class DeployBlueGreenVo extends BaseEditorVo { + @EntityField(name = "id", type = ApiParamType.LONG) + private Long id; + @EntityField(name = "名称", type = ApiParamType.STRING) + private String name; + @EntityField(name = "排序", type = ApiParamType.INTEGER) + private Integer sort; + @EntityField(name = "是否激活", type = ApiParamType.INTEGER) + private Integer isActive; + + public Long getId() { + if (id == null) { + id = SnowflakeUtil.uniqueLong(); + } + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Integer getIsActive() { + return isActive; + } + + public void setIsActive(Integer isActive) { + this.isActive = isActive; + } +} diff --git a/src/main/java/neatlogic/framework/deploy/dto/app/DeployInstanceBlueGreenVo.java b/src/main/java/neatlogic/framework/deploy/dto/app/DeployInstanceBlueGreenVo.java new file mode 100644 index 0000000..bd7b01a --- /dev/null +++ b/src/main/java/neatlogic/framework/deploy/dto/app/DeployInstanceBlueGreenVo.java @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2025 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.deploy.dto.app; + +import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.common.dto.BaseEditorVo; +import neatlogic.framework.restful.annotation.EntityField; + +public class DeployInstanceBlueGreenVo extends BaseEditorVo { + @EntityField(name = "应用系统id", type = ApiParamType.LONG) + private Long appSystemId; + @EntityField(name = "模块id", type = ApiParamType.LONG) + private Long appModuleId; + @EntityField(name = "环境id", type = ApiParamType.LONG) + private Long envId; + @EntityField(name = "实例id", type = ApiParamType.LONG) + private Long resourceId; + @EntityField(name = "蓝绿id", type = ApiParamType.LONG) + private Long blueGreenId; + @EntityField(name = "蓝绿名", type = ApiParamType.STRING) + private String blueGreenName; + + public Long getAppSystemId() { + return appSystemId; + } + + public void setAppSystemId(Long appSystemId) { + this.appSystemId = appSystemId; + } + + public Long getAppModuleId() { + return appModuleId; + } + + public void setAppModuleId(Long appModuleId) { + this.appModuleId = appModuleId; + } + + public Long getEnvId() { + return envId; + } + + public void setEnvId(Long envId) { + this.envId = envId; + } + + public Long getResourceId() { + return resourceId; + } + + public void setResourceId(Long resourceId) { + this.resourceId = resourceId; + } + + public Long getBlueGreenId() { + return blueGreenId; + } + + public void setBlueGreenId(Long blueGreenId) { + this.blueGreenId = blueGreenId; + } + + public String getBlueGreenName() { + return blueGreenName; + } + + public void setBlueGreenName(String blueGreenName) { + this.blueGreenName = blueGreenName; + } +} diff --git a/src/main/java/neatlogic/framework/deploy/dto/app/DeployJobPhaseNodeBlueGreenVo.java b/src/main/java/neatlogic/framework/deploy/dto/app/DeployJobPhaseNodeBlueGreenVo.java new file mode 100644 index 0000000..a2baf0a --- /dev/null +++ b/src/main/java/neatlogic/framework/deploy/dto/app/DeployJobPhaseNodeBlueGreenVo.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2025 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.framework.deploy.dto.app; + +import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.common.dto.BaseEditorVo; +import neatlogic.framework.restful.annotation.EntityField; + +public class DeployJobPhaseNodeBlueGreenVo extends BaseEditorVo { + @EntityField(name = "作业id", type = ApiParamType.LONG) + private Long jobId; + @EntityField(name = "作业阶段id", type = ApiParamType.LONG) + private Long jobPhaseId; + @EntityField(name = "作业节点id", type = ApiParamType.LONG) + private Long jobPhaseNodeId; + @EntityField(name = "蓝绿id", type = ApiParamType.LONG) + private Long blueGreenId; + @EntityField(name = "跟新标记", type = ApiParamType.LONG) + private Long updateTag; + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public Long getJobPhaseId() { + return jobPhaseId; + } + + public void setJobPhaseId(Long jobPhaseId) { + this.jobPhaseId = jobPhaseId; + } + + public Long getJobPhaseNodeId() { + return jobPhaseNodeId; + } + + public void setJobPhaseNodeId(Long jobPhaseNodeId) { + this.jobPhaseNodeId = jobPhaseNodeId; + } + + public Long getBlueGreenId() { + return blueGreenId; + } + + public void setBlueGreenId(Long blueGreenId) { + this.blueGreenId = blueGreenId; + } + + public Long getUpdateTag() { + return updateTag; + } + + public void setUpdateTag(Long updateTag) { + this.updateTag = updateTag; + } +} -- Gitee From 99720ad688b0e2689e7ee84a6ffa2691785054b7 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Mon, 21 Apr 2025 16:25:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=93=9D=E7=BB=BF=E6=89=A7=E8=A1=8C=E7=AD=96?= =?UTF-8?q?=E7=95=A5=20#[1402157146800128]=E5=8F=91=E5=B8=83=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=93=9D=E7=BB=BF=E6=89=A7=E8=A1=8C=E7=AD=96=E7=95=A5?= =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?= =?UTF-8?q?47543040/939050947543042/1402157146800128?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/app/DeployInstanceBlueGreenVo.java | 10 +++++++++ .../app/DeployJobPhaseNodeBlueGreenVo.java | 21 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/deploy/dto/app/DeployInstanceBlueGreenVo.java b/src/main/java/neatlogic/framework/deploy/dto/app/DeployInstanceBlueGreenVo.java index bd7b01a..fb9aa04 100644 --- a/src/main/java/neatlogic/framework/deploy/dto/app/DeployInstanceBlueGreenVo.java +++ b/src/main/java/neatlogic/framework/deploy/dto/app/DeployInstanceBlueGreenVo.java @@ -34,6 +34,8 @@ public class DeployInstanceBlueGreenVo extends BaseEditorVo { private Long blueGreenId; @EntityField(name = "蓝绿名", type = ApiParamType.STRING) private String blueGreenName; + @EntityField(name = "蓝绿排序", type = ApiParamType.STRING) + private String blueGreenSort; public Long getAppSystemId() { return appSystemId; @@ -82,4 +84,12 @@ public class DeployInstanceBlueGreenVo extends BaseEditorVo { public void setBlueGreenName(String blueGreenName) { this.blueGreenName = blueGreenName; } + + public String getBlueGreenSort() { + return blueGreenSort; + } + + public void setBlueGreenSort(String blueGreenSort) { + this.blueGreenSort = blueGreenSort; + } } diff --git a/src/main/java/neatlogic/framework/deploy/dto/app/DeployJobPhaseNodeBlueGreenVo.java b/src/main/java/neatlogic/framework/deploy/dto/app/DeployJobPhaseNodeBlueGreenVo.java index a2baf0a..bdf32d2 100644 --- a/src/main/java/neatlogic/framework/deploy/dto/app/DeployJobPhaseNodeBlueGreenVo.java +++ b/src/main/java/neatlogic/framework/deploy/dto/app/DeployJobPhaseNodeBlueGreenVo.java @@ -32,7 +32,10 @@ public class DeployJobPhaseNodeBlueGreenVo extends BaseEditorVo { private Long blueGreenId; @EntityField(name = "跟新标记", type = ApiParamType.LONG) private Long updateTag; - + @EntityField(name = "蓝绿名", type = ApiParamType.STRING) + private String blueGreenName; + @EntityField(name = "蓝绿排序", type = ApiParamType.STRING) + private String blueGreenSort; public Long getJobId() { return jobId; } @@ -72,4 +75,20 @@ public class DeployJobPhaseNodeBlueGreenVo extends BaseEditorVo { public void setUpdateTag(Long updateTag) { this.updateTag = updateTag; } + + public String getBlueGreenName() { + return blueGreenName; + } + + public void setBlueGreenName(String blueGreenName) { + this.blueGreenName = blueGreenName; + } + + public String getBlueGreenSort() { + return blueGreenSort; + } + + public void setBlueGreenSort(String blueGreenSort) { + this.blueGreenSort = blueGreenSort; + } } -- Gitee