From b7f46c7479073844af2d55e5e2dd180748d97470 Mon Sep 17 00:00:00 2001
From: siyang <2337720667@qq.com>
Date: Fri, 16 Aug 2024 13:48:39 +0800
Subject: [PATCH] =?UTF-8?q?filter=5Flog=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/thing/filter/rule/controller/FilterLogController.java   | 1 +
 .../thing/filter/rule/service/impl/FilterLogServiceImpl.java    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/controller/FilterLogController.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/controller/FilterLogController.java
index cd1f961..1fe61f5 100644
--- a/modules/filter-rule/src/main/java/com/thing/filter/rule/controller/FilterLogController.java
+++ b/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 = "filterRuleName", description = "过滤规则名称"),
         @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){
         PageData<FilterLogDTO> page = filterLogService.handlePage(params);
diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java
index 7ec16b2..b0bed35 100644
--- a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java
+++ b/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) {
         String filterRuleName = MapUtils.getString(params, "filterRuleName");
         Integer status = MapUtils.getInteger(params, "status");
+        Boolean result = MapUtils.getBoolean(params, "result");
         return QueryWrapper.create()
                 .select(
                         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::getName, filterRuleName, StringUtils.isNotBlank(filterRuleName))
                 .eq(FilterLogEntity::getStatus, status, Objects.nonNull(status))
+                .eq(FilterLogEntity::getResult, result, Objects.nonNull(result))
                 .orderBy(FilterLogEntity::getCreateDate)
                 .desc();
     }