Selaa lähdekoodia

修复索引大写问题

zhouhao 5 vuotta sitten
vanhempi
commit
831db77c0c

+ 14 - 4
jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/timeseries/ESAbstractTimeSeriesManager.java

@@ -27,15 +27,25 @@ public abstract class ESAbstractTimeSeriesManager implements TimeSeriesManager {
 
     private Map<String, LocalTimeSeriesMetric> localMetricMap = new ConcurrentHashMap<>();
 
-    private StandardsIndexManager standardsIndexManager;
+    protected StandardsIndexManager standardsIndexManager;
 
-    private IndexOperationService indexOperationService;
+    protected IndexOperationService indexOperationService;
+
+    protected IndexTemplateOperationService indexTemplateOperationService;
+
+    public ESAbstractTimeSeriesManager(IndexOperationService indexOperationService,
+                               StandardsIndexManager standardsIndexManager,
+                               IndexTemplateOperationService indexTemplateOperationService) {
+        this.indexOperationService = indexOperationService;
+        this.standardsIndexManager = standardsIndexManager;
+        this.indexTemplateOperationService = indexTemplateOperationService;
+    }
 
-    private IndexTemplateOperationService indexTemplateOperationService;
 
     // TODO: 2020/2/11 策略变更动态更新实现
     protected LocalTimeSeriesMetric getLocalTimeSeriesMetric(TimeSeriesMetric metric) {
-        return localMetricMap.computeIfAbsent(metric.getId(), index -> {
+
+        return localMetricMap.computeIfAbsent(metric.getId().toLowerCase(), index -> {
             String standardsIndex = getStandardsIndexManager().getStandardsIndex(index);
             String templateName = IndexTemplateProvider.getIndexTemplate(index);
             return new LocalTimeSeriesMetric(

+ 1 - 23
jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/timeseries/ESTimeSeriesManager.java

@@ -31,35 +31,13 @@ public class ESTimeSeriesManager extends ESAbstractTimeSeriesManager {
 
     private final TimeSeriesServiceRegisterCenter timeSeriesServiceRegisterCenter;
 
-    private final IndexOperationService indexOperationService;
-
-    private final IndexTemplateOperationService indexTemplateOperationService;
-
-    private final StandardsIndexManager standardsIndexManager;
-
     public ESTimeSeriesManager(TimeSeriesServiceRegisterCenter timeSeriesServiceRegisterCenter,
                                IndexOperationService indexOperationService,
                                StandardsIndexManager standardsIndexManager,
                                IndexTemplateOperationService indexTemplateOperationService) {
+        super(indexOperationService,standardsIndexManager,indexTemplateOperationService);
         this.timeSeriesServiceRegisterCenter = timeSeriesServiceRegisterCenter;
-        this.indexOperationService = indexOperationService;
-        this.standardsIndexManager = standardsIndexManager;
-        this.indexTemplateOperationService = indexTemplateOperationService;
-    }
 
-    @Override
-    public StandardsIndexManager getStandardsIndexManager() {
-        return this.standardsIndexManager;
-    }
-
-    @Override
-    public IndexOperationService getIndexOperationService() {
-        return indexOperationService;
-    }
-
-    @Override
-    public IndexTemplateOperationService getIndexTemplateOperationService() {
-        return indexTemplateOperationService;
     }
 
     @Override