From bead059502ed941734d7a61a877bf89183f1bd84 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Wed, 1 Jul 2026 13:15:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=80=E5=85=B3=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=89=AB=E6=8F=8F=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E4=BB=8E5=E5=88=86=E9=92=9F=E6=94=B9=E4=B8=BA2=E5=88=86?= =?UTF-8?q?=E9=92=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/intc/iot/service/impl/DeviceStatusServiceImpl.java | 2 -- .../com/intc/iot/service/impl/TimingCtrlExecuteServiceImpl.java | 2 +- .../src/main/java/com/intc/iot/task/TimingCtrlExecuteTask.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/intc-modules/intc-iot/src/main/java/com/intc/iot/service/impl/DeviceStatusServiceImpl.java b/intc-modules/intc-iot/src/main/java/com/intc/iot/service/impl/DeviceStatusServiceImpl.java index 3d5c2f5..a023f90 100644 --- a/intc-modules/intc-iot/src/main/java/com/intc/iot/service/impl/DeviceStatusServiceImpl.java +++ b/intc-modules/intc-iot/src/main/java/com/intc/iot/service/impl/DeviceStatusServiceImpl.java @@ -11,7 +11,6 @@ import com.intc.iot.service.DeviceStatusService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -27,7 +26,6 @@ import java.util.Map; */ @Service @RequiredArgsConstructor -@ConditionalOnBean(IotDeviceStatusMapper.class) @Slf4j public class DeviceStatusServiceImpl implements DeviceStatusService { diff --git a/intc-modules/intc-iot/src/main/java/com/intc/iot/service/impl/TimingCtrlExecuteServiceImpl.java b/intc-modules/intc-iot/src/main/java/com/intc/iot/service/impl/TimingCtrlExecuteServiceImpl.java index 8158667..753127e 100644 --- a/intc-modules/intc-iot/src/main/java/com/intc/iot/service/impl/TimingCtrlExecuteServiceImpl.java +++ b/intc-modules/intc-iot/src/main/java/com/intc/iot/service/impl/TimingCtrlExecuteServiceImpl.java @@ -41,7 +41,7 @@ public class TimingCtrlExecuteServiceImpl implements TimingCtrlExecuteService { private static final String DAILY_EXEC_LOCK_PREFIX = "fishery:timingCtrl:daily:exec:"; private static final DateTimeFormatter DATE_KEY_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); - private static final long SCAN_WINDOW_MINUTES = 10L; + private static final long SCAN_WINDOW_MINUTES = 4L; /** * 启动时打印日志，用于确认 Bean 是否成功创建 diff --git a/intc-modules/intc-iot/src/main/java/com/intc/iot/task/TimingCtrlExecuteTask.java b/intc-modules/intc-iot/src/main/java/com/intc/iot/task/TimingCtrlExecuteTask.java index a935b56..f85f7fb 100644 --- a/intc-modules/intc-iot/src/main/java/com/intc/iot/task/TimingCtrlExecuteTask.java +++ b/intc-modules/intc-iot/src/main/java/com/intc/iot/task/TimingCtrlExecuteTask.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; @ConditionalOnBean(TimingCtrlExecuteService.class) public class TimingCtrlExecuteTask { - private static final long SCAN_DELAY_MS = 300000L; + private static final long SCAN_DELAY_MS = 120000L; private static final long INITIAL_DELAY_MS = 10000L; private final TimingCtrlExecuteService timingCtrlExecuteService;