This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 35312fd [Fix-6304] [UI] Fix alert-plugin-instance and alert-group
list error (#6308)
35312fd is described below
commit 35312fd498bf5f2059b0e77b68f557c388870310
Author: caishunfeng <[email protected]>
AuthorDate: Thu Sep 23 20:04:19 2021 +0800
[Fix-6304] [UI] Fix alert-plugin-instance and alert-group list error
(#6308)
* [DS-6304][fix]query alert-plugin-instance list 404 and alert-group list
show
* [DS-6304][fix]query alert-plugin-instance list 404 and alert-group list
show
Co-authored-by: caishunfeng <[email protected]>
---
.../dolphinscheduler/dao/vo/AlertGroupVo.java | 37 ++++++++++++++++++++++
.../dao/mapper/AlertGroupMapper.xml | 2 +-
.../src/js/conf/home/store/security/actions.js | 4 +--
3 files changed, 40 insertions(+), 3 deletions(-)
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/vo/AlertGroupVo.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/vo/AlertGroupVo.java
index e970c8b..db9c9f5 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/vo/AlertGroupVo.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/vo/AlertGroupVo.java
@@ -17,6 +17,8 @@
package org.apache.dolphinscheduler.dao.vo;
+import java.util.Date;
+
/**
* AlertGroupVo
*/
@@ -30,6 +32,18 @@ public class AlertGroupVo {
* group_name
*/
private String groupName;
+ /**
+ * description
+ */
+ private String description;
+ /**
+ * create_time
+ */
+ private Date createTime;
+ /**
+ * update_time
+ */
+ private Date updateTime;
public int getId() {
return id;
@@ -47,4 +61,27 @@ public class AlertGroupVo {
this.groupName = groupName;
}
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
}
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
index 77611d8..efdacb1 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
@@ -33,7 +33,7 @@
order by update_time desc
</select>
<select id="queryAlertGroupVo"
resultType="org.apache.dolphinscheduler.dao.vo.AlertGroupVo">
- select id, group_name
+ select id, group_name, description, create_time, update_time
from t_ds_alertgroup
where 1 = 1
<if test="groupName != null and groupName != ''">
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
index 60f2e98..6ce4457 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
@@ -398,7 +398,7 @@ export default {
*/
queryAllAlertPluginInstance ({ state }, payload) {
return new Promise((resolve, reject) => {
- io.get('alert-plugin-instance/list', payload, res => {
+ io.get('alert-plugin-instances/list', payload, res => {
resolve(res.data)
}).catch(e => {
reject(e)
@@ -482,7 +482,7 @@ export default {
*/
deletAelertPluginInstance ({ state }, payload) {
return new Promise((resolve, reject) => {
- io.delete(`alert-plugin-instance/${payload.id}`, payload, res => {
+ io.delete(`alert-plugin-instances/${payload.id}`, payload, res => {
resolve(res)
}).catch(e => {
reject(e)
