From 7ab0e426264707fb85ee38d0a9a73caf41899635 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 29 八月 2026 13:11:40 +0800
Subject: [PATCH] 实现采集器独立实时与历史采样模拟
---
ruoyi-admin/src/main/java/com/ruoyi/config/DeviceAdapterRuntimeConfig.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/config/DeviceAdapterRuntimeConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/config/DeviceAdapterRuntimeConfig.java
index 621bda0..19af6bf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/config/DeviceAdapterRuntimeConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/config/DeviceAdapterRuntimeConfig.java
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.util.List;
import org.springframework.boot.ApplicationRunner;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -25,22 +26,24 @@
}
@Bean(destroyMethod = "close")
- public BtsDevelopmentSimulator btsDevelopmentSimulator(BtsSimulatorStateStore stateStore) throws IOException
+ public BtsDevelopmentSimulator btsDevelopmentSimulator(BtsSimulatorStateStore stateStore,
+ @Value("${battery.dev-simulator.port:15020}") int simulatorPort) throws IOException
{
- return new BtsDevelopmentSimulator(BtsDevelopmentSimulator.DEFAULT_PORT, stateStore);
+ return new BtsDevelopmentSimulator(simulatorPort, stateStore);
}
@Bean
- public ApplicationRunner registerDevelopmentSimulatorAdapter(DeviceAdapterRegistry registry)
+ public ApplicationRunner registerDevelopmentSimulatorAdapter(DeviceAdapterRegistry registry,
+ @Value("${battery.dev-simulator.port:15020}") int simulatorPort)
{
// 固定开发装配不进入 t_device_adapter,直接注册运行时实例。
- return arguments -> registry.synchronize(developmentSimulatorRuntimeConfig());
+ return arguments -> registry.synchronize(developmentSimulatorRuntimeConfig(simulatorPort));
}
- private AdapterInstanceConfig developmentSimulatorRuntimeConfig()
+ private AdapterInstanceConfig developmentSimulatorRuntimeConfig(int simulatorPort)
{
return new AdapterInstanceConfig(BtsDevelopmentSimulator.ADAPTER_CODE, "BTS", BtsDevelopmentSimulator.HOST,
- BtsDevelopmentSimulator.DEFAULT_PORT, BtsDevelopmentSimulator.POLL_INTERVAL_MS,
+ simulatorPort, BtsDevelopmentSimulator.POLL_INTERVAL_MS,
"Asia/Hong_Kong", true,
new AdapterCapabilities(true, true, false, false));
}
--
Gitblit v1.7.1