feat:(1.3.0-beta1): 优化通知
This commit is contained in:
parent
f0559fefd5
commit
0cc7a9650b
@ -17,6 +17,7 @@ public class NotifyConfig extends CreateUpdateDt {
|
|||||||
private String namespaceId;
|
private String namespaceId;
|
||||||
|
|
||||||
private String groupName;
|
private String groupName;
|
||||||
|
|
||||||
//
|
//
|
||||||
// /**
|
// /**
|
||||||
// * 业务id (scene_name或job_id或workflow_id)
|
// * 业务id (scene_name或job_id或workflow_id)
|
||||||
|
@ -14,4 +14,7 @@ import lombok.EqualsAndHashCode;
|
|||||||
public class NotifyConfigQueryVO extends BaseQueryVO {
|
public class NotifyConfigQueryVO extends BaseQueryVO {
|
||||||
private String groupName;
|
private String groupName;
|
||||||
private String sceneName;
|
private String sceneName;
|
||||||
|
private Integer systemTaskType;
|
||||||
|
private Integer notifyStatus;
|
||||||
|
private String notifyName;
|
||||||
}
|
}
|
||||||
|
@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
|
|||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -50,6 +51,9 @@ public class NotifyConfigServiceImpl implements NotifyConfigService {
|
|||||||
.eq(NotifyConfig::getNamespaceId, userSessionVO.getNamespaceId())
|
.eq(NotifyConfig::getNamespaceId, userSessionVO.getNamespaceId())
|
||||||
.in(CollUtil.isNotEmpty(groupNames), NotifyConfig::getGroupName, groupNames)
|
.in(CollUtil.isNotEmpty(groupNames), NotifyConfig::getGroupName, groupNames)
|
||||||
.eq(StrUtil.isNotBlank(queryVO.getGroupName()), NotifyConfig::getGroupName, queryVO.getGroupName())
|
.eq(StrUtil.isNotBlank(queryVO.getGroupName()), NotifyConfig::getGroupName, queryVO.getGroupName())
|
||||||
|
.eq(Objects.nonNull(queryVO.getNotifyStatus()), NotifyConfig::getNotifyStatus, queryVO.getNotifyStatus())
|
||||||
|
.eq(Objects.nonNull(queryVO.getSystemTaskType()), NotifyConfig::getSystemTaskType, queryVO.getSystemTaskType())
|
||||||
|
.like(StrUtil.isNotBlank(queryVO.getNotifyName()), NotifyConfig::getNotifyName, queryVO.getNotifyName())
|
||||||
.orderByDesc(NotifyConfig::getId))
|
.orderByDesc(NotifyConfig::getId))
|
||||||
.getRecords();
|
.getRecords();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user