From b41d317e9b76b1158a9d21257698e55194bb39f5 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期五, 04 九月 2026 22:52:09 +0800
Subject: [PATCH] 建立电池检测模块骨架与运行时装配
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestLiveServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestLiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestLiveServiceImpl.java
index 6345a50..02cd9b9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestLiveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestLiveServiceImpl.java
@@ -14,13 +14,14 @@
import jakarta.annotation.PreDestroy;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.Nullable;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-import com.ruoyi.device.bts.BtsDevelopmentSimulator;
-import com.ruoyi.device.bts.BtsDevelopmentSimulator.CollectorSnapshot;
-import com.ruoyi.device.discovery.DeviceDiscoveryCandidateStore;
-import com.ruoyi.device.discovery.DeviceDiscoveryCandidateStore.CabinetCandidate;
-import com.ruoyi.device.discovery.DeviceDiscoveryCandidateStore.ChannelCandidate;
-import com.ruoyi.device.model.Measurement;
+import com.battery.device.simulator.BtsDevelopmentSimulator;
+import com.battery.device.simulator.BtsDevelopmentSimulator.CollectorSnapshot;
+import com.battery.device.discovery.DeviceDiscoveryCandidateStore;
+import com.battery.device.discovery.DeviceDiscoveryCandidateStore.CabinetCandidate;
+import com.battery.device.discovery.DeviceDiscoveryCandidateStore.ChannelCandidate;
+import com.battery.device.model.Measurement;
import com.ruoyi.system.domain.TTest;
import com.ruoyi.system.domain.TTestBattery;
import com.ruoyi.system.service.ITestLiveService;
@@ -41,7 +42,7 @@
@Autowired
public TTestLiveServiceImpl(ITTestService tests, DeviceDiscoveryCandidateStore candidates,
- BtsDevelopmentSimulator simulator, TTestMapper mapper)
+ @Nullable BtsDevelopmentSimulator simulator, TTestMapper mapper)
{ this.tests = tests; this.candidates = candidates; this.simulator = simulator; this.mapper = mapper; }
public TTestLiveServiceImpl(ITTestService tests, DeviceDiscoveryCandidateStore candidates,
@@ -82,6 +83,7 @@
private TestPlanSnapshot detectorTestPlan(TTest test)
{
+ if (simulator == null) return null;
if (test.getBatteries() == null) return null;
for (TTestBattery battery : test.getBatteries())
{
@@ -206,6 +208,8 @@
private LiveSource collectorSource(TTestBattery battery)
{
+ if (simulator == null) return new LiveSource("COLLECTOR", battery.getCollectorId(), battery.getBatteryNo(),
+ "OFFLINE", Map.of());
for (CollectorSnapshot collector : simulator.snapshot().collectors()) if (collector.collectorId() == battery.getCollectorId())
{
Map<String, Object> value = new LinkedHashMap<>();
--
Gitblit v1.7.1