refactor: remove telemetry field api from history app
This commit is contained in:
@@ -92,7 +92,6 @@ lingniu:
|
||||
minimum-idle: ${TDENGINE_MIN_IDLE:0}
|
||||
connection-timeout-millis: ${TDENGINE_CONNECTION_TIMEOUT_MILLIS:5000}
|
||||
initialization-fail-timeout-millis: ${TDENGINE_INITIALIZATION_FAIL_TIMEOUT_MILLIS:-1}
|
||||
telemetry-fields-enabled: ${TDENGINE_TELEMETRY_FIELDS_ENABLED:false}
|
||||
event-history:
|
||||
enabled: true
|
||||
api:
|
||||
|
||||
@@ -287,7 +287,7 @@ class PortainerComposeResourceLimitsTest {
|
||||
assertThat(compose)
|
||||
.contains("TDENGINE_HISTORY_ENABLED: ${TDENGINE_HISTORY_ENABLED:-true}")
|
||||
.contains("TDENGINE_HISTORY_DATABASE: ${TDENGINE_HISTORY_DATABASE:-vehicle_ts}")
|
||||
.contains("TDENGINE_TELEMETRY_FIELDS_ENABLED: ${TDENGINE_TELEMETRY_FIELDS_ENABLED:-false}")
|
||||
.doesNotContain("TDENGINE_TELEMETRY_FIELDS_ENABLED")
|
||||
.doesNotContain("\n TDENGINE_ENABLED:")
|
||||
.doesNotContain("\n TDENGINE_DATABASE:");
|
||||
}
|
||||
@@ -370,6 +370,7 @@ class PortainerComposeResourceLimitsTest {
|
||||
.doesNotContain("读取共享 archive 中的原始 `.bin`")
|
||||
.doesNotContain("EVENT_FILE_STORE_ENABLED")
|
||||
.doesNotContain("EVENT_FILE_STORE_PATH")
|
||||
.doesNotContain("TDENGINE_TELEMETRY_FIELDS_ENABLED")
|
||||
.doesNotContain("/api/event-history/telemetry/fields' 会存在")
|
||||
.doesNotContain("/api/event-history/records");
|
||||
assertThat(splitRunbook)
|
||||
|
||||
@@ -10,7 +10,6 @@ import com.lingniu.ingest.eventhistory.config.EventHistoryAutoConfiguration;
|
||||
import com.lingniu.ingest.eventhistory.Jt808LocationHistoryController;
|
||||
import com.lingniu.ingest.eventhistory.LocationHistoryController;
|
||||
import com.lingniu.ingest.eventhistory.RawFrameHistoryController;
|
||||
import com.lingniu.ingest.eventhistory.TelemetryFieldHistoryController;
|
||||
import com.lingniu.ingest.protocol.gb32960.codec.Gb32960MessageDecoder;
|
||||
import com.lingniu.ingest.protocol.gb32960.config.Gb32960AutoConfiguration;
|
||||
import com.lingniu.ingest.protocol.gb32960.inbound.Gb32960NettyServer;
|
||||
@@ -111,7 +110,7 @@ class VehicleHistoryAppCompositionTest {
|
||||
assertThat(context).hasSingleBean(Gb32960DecodedFrameService.class);
|
||||
assertThat(context).hasSingleBean(LocationHistoryController.class);
|
||||
assertThat(context).hasSingleBean(RawFrameHistoryController.class);
|
||||
assertThat(context).doesNotHaveBean(TelemetryFieldHistoryController.class);
|
||||
assertThat(context).doesNotHaveBean("telemetryFieldHistoryController");
|
||||
assertThat(context).doesNotHaveBean(Gb32960FrameController.class);
|
||||
assertThat(context).doesNotHaveBean(Jt808LocationHistoryController.class);
|
||||
assertThat(context).doesNotHaveBean(Gb32960NettyServer.class);
|
||||
@@ -143,7 +142,6 @@ class VehicleHistoryAppCompositionTest {
|
||||
"spring.cloud.nacos.config.enabled=false",
|
||||
"spring.config.import=",
|
||||
"lingniu.ingest.event-history.enabled=true",
|
||||
"lingniu.ingest.tdengine-history.telemetry-fields-enabled=false",
|
||||
"lingniu.ingest.tdengine-history.enabled=false",
|
||||
"lingniu.ingest.sink.kafka.enabled=false",
|
||||
"lingniu.ingest.sink.kafka.consumer.enabled=false",
|
||||
@@ -151,7 +149,7 @@ class VehicleHistoryAppCompositionTest {
|
||||
.run(context -> {
|
||||
assertThat(context).hasSingleBean(LocationHistoryController.class);
|
||||
assertThat(context).hasSingleBean(RawFrameHistoryController.class);
|
||||
assertThat(context).doesNotHaveBean(TelemetryFieldHistoryController.class);
|
||||
assertThat(context).doesNotHaveBean("telemetryFieldHistoryController");
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -38,9 +38,6 @@ class VehicleHistoryAppDefaultsTest {
|
||||
"${TDENGINE_DRIVER_CLASS_NAME:com.taosdata.jdbc.rs.RestfulDriver}")
|
||||
.containsEntry("lingniu.ingest.tdengine-history.maximum-pool-size", "${TDENGINE_MAX_POOL_SIZE:16}")
|
||||
.containsEntry("lingniu.ingest.tdengine-history.minimum-idle", "${TDENGINE_MIN_IDLE:0}")
|
||||
.containsEntry(
|
||||
"lingniu.ingest.tdengine-history.telemetry-fields-enabled",
|
||||
"${TDENGINE_TELEMETRY_FIELDS_ENABLED:false}")
|
||||
.containsEntry("lingniu.ingest.event-history.enabled", true)
|
||||
.containsEntry("lingniu.ingest.vehicle-state.enabled", false)
|
||||
.containsEntry("lingniu.ingest.vehicle-stat.enabled", false)
|
||||
@@ -108,6 +105,8 @@ class VehicleHistoryAppDefaultsTest {
|
||||
|
||||
assertThat(properties.stringPropertyNames())
|
||||
.noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."));
|
||||
assertThat(properties.stringPropertyNames())
|
||||
.noneMatch(name -> name.equals("lingniu.ingest.tdengine-history.telemetry-fields-enabled"));
|
||||
assertThat(properties.stringPropertyNames())
|
||||
.noneMatch(name -> name.equals("lingniu.ingest.sink.archive.type")
|
||||
|| name.equals("lingniu.ingest.sink.archive.path"));
|
||||
|
||||
Reference in New Issue
Block a user