Browse Source

filter_log增加查询条件

thing_master
siyang 1 year ago
parent
commit
b7f46c7479
  1. 1
      modules/filter-rule/src/main/java/com/thing/filter/rule/controller/FilterLogController.java
  2. 2
      modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java

1
modules/filter-rule/src/main/java/com/thing/filter/rule/controller/FilterLogController.java

@ -42,6 +42,7 @@ public class FilterLogController {
@Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)"), @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)"),
@Parameter(name = "filterRuleName", description = "过滤规则名称"), @Parameter(name = "filterRuleName", description = "过滤规则名称"),
@Parameter(name = "status", description = "状态:1-未匹配,2-已匹配,3-计算成功,4-计算异常,5-已通知"), @Parameter(name = "status", description = "状态:1-未匹配,2-已匹配,3-计算成功,4-计算异常,5-已通知"),
@Parameter(name = "result", description = "过滤结果:true | false"),
}) })
public Result<PageData<FilterLogDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){ public Result<PageData<FilterLogDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
PageData<FilterLogDTO> page = filterLogService.handlePage(params); PageData<FilterLogDTO> page = filterLogService.handlePage(params);

2
modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java

@ -38,6 +38,7 @@ public class FilterLogServiceImpl extends BaseServiceImpl<FilterLogMapper, Filte
public QueryWrapper getWrapper(Map<String, Object> params) { public QueryWrapper getWrapper(Map<String, Object> params) {
String filterRuleName = MapUtils.getString(params, "filterRuleName"); String filterRuleName = MapUtils.getString(params, "filterRuleName");
Integer status = MapUtils.getInteger(params, "status"); Integer status = MapUtils.getInteger(params, "status");
Boolean result = MapUtils.getBoolean(params, "result");
return QueryWrapper.create() return QueryWrapper.create()
.select( .select(
FILTER_RULE_ENTITY.NAME.as("filter_rule_name"), FILTER_RULE_ENTITY.NAME.as("filter_rule_name"),
@ -48,6 +49,7 @@ public class FilterLogServiceImpl extends BaseServiceImpl<FilterLogMapper, Filte
.eq(FilterRuleEntity::getTenantCode, UserContext.getTenantCode()) .eq(FilterRuleEntity::getTenantCode, UserContext.getTenantCode())
.eq(FilterRuleEntity::getName, filterRuleName, StringUtils.isNotBlank(filterRuleName)) .eq(FilterRuleEntity::getName, filterRuleName, StringUtils.isNotBlank(filterRuleName))
.eq(FilterLogEntity::getStatus, status, Objects.nonNull(status)) .eq(FilterLogEntity::getStatus, status, Objects.nonNull(status))
.eq(FilterLogEntity::getResult, result, Objects.nonNull(result))
.orderBy(FilterLogEntity::getCreateDate) .orderBy(FilterLogEntity::getCreateDate)
.desc(); .desc();
} }

Loading…
Cancel
Save