Merge 4200d3d into f6a6794

apache · Sep 15, 2023 · 0212212 · 0212212
2 parents f6a6794 + 4200d3d
commit 0212212
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/...heduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java b/...heduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java
@@ -91,6 +91,8 @@ public class ProcessAlertContent implements Serializable {
     private Date taskEndTime;
     @JsonProperty("taskHost")
     private String taskHost;
+    @JsonProperty("taskPriority")
+    private String taskPriority;
     @JsonProperty("logPath")
     private String logPath;
 

diff --git a/...nscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java b/...nscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java
@@ -60,6 +60,8 @@ public class TaskAlertContent implements Serializable {
     private Date endTime;
     @JsonProperty("host")
     private String host;
+    @JsonProperty("taskPriority")
+    private String taskPriority;
     @JsonProperty("logPath")
     private String logPath;
 

diff --git a/...-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java b/...-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java
@@ -144,6 +144,7 @@ public String getContentProcessInstance(ProcessInstance processInstance,
                         .taskStartTime(task.getStartTime())
                         .taskEndTime(task.getEndTime())
                         .taskHost(task.getHost())
+                        .taskPriority(task.getTaskInstancePriority().getDescp())
                         .logPath(task.getLogPath())
                         .build();
                 failedTaskList.add(processAlertContent);
@@ -173,6 +174,7 @@ private String getWorkerToleranceContent(ProcessInstance processInstance, List<T
                     .taskCode(taskInstance.getTaskCode())
                     .taskName(taskInstance.getName())
                     .taskHost(taskInstance.getHost())
+                    .taskPriority(taskInstance.getTaskInstancePriority().getDescp())
                     .retryTimes(taskInstance.getRetryTimes())
                     .build();
             toleranceTaskInstanceList.add(processAlertContent);
@@ -387,6 +389,7 @@ public String getTaskAlterContent(TaskInstance taskInstance) {
                 .startTime(taskInstance.getStartTime())
                 .endTime(taskInstance.getEndTime())
                 .host(taskInstance.getHost())
+                .taskPriority(taskInstance.getTaskInstancePriority().getDescp())
                 .logPath(taskInstance.getLogPath())
                 .build();