From bc9a169ce3648467136a279d167f72c4fbab9595 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 05 九月 2026 00:53:48 +0800
Subject: [PATCH] 完成设备发现登记与状态事实
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java
index 8c05d93..2b2567f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java
@@ -11,13 +11,13 @@
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.device.api.DeviceAdapterException;
-import com.ruoyi.device.bts.BtsDevelopmentSimulator;
-import com.ruoyi.device.discovery.DeviceDiscoveryCandidateStore;
-import com.ruoyi.device.model.AdapterCapabilities;
-import com.ruoyi.device.registry.AdapterInstanceConfig;
-import com.ruoyi.device.registry.AdapterRegistryException;
-import com.ruoyi.device.registry.DeviceAdapterRegistry;
+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;
@@ -71,7 +71,7 @@
if (capabilities.control())
throw error("当前里程碑只允许只读设备适配器", DeviceAdapterErrorCodes.INVALID_CONFIG);
adapter.setStatus(ENABLED);
- adapter.setConnectionStatus("DISCONNECTED");
+ adapter.setConnectionStatus("OFFLINE");
adapter.setDelFlag("0");
mapper.upsertManagedDeviceAdapter(adapter);
TDeviceAdapter registered = mapper.selectDeviceAdapterByCode(adapter.getAdapterCode());
@@ -89,7 +89,7 @@
throw error("适配器编码已存在", DeviceAdapterErrorCodes.DUPLICATE_CODE);
adapter.setCapabilities(READ_ONLY_CAPABILITIES);
adapter.setStatus(DISABLED);
- adapter.setConnectionStatus("DISCONNECTED");
+ adapter.setConnectionStatus("OFFLINE");
adapter.setDelFlag("0");
try { return mapper.insertDeviceAdapter(adapter); }
catch (DuplicateKeyException exception) { throw error("适配器编码已存在", DeviceAdapterErrorCodes.DUPLICATE_CODE); }
@@ -143,10 +143,12 @@
}
catch (DeviceAdapterException exception)
{
+ persistence.markUnavailable(adapter.getAdapterCode());
return failDiscovery(adapterId, exception.failureCode(), exception);
}
catch (AdapterRegistryException exception)
{
+ persistence.markUnavailable(adapter.getAdapterCode());
return failDiscovery(adapterId, "ADAPTER_FAILURE", exception);
}
}
--
Gitblit v1.7.1