diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml index 4cef955d711f18442750335ffca446ecefb8984f..13a909928a2fd2d9133fbe1f05ec34549b41dcf0 100644 --- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml +++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml @@ -34,7 +34,7 @@ along with this program. If not, see .--> from deploy_job a left join cmdb_cientity b ON a.app_system_id = b.id left join cmdb_cientity c ON a.app_module_id = c.id - left join cmdb_cientity d ON a.env_id = d.id + left join cmdb_global_attritem d ON a.env_id = d.id left join autoexec_scenario e on e.id = a.scenario_id where a.id = #{value} @@ -70,7 +70,7 @@ along with this program. If not, see .--> a.runner_map_id as runnerMapId FROM `autoexec_job` aj join deploy_job a on aj.id = a.id - left join cmdb_cientity d ON a.env_id = d.id + left join cmdb_global_attritem d ON a.env_id = d.id left join autoexec_scenario e on e.id = a.scenario_id where a.id = #{value} @@ -89,7 +89,7 @@ along with this program. If not, see .--> from deploy_job a left join cmdb_cientity b ON a.app_system_id = b.id left join cmdb_cientity c ON a.app_module_id = c.id - left join cmdb_cientity d ON a.env_id = d.id + left join cmdb_global_attritem d ON a.env_id = d.id where a.id in #{id} @@ -340,7 +340,7 @@ along with this program. If not, see .--> left join @{DATA_SCHEMA}.scence_appsystem_appmodule saa on saa.id = a.app_system_id AND saa.app_module_id = a.app_module_id - left join cmdb_cientity d ON a.env_id = d.id + left join cmdb_global_attritem d ON a.env_id = d.id left join autoexec_scenario e on a.scenario_id = e.id WHERE aj.`id` in @@ -539,7 +539,7 @@ along with this program. If not, see .--> LEFT JOIN autoexec_job e ON d.job_id = e.id LEFT JOIN deploy_job f ON e.id = f.id LEFT JOIN @{DATA_SCHEMA}.scence_appsystem_appmodule AS saa ON saa.id = f.app_system_id AND saa.app_module_id = f.app_module_id - LEFT JOIN cmdb_cientity i ON f.env_id = i.id + LEFT JOIN cmdb_global_attritem i ON f.env_id = i.id LEFT JOIN autoexec_job_group j ON e.id = j.job_id LEFT JOIN autoexec_job_phase k ON j.id = k.group_id LEFT JOIN deploy_job_auth l ON a.id = l.job_id diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployPipelineMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployPipelineMapper.xml index 791e4459106567f89c908c158c9e580c075671a2..5ed7bb537428bd8d6acadd4feb012ead6ada9400 100644 --- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployPipelineMapper.xml +++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployPipelineMapper.xml @@ -36,7 +36,7 @@ along with this program. If not, see .--> aes.`name` as scenarioName FROM deploy_pipeline_jobtemplate AS dpj LEFT JOIN @{DATA_SCHEMA}.scence_appsystem_appmodule AS saa ON saa.id = dpj.app_system_id AND saa.app_module_id = dpj.app_module_id - LEFT JOIN cmdb_cientity AS cienv ON dpj.env_id = cienv.id + LEFT JOIN cmdb_global_attritem AS cienv ON dpj.env_id = cienv.id LEFT JOIN autoexec_scenario aes ON dpj.scenario_id = aes.id WHERE dpj.id = #{value} @@ -74,7 +74,7 @@ along with this program. If not, see .--> FROM deploy_pipeline_jobtemplate AS dpj LEFT JOIN cmdb_cientity AS ciapp ON dpj.app_system_id = ciapp.id LEFT JOIN cmdb_cientity AS cimodule ON dpj.app_module_id = cimodule.id - LEFT JOIN cmdb_cientity AS cienv ON dpj.env_id = cienv.id + LEFT JOIN cmdb_global_attritem AS cienv ON dpj.env_id = cienv.id LEFT JOIN autoexec_scenario aes ON dpj.scenario_id = aes.id @@ -163,7 +163,7 @@ along with this program. If not, see .--> LEFT JOIN deploy_pipeline_lane AS dpl ON dp.id = dpl.pipeline_id LEFT JOIN deploy_pipeline_group AS dpg ON dpl.id = dpg.lane_id LEFT JOIN deploy_pipeline_jobtemplate AS dpj ON dpg.id = dpj.group_id - LEFT JOIN cmdb_cientity AS cienv ON dpj.env_id = cienv.id + LEFT JOIN cmdb_global_attritem AS cienv ON dpj.env_id = cienv.id LEFT JOIN @{DATA_SCHEMA}.scence_appsystem_appmodule AS saa ON saa.id = dpj.app_system_id AND saa.app_module_id = dpj.app_module_id LEFT JOIN deploy_pipeline_auth AS dpa ON dp.id = dpa.pipeline_id LEFT JOIN autoexec_scenario aes ON dpj.scenario_id = aes.id diff --git a/src/main/java/neatlogic/module/deploy/notify/handler/param/DeployJobStatusNameParamHandler.java b/src/main/java/neatlogic/module/deploy/notify/handler/param/DeployJobStatusNameParamHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..c843bc06b69731d983ad11ec3e2eaf0fc32e7239 --- /dev/null +++ b/src/main/java/neatlogic/module/deploy/notify/handler/param/DeployJobStatusNameParamHandler.java @@ -0,0 +1,22 @@ +package neatlogic.module.deploy.notify.handler.param; + +import neatlogic.framework.deploy.constvalue.DeployJobNotifyParam; +import neatlogic.framework.deploy.dto.job.DeployJobVo; +import neatlogic.framework.deploy.notify.DeployJobNotifyParamHandlerBase; +import org.springframework.stereotype.Component; + +@Component +public class DeployJobStatusNameParamHandler extends DeployJobNotifyParamHandlerBase { + @Override + public Object getMyText(DeployJobVo deployJobVo) { + if (deployJobVo != null) { + return deployJobVo.getStatusName(); + } + return null; + } + + @Override + public String getValue() { + return DeployJobNotifyParam.JOBSTATUSNAME.getValue(); + } +}