From 1bd136f3d2b4bfaab53dcbd28e8bea1c41c6ba57 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 27 May 2025 10:41:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AlarmRecordMeasurementProvider.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/measurement/AlarmRecordMeasurementProvider.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/measurement/AlarmRecordMeasurementProvider.java index 6065b123f..601bdbb8c 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/measurement/AlarmRecordMeasurementProvider.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/measurement/AlarmRecordMeasurementProvider.java @@ -26,18 +26,18 @@ public AlarmRecordMeasurementProvider(MeterRegistryManager registryManager, TimeSeriesManager timeSeriesManager) { super(AlarmDashboardDefinition.alarm, AlarmObjectDefinition.record); - registry = registryManager.getMeterRegister(AlarmTimeSeriesMetric.alarmStreamMetrics().getId()); +// registry = registryManager.getMeterRegister(AlarmTimeSeriesMetric.alarmStreamMetrics().getId()); addMeasurement(new AlarmRecordTrendMeasurement(timeSeriesManager)); addMeasurement(new AlarmRecordRankMeasurement(timeSeriesManager)); } - @EventListener - public void aggAlarmRecord(AlarmHistoryInfo info) { - registry - .counter("record-agg", getTags(info)) - .increment(); - } +// @EventListener +// public void aggAlarmRecord(AlarmHistoryInfo info) { +// registry +// .counter("record-agg", getTags(info)) +// .increment(); +// } From d4645ad0897516979a1ac3ac61fe846d33ab5b56 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 3 Jun 2025 19:14:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../things/TDengineThingDataHelper.java | 7 ++--- .../things/utils/ThingsDatabaseUtils.java | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/jetlinks-components/tdengine-component/src/main/java/org/jetlinks/community/tdengine/things/TDengineThingDataHelper.java b/jetlinks-components/tdengine-component/src/main/java/org/jetlinks/community/tdengine/things/TDengineThingDataHelper.java index 5bc7c685f..1b9d775bc 100644 --- a/jetlinks-components/tdengine-component/src/main/java/org/jetlinks/community/tdengine/things/TDengineThingDataHelper.java +++ b/jetlinks-components/tdengine-component/src/main/java/org/jetlinks/community/tdengine/things/TDengineThingDataHelper.java @@ -14,6 +14,7 @@ import org.jetlinks.community.tdengine.TDEngineUtils; import org.jetlinks.community.tdengine.term.TDengineQueryConditionBuilder; import org.jetlinks.community.things.data.ThingsDataConstants; +import org.jetlinks.community.things.utils.ThingsDatabaseUtils; import org.jetlinks.core.metadata.Converter; import org.jetlinks.core.metadata.DataType; import org.jetlinks.community.Interval; @@ -100,11 +101,7 @@ public List prepareTerms(String metric, List terms) { .getColumn(metric, term.getColumn()) .ifPresent(meta -> { DataType type = meta.getValueType(); - if (isArrayTerm(type, term)) { - term.setValue(tryConvertList(type, term)); - } else if (type instanceof Converter) { - term.setValue(((Converter) type).convert(term.getValue())); - } + ThingsDatabaseUtils.tryConvertTermValue(type, term); }); } diff --git a/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/utils/ThingsDatabaseUtils.java b/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/utils/ThingsDatabaseUtils.java index 4f5195c01..5f72b2833 100644 --- a/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/utils/ThingsDatabaseUtils.java +++ b/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/utils/ThingsDatabaseUtils.java @@ -10,6 +10,8 @@ import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata; import org.jetlinks.community.ConfigMetadataConstants; import org.jetlinks.community.utils.ConverterUtils; +import org.jetlinks.community.utils.TimeUtils; +import org.jetlinks.core.metadata.Converter; import org.jetlinks.core.metadata.DataType; import org.jetlinks.core.metadata.PropertyMetadata; import org.jetlinks.core.metadata.types.*; @@ -208,6 +210,33 @@ private static void appendTable(String table, StringBuilder builder) { } } + public static void tryConvertTermValue(DataType type, + Term term, + BiFunction tryConvertTermValue) { + tryConvertTermValue(type, + term, + ThingsDatabaseUtils::isDoNotConvertValue, + ThingsDatabaseUtils::maybeList, + tryConvertTermValue); + } + + public static void tryConvertTermValue(DataType type, + Term term) { + tryConvertTermValue(type, + term, + ThingsDatabaseUtils::tryConvertTermValue); + } + + public static Object tryConvertTermValue(DataType type, Object value) { + if (type instanceof DateTimeType) { + return TimeUtils.convertToDate(value).getTime(); + } else if (type instanceof Converter) { + return ((Converter) type).convert(value); + } + return value; + } + + public static void tryConvertTermValue(DataType type, Term term, BiPredicate isDoNotConvertValue, From f99b648b88130d43dc997ce5b20031aeb98d1223 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Thu, 12 Jun 2025 14:05:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/rule/engine/alarm/DefaultAlarmHandler.java | 5 +++++ .../community/rule/engine/alarm/DefaultAlarmRuleHandler.java | 2 ++ 2 files changed, 7 insertions(+) diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmHandler.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmHandler.java index 0fa465d6c..1938ae12e 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmHandler.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmHandler.java @@ -2,6 +2,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.hswebframework.web.bean.FastBeanCopier; import org.hswebframework.web.i18n.LocaleUtils; @@ -471,6 +472,8 @@ public boolean isEffectiveTime(long timestamp) { } } + @Getter + @Setter public static class TriggerCache implements Externalizable { static final byte stateNormal = 0x01; @@ -530,6 +533,8 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept } } + @Getter + @Setter public static class RelieveCache implements Externalizable { private long reliveTime; diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java index 1c0f15172..e0d884a70 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java @@ -434,6 +434,8 @@ public AlarmInfo copyWith(AlarmTargetInfo targetInfo) { } @Deprecated + @Getter + @Setter public static class RecordCache implements Externalizable { static final byte stateNormal = 0x01; From 3a45ac86da448706d123280e6db81da370b0b0e9 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Thu, 19 Jun 2025 16:05:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7c9bb263d..715cc27ed 100644 --- a/pom.xml +++ b/pom.xml @@ -22,9 +22,9 @@ ${java.version} - 4.0.18 + 4.0.19-SNAPSHOT - 4.1.3 + 4.1.4-SNAPSHOT 1.2.4-SNAPSHOT From e134dfec6f0dbcf0301d01c93dc1c81d9d536905 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Mon, 30 Jun 2025 13:54:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 715cc27ed..7fc00de0e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,15 +22,15 @@ ${java.version} - 4.0.19-SNAPSHOT + 4.0.19 - 4.1.4-SNAPSHOT + 4.1.4 - 1.2.4-SNAPSHOT + 1.2.4 1.0.6 - 1.0.18 + 1.0.19 1.0.3