From 2fc22d052fa152b5ceb0195f853020f5def5fd04 Mon Sep 17 00:00:00 2001 From: user <8352767+zhegu123@user.noreply.gitee.com> Date: Thu, 29 Jun 2023 17:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=A6=81=E9=80=9A=E8=BF=87=E5=90=8E?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BB=BB=E5=8A=A1=E5=8F=AF=E9=80=89=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/huawei/jenkins/codeCheck/CustomInput.java | 10 ++++++++++ .../jenkins/codeCheck/codeCheckPipelineStep.java | 12 ++++++++++++ .../huawei/jenkins/codeCheck/codeCheckService.java | 14 ++++++++------ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/huawei/jenkins/codeCheck/CustomInput.java b/src/main/java/com/huawei/jenkins/codeCheck/CustomInput.java index 5cfaf0c..070abb9 100644 --- a/src/main/java/com/huawei/jenkins/codeCheck/CustomInput.java +++ b/src/main/java/com/huawei/jenkins/codeCheck/CustomInput.java @@ -28,6 +28,8 @@ public class CustomInput implements Serializable { private String userName; + private String deleteTask; + private String topicUrn; public String getAk() { @@ -110,6 +112,14 @@ public class CustomInput implements Serializable { this.userName = userName; } + public String getDeleteTask() { + return deleteTask; + } + + public void setDeleteTask(String deleteTask) { + this.deleteTask = deleteTask; + } + public String getTopicUrn() { return topicUrn; } diff --git a/src/main/java/com/huawei/jenkins/codeCheck/codeCheckPipelineStep.java b/src/main/java/com/huawei/jenkins/codeCheck/codeCheckPipelineStep.java index fd71232..280ffc3 100644 --- a/src/main/java/com/huawei/jenkins/codeCheck/codeCheckPipelineStep.java +++ b/src/main/java/com/huawei/jenkins/codeCheck/codeCheckPipelineStep.java @@ -53,6 +53,8 @@ public class codeCheckPipelineStep extends Step { private String userName; + private String deleteTask; + private String topicUrn; public String getAk() { @@ -145,6 +147,15 @@ public class codeCheckPipelineStep extends Step { this.userName = userName; } + public String getDeleteTask() { + return deleteTask; + } + + @DataBoundSetter + public void setDeleteTask(String deleteTask) { + this.deleteTask = deleteTask; + } + public String getTopicUrn() { return topicUrn; } @@ -212,6 +223,7 @@ public class codeCheckPipelineStep extends Step { customInput.setGitUrl(step.getGitUrl()); customInput.setPassWord(step.getPassWord()); customInput.setUserName(step.getUserName()); + customInput.setDeleteTask(step.getDeleteTask()); customInput.setTopicUrn(step.getTopicUrn()); TaskListener listener = codeCheckPipelineStep.Execution.this.getContext().get(TaskListener.class); return codeCheckService.runTask(listener, customInput); diff --git a/src/main/java/com/huawei/jenkins/codeCheck/codeCheckService.java b/src/main/java/com/huawei/jenkins/codeCheck/codeCheckService.java index 8dd93c4..7cb8827 100644 --- a/src/main/java/com/huawei/jenkins/codeCheck/codeCheckService.java +++ b/src/main/java/com/huawei/jenkins/codeCheck/codeCheckService.java @@ -64,7 +64,7 @@ public class codeCheckService implements Serializable { e.printStackTrace(); } catch (ServiceResponseException e) { e.printStackTrace(); - listener.getLogger().println("错误信息：" + e.getErrorMsg()); + listener.getLogger().println("创建任务错误信息：" + e.getErrorMsg()); } return taskId; } @@ -124,7 +124,7 @@ public class codeCheckService implements Serializable { e.printStackTrace(); } catch (ServiceResponseException e) { e.printStackTrace(); - listener.getLogger().println("错误信息：" + e.getErrorMsg()); + listener.getLogger().println("执行检查任务错误信息：" + e.getErrorMsg()); message = e.getErrorMsg(); } return message; @@ -155,7 +155,7 @@ public class codeCheckService implements Serializable { e.printStackTrace(); } catch (ServiceResponseException e) { e.printStackTrace(); - listener.getLogger().println("错误信息：" + e.getErrorMsg()); + listener.getLogger().println("查看任务状态错误信息：" + e.getErrorMsg()); } return response.getTaskStatus(); } @@ -193,7 +193,7 @@ public class codeCheckService implements Serializable { message = "门禁质量通过"; //删除检查任务，如果任务在执行中,则不删除 Integer status = showTasks(client, customInput.getTask_id(), listener); - if(status!=0){ + if(status!=0 && customInput.getDeleteTask().equals("true")){ deleteTask(customInput,listener); } } @@ -205,7 +205,7 @@ public class codeCheckService implements Serializable { e.printStackTrace(); } catch (ServiceResponseException e) { e.printStackTrace(); - listener.getLogger().println("错误信息：" + e.getErrorMsg()); + listener.getLogger().println("查看任务结果错误信息：" + e.getErrorMsg()); } return message; } @@ -240,7 +240,7 @@ public class codeCheckService implements Serializable { e.printStackTrace(); } catch (ServiceResponseException e) { e.printStackTrace(); - listener.getLogger().println("错误信息：" + e.getErrorMsg()); + listener.getLogger().println("删除任务错误信息：" + e.getErrorMsg()); } } @@ -301,9 +301,11 @@ public class codeCheckService implements Serializable { final String sk = customInput.getSk(); final String region = customInput.getRegion(); final String projectId = customInput.getProject_id(); + final String deleteTask = customInput.getDeleteTask(); final String taskId = customInput.getTask_id(); Preconditions.checkArgument(StringUtils.isNotBlank(projectId), "projectId id can not be blank"); Preconditions.checkArgument(StringUtils.isNotBlank(region), "region can not be blank"); + Preconditions.checkArgument(StringUtils.isNotBlank(deleteTask), "deleteTask can not be blank"); Preconditions.checkArgument(StringUtils.isNotBlank(ak) && StringUtils.isNotBlank(sk), "Ak, Sk can not be blank"); if(StringUtils.isBlank(taskId)){ -- Gitee