From 12b67ac7d8ba73caa3ff4ccae899178cd9438ed7 Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Wed, 14 Aug 2024 14:53:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=E8=BF=87=E6=BB=A4=E5=BC=95=E6=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filter/rule/listener/FilterLogSaveEventListener.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java index 88fcac2..bc9f3e8 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java @@ -241,12 +241,13 @@ public class FilterLogSaveEventListener { Set unMergedLogs = new HashSet<>(); for (FilterLogEntity currentLog : logs) { Set thingAttrs; - if(onlyMergeMissThingAttr){ + if (onlyMergeMissThingAttr) { thingAttrs = currentLog.getMissingThingAttrs(); if (CollectionUtils.isEmpty(thingAttrs)) { + mergedLogs.add(currentLog); continue; } - }else { + } else { thingAttrs = currentLog.getDefThingAttrs(); } thingAttrs.forEach( @@ -271,7 +272,9 @@ public class FilterLogSaveEventListener { } }); } - mergedLogs.addAll(unMergedLogs); + if (!unMergedLogs.isEmpty()) { + mergedLogs.addAll(unMergedLogs); + } return mergedLogs.stream().filter(Objects::nonNull).collect(Collectors.toSet()); } From 5cf0bbf5f960836321a49e52796a617ffada6236 Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Wed, 14 Aug 2024 15:04:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?filter=5Flog=E5=94=AF=E4=B8=80=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- help/sql/ddl_1.0.0.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/help/sql/ddl_1.0.0.sql b/help/sql/ddl_1.0.0.sql index 4590e81..2f6f492 100644 --- a/help/sql/ddl_1.0.0.sql +++ b/help/sql/ddl_1.0.0.sql @@ -1983,6 +1983,8 @@ COMMENT ON COLUMN "public"."filter_log"."updater" IS '更新人'; COMMENT ON COLUMN "public"."filter_log"."update_date" IS '更新时间'; COMMENT ON TABLE "public"."filter_log" IS '过滤日志表'; +alter table public.filter_log add constraint filter_log_uk unique (filter_rule_id, time); + -- ---------------------------- -- Table structure for filter_rule -- ---------------------------- From 10db928be8e2367f1cd3b55820692ebb4b24d979 Mon Sep 17 00:00:00 2001 From: lishuai Date: Wed, 14 Aug 2024 15:14:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B6=85=E7=BA=A7API=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=85=A5=E5=BA=93=202024=E5=B9=B48=E6=9C=8814=E6=97=A514:17:37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/thing/thing/api/service/impl/IotThingApiServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java index 666187a..858b6b3 100644 --- a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java @@ -610,6 +610,7 @@ public class IotThingApiServiceImpl extends BaseServiceImpl