Browse Source

[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 <534328519@qq.com>
2.0.7-release
caishunfeng 3 years ago committed by GitHub
parent
commit
35312fd498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 37
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/vo/AlertGroupVo.java
  2. 2
      dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
  3. 4
      dolphinscheduler-ui/src/js/conf/home/store/security/actions.js

37
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;
}
}

2
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 != ''">

4
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)

Loading…
Cancel
Save