From 92f32acd847ea1700590bc669750f23ef499840e Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 05 九月 2026 13:39:44 +0800
Subject: [PATCH] 清理旧测试结构并贯通最终业务数据链路
---
battery-business/src/main/java/com/battery/business/service/impl/DeviceAdapterServiceImpl.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java b/battery-business/src/main/java/com/battery/business/service/impl/DeviceAdapterServiceImpl.java
similarity index 91%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java
rename to battery-business/src/main/java/com/battery/business/service/impl/DeviceAdapterServiceImpl.java
index 2b2567f..b42c954 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java
+++ b/battery-business/src/main/java/com/battery/business/service/impl/DeviceAdapterServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.service.impl;
+package com.battery.business.service.impl;
import java.time.Duration;
import java.time.Instant;
@@ -12,19 +12,18 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.battery.device.api.DeviceAdapterException;
-import com.battery.device.simulator.BtsDevelopmentSimulator;
-import com.battery.device.discovery.DeviceDiscoveryCandidateStore;
-import com.battery.device.model.AdapterCapabilities;
-import com.battery.device.registry.AdapterInstanceConfig;
-import com.battery.device.registry.AdapterRegistryException;
-import com.battery.device.registry.DeviceAdapterRegistry;
-import com.ruoyi.system.domain.TDetectionChannel;
-import com.ruoyi.system.domain.TDeviceAdapter;
-import com.ruoyi.system.domain.vo.AdapterDiscoveryResult;
-import com.ruoyi.system.mapper.TDeviceAdapterMapper;
-import com.ruoyi.system.service.DeviceAdapterErrorCodes;
-import com.ruoyi.system.service.IDeviceAdapterService;
-import com.ruoyi.system.service.impl.DeviceDiscoveryPersistenceService.DiscoverySource;
+import com.battery.device.api.discovery.DeviceDiscoveryCandidateStore;
+import com.battery.device.api.model.AdapterCapabilities;
+import com.battery.device.api.registry.AdapterInstanceConfig;
+import com.battery.device.api.registry.AdapterRegistryException;
+import com.battery.device.api.registry.DeviceAdapterRegistry;
+import com.battery.business.domain.TDetectionChannel;
+import com.battery.business.domain.TDeviceAdapter;
+import com.battery.business.domain.vo.AdapterDiscoveryResult;
+import com.battery.business.mapper.TDeviceAdapterMapper;
+import com.battery.business.service.DeviceAdapterErrorCodes;
+import com.battery.business.service.IDeviceAdapterService;
+import com.battery.business.service.impl.DeviceDiscoveryPersistenceService.DiscoverySource;
@Service
public class DeviceAdapterServiceImpl implements IDeviceAdapterService
@@ -236,8 +235,8 @@
private void rejectDevelopmentSimulatorDatabaseConfig(TDeviceAdapter adapter)
{
- if (BtsDevelopmentSimulator.ADAPTER_CODE.equals(adapter.getAdapterCode()))
- throw error("dev-sim 由开发环境代码固定装配，不能写入数据库", DeviceAdapterErrorCodes.INVALID_CONFIG);
+ if (registry.contains(adapter.getAdapterCode()) && mapper.selectDeviceAdapterByCode(adapter.getAdapterCode()) == null)
+ throw error("该适配器由运行环境装配，不能写入数据库", DeviceAdapterErrorCodes.INVALID_CONFIG);
}
private AdapterInstanceConfig toRuntimeConfig(TDeviceAdapter adapter)
--
Gitblit v1.7.1