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/TestDataReceptionServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestDataReceptionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestDataReceptionServiceImpl.java
index 107d501..d1dccbb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestDataReceptionServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestDataReceptionServiceImpl.java
@@ -12,11 +12,12 @@
import com.alibaba.fastjson2.JSON;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.Nullable;
import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.device.bts.BtsDevelopmentSimulator;
-import com.ruoyi.device.simulator.BtsSimulatorStateStore.BtsHistoryRecord;
-import com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorRealtimeMeasurement;
-import com.ruoyi.device.simulator.DevelopmentCollectorSimulation.CollectorRealtimeSnapshot;
+import com.battery.device.simulator.BtsDevelopmentSimulator;
+import com.battery.device.simulator.BtsSimulatorStateStore.BtsHistoryRecord;
+import com.battery.device.simulator.BtsSimulatorStateStore.CollectorRealtimeMeasurement;
+import com.battery.device.simulator.DevelopmentCollectorSimulation.CollectorRealtimeSnapshot;
import com.ruoyi.system.domain.TTest;
import com.ruoyi.system.domain.TTestBattery;
import com.ruoyi.system.domain.TTestChannelBinding;
@@ -36,7 +37,7 @@
private final Map<Long, Instant> lastRawCaptureAt = new java.util.concurrent.ConcurrentHashMap<>();
@Autowired
- public TestDataReceptionServiceImpl(TTestMapper mapper, ITTestService tests, BtsDevelopmentSimulator simulator,
+ public TestDataReceptionServiceImpl(TTestMapper mapper, ITTestService tests, @Nullable BtsDevelopmentSimulator simulator,
TestWarningExceptionService warningExceptions)
{
this.mapper = mapper;
@@ -53,6 +54,7 @@
@Transactional(rollbackFor = Exception.class)
public void captureDevelopmentRealtimeSnapshots()
{
+ if (simulator == null) return;
List<Long> testIds = mapper.selectReceivingTestIds();
if (testIds == null) return;
Date now = new Date();
@@ -134,6 +136,7 @@
@Transactional(rollbackFor = Exception.class)
public void captureDevelopmentCabinetRecords()
{
+ if (simulator == null) return;
List<Long> testIds = mapper.selectReceivingTestIds();
if (testIds == null) return;
for (Long testId : testIds)
@@ -151,6 +154,7 @@
@Transactional(rollbackFor = Exception.class)
public void captureDevelopmentCollectorMeasurements()
{
+ if (simulator == null) return;
List<Long> testIds = mapper.selectReceivingTestIds();
if (testIds == null) return;
for (Long testId : testIds)
--
Gitblit v1.7.1