mirror of
https://gitee.com/dolphinscheduler/DolphinScheduler.git
synced 2024-12-03 12:48:46 +08:00
[Fix-6941][API] Fix the failure of querying details of alert group (#6942)
* Fix the failure of querying details of alert group * code cleanup
This commit is contained in:
Kerwin
GitHub
parent
ad33d43498
commit
38b14410ab
@ -25,7 +25,6 @@ import org.apache.dolphinscheduler.common.Constants;
|
||||
import org.apache.dolphinscheduler.dao.entity.AlertGroup;
|
||||
import org.apache.dolphinscheduler.dao.entity.User;
|
||||
import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
|
||||
import org.apache.dolphinscheduler.dao.vo.AlertGroupVo;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
|
||||
@ -116,12 +115,12 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
|
||||
return result;
|
||||
}
|
||||
|
||||
Page<AlertGroupVo> page = new Page<>(pageNo, pageSize);
|
||||
IPage<AlertGroupVo> alertGroupVoIPage = alertGroupMapper.queryAlertGroupVo(page, searchVal);
|
||||
PageInfo<AlertGroupVo> pageInfo = new PageInfo<>(pageNo, pageSize);
|
||||
|
||||
pageInfo.setTotal((int) alertGroupVoIPage.getTotal());
|
||||
pageInfo.setTotalList(alertGroupVoIPage.getRecords());
|
||||
Page<AlertGroup> page = new Page<>(pageNo, pageSize);
|
||||
IPage<AlertGroup> alertGroupIPage = alertGroupMapper.queryAlertGroupPage(
|
||||
page, searchVal);
|
||||
PageInfo<AlertGroup> pageInfo = new PageInfo<>(pageNo, pageSize);
|
||||
pageInfo.setTotal((int) alertGroupIPage.getTotal());
|
||||
pageInfo.setTotalList(alertGroupIPage.getRecords());
|
||||
result.setData(pageInfo);
|
||||
|
||||
putMsg(result, Status.SUCCESS);
|
||||
|
||||
@ -29,7 +29,6 @@ import org.apache.dolphinscheduler.common.enums.UserType;
|
||||
import org.apache.dolphinscheduler.dao.entity.AlertGroup;
|
||||
import org.apache.dolphinscheduler.dao.entity.User;
|
||||
import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
|
||||
import org.apache.dolphinscheduler.dao.vo.AlertGroupVo;
|
||||
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
|
||||
@ -79,10 +78,10 @@ public class AlertGroupServiceTest {
|
||||
|
||||
@Test
|
||||
public void testListPaging() {
|
||||
IPage<AlertGroupVo> page = new Page<>(1, 10);
|
||||
IPage<AlertGroup> page = new Page<>(1, 10);
|
||||
page.setTotal(1L);
|
||||
page.setRecords(getAlertGroupVoList());
|
||||
Mockito.when(alertGroupMapper.queryAlertGroupVo(any(Page.class), eq(groupName))).thenReturn(page);
|
||||
page.setRecords(getList());
|
||||
Mockito.when(alertGroupMapper.queryAlertGroupPage(any(Page.class), eq(groupName))).thenReturn(page);
|
||||
User user = new User();
|
||||
// no operate
|
||||
Result result = alertGroupService.listPaging(user, groupName, 1, 10);
|
||||
@ -92,7 +91,7 @@ public class AlertGroupServiceTest {
|
||||
user.setUserType(UserType.ADMIN_USER);
|
||||
result = alertGroupService.listPaging(user, groupName, 1, 10);
|
||||
logger.info(result.toString());
|
||||
PageInfo<AlertGroupVo> pageInfo = (PageInfo<AlertGroupVo>) result.getData();
|
||||
PageInfo<AlertGroup> pageInfo = (PageInfo<AlertGroup>) result.getData();
|
||||
Assert.assertTrue(CollectionUtils.isNotEmpty(pageInfo.getTotalList()));
|
||||
|
||||
}
|
||||
@ -218,23 +217,4 @@ public class AlertGroupServiceTest {
|
||||
return alertGroup;
|
||||
}
|
||||
|
||||
/**
|
||||
* get AlertGroupVo list
|
||||
*/
|
||||
private List<AlertGroupVo> getAlertGroupVoList() {
|
||||
List<AlertGroupVo> alertGroupVos = new ArrayList<>();
|
||||
alertGroupVos.add(getAlertGroupVoEntity());
|
||||
return alertGroupVos;
|
||||
}
|
||||
|
||||
/**
|
||||
* get AlertGroupVo entity
|
||||
*/
|
||||
private AlertGroupVo getAlertGroupVoEntity() {
|
||||
AlertGroupVo alertGroupVo = new AlertGroupVo();
|
||||
alertGroupVo.setId(1);
|
||||
alertGroupVo.setGroupName(groupName);
|
||||
return alertGroupVo;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
package org.apache.dolphinscheduler.dao.mapper;
|
||||
|
||||
import org.apache.dolphinscheduler.dao.entity.AlertGroup;
|
||||
import org.apache.dolphinscheduler.dao.vo.AlertGroupVo;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@ -84,12 +83,4 @@ public interface AlertGroupMapper extends BaseMapper<AlertGroup> {
|
||||
*/
|
||||
String queryAlertGroupInstanceIdsById(@Param("alertGroupId") int alertGroupId);
|
||||
|
||||
/**
|
||||
* query alertGroupVo page list
|
||||
* @param page page
|
||||
* @param groupName groupName
|
||||
* @return IPage<AlertGroupVo>: include alert group id and group_name
|
||||
*/
|
||||
IPage<AlertGroupVo> queryAlertGroupVo(Page<AlertGroupVo> page,
|
||||
@Param("groupName") String groupName);
|
||||
}
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.dolphinscheduler.dao.vo;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* AlertGroupVo
|
||||
*/
|
||||
public class AlertGroupVo {
|
||||
|
||||
/**
|
||||
* primary key
|
||||
*/
|
||||
private int id;
|
||||
/**
|
||||
* group_name
|
||||
*/
|
||||
private String groupName;
|
||||
/**
|
||||
* description
|
||||
*/
|
||||
private String description;
|
||||
/**
|
||||
* create_time
|
||||
*/
|
||||
private Date createTime;
|
||||
/**
|
||||
* update_time
|
||||
*/
|
||||
private Date updateTime;
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getGroupName() {
|
||||
return groupName;
|
||||
}
|
||||
|
||||
public void setGroupName(String groupName) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -32,15 +32,7 @@
|
||||
</if>
|
||||
order by update_time desc
|
||||
</select>
|
||||
<select id="queryAlertGroupVo" resultType="org.apache.dolphinscheduler.dao.vo.AlertGroupVo">
|
||||
select id, group_name, description, create_time, update_time
|
||||
from t_ds_alertgroup
|
||||
where 1 = 1
|
||||
<if test="groupName != null and groupName != ''">
|
||||
and group_name like concat('%', #{groupName}, '%')
|
||||
</if>
|
||||
order by update_time desc
|
||||
</select>
|
||||
|
||||
<select id="queryByGroupName" resultType="org.apache.dolphinscheduler.dao.entity.AlertGroup">
|
||||
select
|
||||
<include refid="baseSql"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user