add filter

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/configuration/GeoIndexInitialize.java

@@ -0,0 +1,26 @@
+package org.jetlinks.community.device.configuration;
+
+import org.jetlinks.community.elastic.search.index.DefaultElasticSearchIndexMetadata;
+import org.jetlinks.community.elastic.search.index.ElasticSearchIndexManager;
+import org.jetlinks.community.elastic.search.index.strategies.DirectElasticSearchIndexStrategy;
+import org.jetlinks.core.metadata.types.StringType;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName GeoIndexInitialize.java
+ * @Description TODO
+ * @createTime 2021年10月21日 10:15:00
+ */
+@Component
+@Order(1)
+public class GeoIndexInitialize {
+    public GeoIndexInitialize(DirectElasticSearchIndexStrategy indexManager) {
+        indexManager.putIndex(new DefaultElasticSearchIndexMetadata(GeoIndexProvider.GEO_TAG.getIndex())
+            .addProperty("deviceId", new StringType())
+            .addProperty("location", new StringType()))
+            .subscribe();
+    }
+}

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/configuration/GeoIndexProvider.java

@@ -0,0 +1,16 @@
+package org.jetlinks.community.device.configuration;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.jetlinks.community.elastic.search.index.ElasticIndex;
+
+@Getter
+@AllArgsConstructor
+public enum GeoIndexProvider implements ElasticIndex {
+
+    GEO_TAG("geo-point-tag", "_doc");
+
+    private String index;
+
+    private String type;
+}

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/message/writer/TimeSeriesMessageWriterConnector.java

@@ -51,26 +51,13 @@ public class TimeSeriesMessageWriterConnector {
             UPGRADE_FIRMWARE_PROGRESS,UPDATE_TAG);
     }
     /**
-     * 上行消息
+     * 订阅设备消息 入库
      *
      * @param message 设备消息
      * @return void
      */
     @Subscribe(topics = "/device/**", id = "device-message-ts-writer")
     public Mono<Void> writeDeviceMessageToTs(DeviceMessage message) {
-        String deviceId = message.getDeviceId();
-        String productId = String.valueOf(message.getHeader("productId").get());
-        if(upMessages.contains(message.getMessageType())){
-            try {
-                String deviceMessageTopic = DeviceMessageConnector.createDeviceMessageTopic(productId, deviceId, message);
-                Boolean first =Boolean.valueOf( String.valueOf(message.getHeader(FIRST).isPresent()?message.getHeader(FIRST):true));
-                if(!Boolean.FALSE.equals(first)){
-                    clusterManager.getTopic(deviceMessageTopic).publish(Flux.just(message)).subscribe();
-                }
-            }catch (Exception e){
-                log.error("message : {} ,cluster share failed",message);
-            }
-        }
         return dataService.saveDeviceMessage(message);
     }
 

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/GeoDataSaveService.java

@@ -0,0 +1,11 @@
+package org.jetlinks.community.device.service;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName GeoDataSaveService.java
+ * @Description TODO
+ * @createTime 2021年10月21日 10:36:00
+ */
+public class GeoDataSaveService {
+}

jetlinks-manager/visualization-manager/src/main/java/org/jetlinks/community/visualization/web/VisualizationCategoryController.java

@@ -61,14 +61,14 @@ public class VisualizationCategoryController implements
 //                    .where(DataVisualizationEntity::getClassifiedId,id)
 //                    .count();
 //            })
-            .flatMap(productCount->{
-                if(productCount>0){
-                    return Mono.error(new BusinessException("该目录已被绑定产品，不可删除"));
-                }else {
-                    return Mono.just(productCount);
-                }
-            })
-            .doOnNext(productCount-> this.service.deleteById(Mono.just(id)))
+//            .flatMap(productCount->{
+//                if(productCount>0){
+//                    return Mono.error(new BusinessException("该目录已被绑定产品，不可删除"));
+//                }else {
+//                    return Mono.just(productCount);
+//                }
+//            })
+            .map(productCount-> this.service.deleteById(Mono.just(id)))
             ;
     }
 

jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/CroConfiguration.java

@@ -5,6 +5,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
+
+import java.io.FileOutputStream;
+
 /**
  * @author lifang
  * @version 1.0.0