From 147428971be43eed90a79f3849f15000d3855390 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 28 九月 2026 15:15:22 +0800
Subject: [PATCH] 实现新威 7.6 直连取数与逐行接收
---
ruoyi-admin/src/main/java/com/battery/business/runtime/DeviceAdapterRuntimeConfig.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/battery/business/runtime/DeviceAdapterRuntimeConfig.java b/ruoyi-admin/src/main/java/com/battery/business/runtime/DeviceAdapterRuntimeConfig.java
index 8cdd91f..b819ad6 100644
--- a/ruoyi-admin/src/main/java/com/battery/business/runtime/DeviceAdapterRuntimeConfig.java
+++ b/ruoyi-admin/src/main/java/com/battery/business/runtime/DeviceAdapterRuntimeConfig.java
@@ -3,29 +3,27 @@
import java.util.List;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
import org.springframework.scheduling.annotation.EnableScheduling;
import com.battery.device.api.NoopDeviceAdapterFactory;
import com.battery.device.bts.BtsDeviceAdapterFactory;
import com.battery.device.api.registry.DeviceAdapterRegistry;
+import com.battery.device.neware.NewareMysqlAdapterFactory;
-/** 装配单进程设备适配器运行时。 */
+/**
+ * 装配单进程设备适配器运行时。
+ *
+ * <p>注册表按存储形态持有全部可用实现；实例按 {@code t_device_adapter} 配置或代码装配注册。
+ * 同一进程内可并存多个来源实例，取数按通道身份里的适配器编码解析到各自实例。
+ * 某个类型是否真的有实例可用只由配置决定，因此这里不再按 profile 收窄可注册的类型。
+ */
@Configuration
@EnableScheduling
public class DeviceAdapterRuntimeConfig
{
@Bean(destroyMethod = "close")
- @Profile("!dev-simulator & !bts")
- public DeviceAdapterRegistry noopDeviceAdapterRegistry()
- {
- return new DeviceAdapterRegistry(List.of(new NoopDeviceAdapterFactory()));
- }
-
- @Bean(destroyMethod = "close")
- @Profile({ "dev-simulator", "bts" })
public DeviceAdapterRegistry deviceAdapterRegistry()
{
- return new DeviceAdapterRegistry(List.of(new BtsDeviceAdapterFactory()));
+ return new DeviceAdapterRegistry(List.of(new NoopDeviceAdapterFactory(), new BtsDeviceAdapterFactory(),
+ new NewareMysqlAdapterFactory()));
}
-
}
--
Gitblit v1.7.1