refactor(基础模块): 优化es索引以及查询逻辑

Author: zhou-hao

jetlinks-components/common-component/src/main/java/org/jetlinks/community/Interval.java

@@ -52,6 +52,23 @@ public class Interval {
 
     private String expression;
 
+    public Interval(String expr) {
+        char[] chars = expr.toCharArray();
+        int numIndex = 0;
+        for (char c : expr.toCharArray()) {
+            if (c == '-' || c == '.' || (c >= '0' && c <= '9')) {
+                numIndex++;
+            } else {
+                BigDecimal val = new BigDecimal(chars, 0, numIndex);
+                this.expression = expr.substring(numIndex);
+                this.number = val;
+            }
+        }
+        if (this.expression == null) {
+            throw new IllegalArgumentException("can not parse interval expression:" + expr);
+        }
+    }
+
     @Override
     public String toString() {
         return (number) + expression;
@@ -67,6 +84,11 @@ public static Interval ofDays(int days) {
         return of(days, Interval.days);
     }
 
+    @Generated
+    public static Interval ofWeeks(int weeks) {
+        return of(weeks, Interval.weeks);
+    }
+
     @Generated
     public static Interval ofHours(int hours) {
         return of(hours, Interval.hours);
@@ -88,20 +110,7 @@ public static Interval of(int month, String expression) {
     }
 
     public static Interval of(String expr) {
-
-        char[] chars = expr.toCharArray();
-        int numIndex = 0;
-        for (char c : expr.toCharArray()) {
-            if (c == '-' || c == '.' || (c >= '0' && c <= '9')) {
-                numIndex++;
-            } else {
-                BigDecimal val = new BigDecimal(chars, 0, numIndex);
-                return new Interval(val, expr.substring(numIndex));
-            }
-
-        }
-
-        throw new IllegalArgumentException("can not parse interval expression:" + expr);
+        return new Interval(expr);
     }
 
     public String getDefaultFormat() {

jetlinks-components/common-component/src/main/java/org/jetlinks/community/lock/DefaultReactiveLock.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.lock;
 
 import lombok.AllArgsConstructor;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/lock/DefaultReactiveLockManager.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.lock;
 
 import com.github.benmanes.caffeine.cache.Caffeine;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/lock/ReactiveLock.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.lock;
 
 import reactor.core.publisher.Flux;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/lock/ReactiveLockHolder.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.lock;
 
 /**

jetlinks-components/common-component/src/main/java/org/jetlinks/community/lock/ReactiveLockManager.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.lock;
 
 /**

jetlinks-components/common-component/src/main/java/org/jetlinks/community/micrometer/MeterRegistryConfiguration.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.micrometer;
 
 import org.springframework.beans.factory.ObjectProvider;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/micrometer/NoopMeterRegistry.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.micrometer;
 
 import io.micrometer.core.instrument.*;

jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/redis/PublishOnReactiveRedisTemplate.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.configure.redis;
 
 import org.springframework.data.redis.connection.ReactiveRedisConnection;

jetlinks-components/elasticsearch-component/elasticsearch-7x/src/main/java/org/jetlinks/community/elastic/search/ElasticSearch7xSupport.java

@@ -15,17 +15,22 @@
  */
 package org.jetlinks.community.elastic.search;
 
-import co.elastic.clients.elasticsearch._types.aggregations.DateHistogramBucket;
-import co.elastic.clients.elasticsearch._types.aggregations.HistogramBucket;
-import co.elastic.clients.elasticsearch._types.aggregations.MultiBucketBase;
+import co.elastic.clients.elasticsearch._types.aggregations.*;
 import co.elastic.clients.elasticsearch._types.mapping.DynamicTemplate;
 import co.elastic.clients.elasticsearch._types.mapping.Property;
+import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
 import co.elastic.clients.elasticsearch.indices.*;
+import co.elastic.clients.elasticsearch.indices.get_index_template.IndexTemplate;
+import co.elastic.clients.elasticsearch.indices.get_index_template.IndexTemplateItem;
+import co.elastic.clients.elasticsearch.indices.get_index_template.IndexTemplateSummary;
 import co.elastic.clients.elasticsearch.indices.get_mapping.IndexMappingRecord;
 import co.elastic.clients.transport.Version;
-import org.jetlinks.community.elastic.search.enums.ElasticSearchTermTypes;
 import org.jetlinks.community.elastic.search.enums.ElasticSearch7xTermType;
+import org.jetlinks.community.elastic.search.enums.ElasticSearchTermTypes;
 import org.jetlinks.community.elastic.search.index.ElasticSearchIndexProperties;
+import org.jetlinks.reactor.ql.utils.CastUtils;
+
+import java.util.Objects;
 
 public class ElasticSearch7xSupport extends ElasticSearchSupport {
 
@@ -59,6 +64,20 @@ public TemplateMapping getTemplateMapping(GetTemplateResponse response, String i
         return response.get(index);
     }
 
+    @Override
+    public TypeMapping getIndexTemplateMapping(GetIndexTemplateResponse response, String index) {
+        for (IndexTemplateItem indexTemplate : response.indexTemplates()) {
+            if (Objects.equals(indexTemplate.name(), index)) {
+                IndexTemplate template = indexTemplate.indexTemplate();
+                IndexTemplateSummary summary = template.template();
+                if (summary != null) {
+                    return summary.mappings();
+                }
+            }
+        }
+        return null;
+    }
+
     @Override
     public IndexState getIndexState(GetIndexResponse response, String index) {
         return response.get(index);
@@ -71,6 +90,15 @@ public IndexMappingRecord getIndexMapping(GetMappingResponse response, String in
 
     @Override
     public Object getBucketKey(MultiBucketBase bucket) {
+        if (bucket instanceof LongTermsBucket) {
+            return CastUtils.castNumber(((LongTermsBucket) bucket).key()).longValue();
+        }
+        if (bucket instanceof DoubleTermsBucket) {
+            return ((DoubleTermsBucket) bucket).key();
+        }
+        if (bucket instanceof StringTermsBucket) {
+            return ((StringTermsBucket) bucket).key()._get();
+        }
         if (bucket instanceof DateHistogramBucket _bucket) {
             return _bucket.key();
         }
@@ -79,4 +107,4 @@ public Object getBucketKey(MultiBucketBase bucket) {
         }
         return null;
     }
-}
+}