+ 引擎开关配置

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/impl/VideoTrailEngine.java

@@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -38,6 +39,7 @@ import cn.hutool.core.lang.UUID;
  */
 @Service
 @ConditionalOnBean(MqttCfg.class)
+@ConditionalOnProperty(name = "evt-fusion.video-trail-engine.enable", havingValue = "true")
 public class VideoTrailEngine extends EvtFusionEngine {
     private static final Logger logger = LoggerFactory.getLogger(VideoTrailEngine.class);
 

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mqtt/UWBLocationListener.java

@@ -8,6 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +25,7 @@ import net.dreamlu.iot.mqtt.spring.client.event.MqttDisconnectEvent;
 
 @Service
 @ConditionalOnBean(MqttCfg.class)
+@ConditionalOnProperty(name = "evt-fusion.video-trail-engine.enable", havingValue = "true")
 public class UWBLocationListener {
     private static final Logger logger = LoggerFactory.getLogger(UWBLocationListener.class);
 

bd-park/park-backend/park-application/src/main/resources/application-druid.yml

@@ -102,3 +102,10 @@ mqtt:
 bd:
   mqtt:
     enabled: true
+
+evt-fusion:
+  thread-pool-size: 2
+  video-trail-engine:
+    enable: false
+  uwb-tag-listener:
+    enable: false

bd-park/park-backend/park-application/src/main/resources/application.yml

@@ -57,6 +57,7 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
+    encoding: UTF-8
   profiles:
     active: druid
   # 文件上传

bd-park/park-backend/park-infrastructure/src/main/java/com/huashe/park/infrastructure/socket/client/UWBCfg.java

@@ -9,7 +9,6 @@ import java.util.TimerTask;
 
 import javax.annotation.Resource;
 
-import com.huashe.park.infrastructure.cfg.mqtt.MqttCfg;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.java_websocket.client.WebSocketClient;
@@ -17,6 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -24,6 +24,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.huashe.park.common.DateTimeUtil;
 import com.huashe.park.domain.dto.UWBAuth;
 import com.huashe.park.infrastructure.cfg.forest.UWBForestCfg;
+import com.huashe.park.infrastructure.cfg.mqtt.MqttCfg;
 import com.huashe.park.infrastructure.uwb.UWBWebService;
 
 import cn.hutool.core.map.MapUtil;
@@ -41,12 +42,14 @@ public class UWBCfg {
 
     @Bean
     @ConditionalOnBean(MqttCfg.class)
+    @ConditionalOnProperty(havingValue = "true", name = "evt-fusion.uwb-tag-listener.enable")
     public UWBSocketClient uwbWebSocketClient() throws URISyntaxException {
         return new UWBSocketClient(new URI(uwbForestCfg.getUwbSocket()));
     }
 
     @Bean
     @ConditionalOnBean(MqttCfg.class)
+    @ConditionalOnProperty(havingValue = "true", name = "evt-fusion.uwb-tag-listener.enable")
     public WebSocketClient webSocketClient(UWBSocketClient uwbWebSocketClient) {
         UWBAuth uwbAuth = authUWB();
         if (ObjectUtils.isEmpty(uwbAuth)) {