From c31c768d2bf651cad3b545face7ac91ab66ddd10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Wed, 28 May 2025 21:41:08 +0800 Subject: [PATCH] =?UTF-8?q?initDeviceState=E6=97=B6=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=BD=BF=E7=94=A8ObjectProvider=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iflytop/sgs/app/service/device/DeviceInitService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java b/src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java index 2019cb9..ec090cb 100644 --- a/src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java +++ b/src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java @@ -30,12 +30,13 @@ import java.util.concurrent.CompletableFuture; @RequiredArgsConstructor public class DeviceInitService { private final DeviceStateService deviceStateService; - private final ObjectProvider heatModuleStateProvider; private final ContainerService containerService; private final DeviceParamConfigService deviceParamConfigService; private final CanBusService canBusService; private final DeviceCommandService deviceCommandService; private final DeviceSensorService deviceSensorService; + private final ObjectProvider heatModuleStateProvider; + private final ObjectProvider solutionContainerStateProvider; @PostConstruct public void init() { @@ -117,9 +118,9 @@ public class DeviceInitService { List solutionBucket = deviceState.getSolutionModule().getSolutionContainer(); for (Container container : containerList) { if (container.getType() == 0) { - solutionBucket.add(new SolutionContainerState(container.getId(), ContainerCode.valueOf(container.getCode()), ContainerType.solution)); + solutionBucket.add(solutionContainerStateProvider.getObject(container.getId(), ContainerCode.valueOf(container.getCode()), ContainerType.solution)); } else { - solutionBucket.add(new SolutionContainerState(container.getId(), ContainerCode.valueOf(container.getCode()), ContainerType.waste)); + solutionBucket.add(solutionContainerStateProvider.getObject(container.getId(), ContainerCode.valueOf(container.getCode()), ContainerType.waste)); } }