From cf99df3de00ef63ee96b7ab00427c7385c42720a Mon Sep 17 00:00:00 2001 From: kyoty Date: Sun, 4 Jul 2021 23:46:47 +0800 Subject: [PATCH] [Fix-5714] When updating the existing alarm instance, the creation time should't be updated (#5715) * add a new init method. --- .../api/service/impl/AlertPluginInstanceServiceImpl.java | 7 +++---- .../dolphinscheduler/dao/entity/AlertPluginInstance.java | 7 +++++++ .../dao/mapper/AlertPluginInstanceMapper.xml | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java index ea4664e9a5..abfb15e232 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java @@ -35,6 +35,7 @@ import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -109,11 +110,9 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A @Override public Map update(User loginUser, int pluginInstanceId, String instanceName, String pluginInstanceParams) { - AlertPluginInstance alertPluginInstance = new AlertPluginInstance(); String paramsMapJson = parsePluginParamsMap(pluginInstanceParams); - alertPluginInstance.setPluginInstanceParams(paramsMapJson); - alertPluginInstance.setInstanceName(instanceName); - alertPluginInstance.setId(pluginInstanceId); + AlertPluginInstance alertPluginInstance = new AlertPluginInstance(pluginInstanceId, paramsMapJson, instanceName, new Date()); + Map result = new HashMap<>(); int i = alertPluginInstanceMapper.updateById(alertPluginInstance); diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java index 202c06bf00..f94d220fb2 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java @@ -80,6 +80,13 @@ public class AlertPluginInstance { this.instanceName = instanceName; } + public AlertPluginInstance(int id, String pluginInstanceParams, String instanceName, Date updateDate) { + this.id = id; + this.pluginInstanceParams = pluginInstanceParams; + this.updateTime = updateDate; + this.instanceName = instanceName; + } + public int getId() { return id; } diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.xml index febfaf75e1..b137a6c4ab 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.xml @@ -49,4 +49,4 @@ where instance_name = #{instanceName} limit 1 - \ No newline at end of file +