From 45f2ec31ae14b1e607a10babfd1f6f23db2660a9 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Fri, 11 Apr 2025 21:56:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=94=AF=E6=8C=81=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=99?= =?UTF-8?q?=E6=8E=92=E9=98=9F=20#[1396992549289984]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=94=AF=E6=8C=81=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=99?= =?UTF-8?q?=E6=8E=92=E9=98=9F=20http://192.168.0.96:8090/demo/rdm.html#/st?= =?UTF-8?q?ory-detail/939050947543040/939050947543042/1396992549289984?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/autoexec/constvalue/JobStatus.java | 1 + .../autoexec/dao/mapper/AutoexecJobMapper.java | 2 ++ .../autoexec/dao/mapper/AutoexecJobMapper.xml | 13 +++++++++++++ 3 files changed, 16 insertions(+) diff --git a/src/main/java/neatlogic/framework/autoexec/constvalue/JobStatus.java b/src/main/java/neatlogic/framework/autoexec/constvalue/JobStatus.java index 47f798ed..9233f1ed 100644 --- a/src/main/java/neatlogic/framework/autoexec/constvalue/JobStatus.java +++ b/src/main/java/neatlogic/framework/autoexec/constvalue/JobStatus.java @@ -27,6 +27,7 @@ import java.util.List; public enum JobStatus implements IEnum { SAVED("saved", "待提交"), PENDING("pending", "待运行"), + QUEUE("queue", "排队中"), RUNNING("running", "运行中"), PAUSING("pausing", "暂停中"), PAUSED("paused", "已暂停"), diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java index 5303d9f6..83f229fa 100644 --- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java +++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java @@ -231,6 +231,8 @@ public interface AutoexecJobMapper { List getJobPhaseRunnerMapByJobIdAndPhaseIdList(@Param("jobId") Long jobId, @Param("jobPhaseIdList") List jobPhaseId); + List getJobPhaseRunnerMapByJobId(@Param("jobId") Long jobId); + List getJobPhaseRunnerByJobIdAndPhaseIdListAndStatus(@Param("jobId") Long jobId, @Param("jobPhaseIdList") List jobPhaseId, @Param("status") String status); List getJobRunnerListByJobIdAndGroupId(@Param("jobId") Long jobId, @Param("groupId") Long groupId); diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml index 4b870344..89119fef 100644 --- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml +++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml @@ -1073,6 +1073,19 @@ along with this program. If not, see .--> + + + INSERT INTO `autoexec_job` (`id`, @@ -2891,6 +2897,23 @@ along with this program. If not, see .--> AND `runner_map_id` = #{runnerId} + + UPDATE + `autoexec_job_phase_runner` + SET + `status` = #{status} + + , `is_fire_next` = 0 + + WHERE `job_phase_id` in + + #{phaseId} + + AND `runner_map_id` in + + #{runnerId} + + UPDATE `autoexec_job_phase_runner` @@ -2923,10 +2946,10 @@ along with this program. If not, see .--> `autoexec_job_phase_node` SET `status` = #{status}, - + `start_time` = null, - + `end_time` = null WHERE `id` in diff --git a/src/main/java/neatlogic/framework/autoexec/exception/AutoexecJobGroupNotFoundException.java b/src/main/java/neatlogic/framework/autoexec/exception/AutoexecJobGroupNotFoundException.java index 9b8ad198..18ee6480 100644 --- a/src/main/java/neatlogic/framework/autoexec/exception/AutoexecJobGroupNotFoundException.java +++ b/src/main/java/neatlogic/framework/autoexec/exception/AutoexecJobGroupNotFoundException.java @@ -25,5 +25,9 @@ public class AutoexecJobGroupNotFoundException extends ApiRuntimeException { super("作业({0}) 组（{1}）不存在", jobId, groupSort); } + public AutoexecJobGroupNotFoundException(Long jobId) { + super("作业({0}) 组不存在", jobId); + } + } -- Gitee From 8bcd3d4dfd15ab2a6e2b91f694684324603f47ed Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Tue, 15 Apr 2025 16:35:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=94=AF=E6=8C=81=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=99?= =?UTF-8?q?=E6=8E=92=E9=98=9F=20#[1396992549289984]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=94=AF=E6=8C=81=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=99?= =?UTF-8?q?=E6=8E=92=E9=98=9F=20http://192.168.0.96:8090/demo/rdm.html#/st?= =?UTF-8?q?ory-detail/939050947543040/939050947543042/1396992549289984?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/autoexec/dao/mapper/AutoexecJobMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml index ef30681c..a23a29ad 100644 --- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml +++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml @@ -1150,7 +1150,7 @@ along with this program. If not, see .--> `exec_user` as execUser, `exec_mode` as execMode, `name` as name, - `sort`, + `sort` FROM `autoexec_job_phase` where `job_id` = #{jobId} and `status` = #{status} -- Gitee From 6d805b4b22b8a70a2fc11fad7eea51c2b0404685 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Tue, 15 Apr 2025 17:06:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=94=AF=E6=8C=81=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=99?= =?UTF-8?q?=E6=8E=92=E9=98=9F=20#[1396992549289984]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=94=AF=E6=8C=81=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=99?= =?UTF-8?q?=E6=8E=92=E9=98=9F=20http://192.168.0.96:8090/demo/rdm.html#/st?= =?UTF-8?q?ory-detail/939050947543040/939050947543042/1396992549289984?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autoexec/job/AutoexecJobPhaseNodeExportHandlerBase.java | 2 -- .../java/neatlogic/framework/autoexec/util/AutoexecUtil.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/framework/autoexec/job/AutoexecJobPhaseNodeExportHandlerBase.java b/src/main/java/neatlogic/framework/autoexec/job/AutoexecJobPhaseNodeExportHandlerBase.java index 0109b12a..7127e3a6 100644 --- a/src/main/java/neatlogic/framework/autoexec/job/AutoexecJobPhaseNodeExportHandlerBase.java +++ b/src/main/java/neatlogic/framework/autoexec/job/AutoexecJobPhaseNodeExportHandlerBase.java @@ -162,8 +162,6 @@ public abstract class AutoexecJobPhaseNodeExportHandlerBase implements IAutoexec HttpRequestUtil requestUtil = HttpRequestUtil.download(url, "POST", bos) .setPayload(paramJson.toJSONString()) .setAuthType(AuthenticateType.BUILDIN) - .setConnectTimeout(5000) - .setReadTimeout(5000) .sendRequest(); String error = requestUtil.getError(); if (StringUtils.isNotBlank(error)) { diff --git a/src/main/java/neatlogic/framework/autoexec/util/AutoexecUtil.java b/src/main/java/neatlogic/framework/autoexec/util/AutoexecUtil.java index 6775a38f..16656b75 100644 --- a/src/main/java/neatlogic/framework/autoexec/util/AutoexecUtil.java +++ b/src/main/java/neatlogic/framework/autoexec/util/AutoexecUtil.java @@ -24,7 +24,7 @@ public class AutoexecUtil { * @return runner response */ public static String requestRunner(String runnerUrl, JSONObject paramJson) { - HttpRequestUtil requestUtil = HttpRequestUtil.post(runnerUrl).setPayload(paramJson.toJSONString()).setAuthType(AuthenticateType.BUILDIN).setConnectTimeout(5000).setReadTimeout(5000).sendRequest(); + HttpRequestUtil requestUtil = HttpRequestUtil.post(runnerUrl).setPayload(paramJson.toJSONString()).setAuthType(AuthenticateType.BUILDIN).sendRequest(); if (StringUtils.isNotBlank(requestUtil.getErrorMsg())) { throw new RunnerHttpRequestException(requestUtil.getErrorMsg()); } -- Gitee From 3bf7d57aafc8a8efa55540c47c0962d89944a650 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Wed, 16 Apr 2025 15:16:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=94=AF=E6=8C=81=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=99?= =?UTF-8?q?=E6=8E=92=E9=98=9F=20#[1396992549289984]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=94=AF=E6=8C=81=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=99?= =?UTF-8?q?=E6=8E=92=E9=98=9F=20http://192.168.0.96:8090/demo/rdm.html#/st?= =?UTF-8?q?ory-detail/939050947543040/939050947543042/1396992549289984?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/autoexec/dao/mapper/AutoexecJobMapper.java | 2 ++ .../framework/autoexec/dao/mapper/AutoexecJobMapper.xml | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java index f2b9445f..84cecb7a 100644 --- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java +++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java @@ -268,6 +268,8 @@ public interface AutoexecJobMapper { Integer getJobPhaseStatusCountByJobIdAndStatus(@Param("jobId") Long jobId, @Param("status") String status); + Integer getJobPhaseRunnerStatusCountByJobIdAndStatus(@Param("jobId") Long jobId, @Param("status") String status); + //inspect List getJobResourceInspectByResourceId(List resourceIdList); diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml index a23a29ad..578f49ef 100644 --- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml +++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml @@ -1527,6 +1527,13 @@ along with this program. If not, see .--> WHERE job_id = #{jobId} and `status` = #{status} + +