From ad79ba405b2d1ac96423f88f4e8a76c584b9d38a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 15:57:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/NotifyScheduler.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/NotifyScheduler.java b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
index eb022e4..9bc36ed 100644
--- a/src/main/java/com/zy/asrs/task/NotifyScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
@@ -12,9 +12,6 @@
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.RedisUtil;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.ForkLiftSlave;
-import com.zy.core.model.ShuttleSlave;
-import com.zy.core.properties.SlaveProperties;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
@@ -42,25 +39,35 @@
@Scheduled(cron = "0/3 * * * * ? ")
public synchronized void notifyShuttle(){
- List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
- .eq("device_type", String.valueOf(SlaveType.Shuttle)));
- for (DeviceConfig device : shuttleList) {
- notifyMsg(String.valueOf(SlaveType.Shuttle), device.getDeviceNo());
+ List<DeviceConfig> deviceList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Crn)));
+ for (DeviceConfig device : deviceList) {
+ notifyMsg(String.valueOf(SlaveType.Crn), device.getDeviceNo());
}
}
@Scheduled(cron = "0/3 * * * * ? ")
public synchronized void notifyForkLift(){
- List<DeviceConfig> forkLiftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
- .eq("device_type", String.valueOf(SlaveType.ForkLift)));
- for (DeviceConfig device : forkLiftList) {
- notifyMsg(String.valueOf(SlaveType.ForkLift), device.getDeviceNo());
+ List<DeviceConfig> deviceList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Rgv)));
+ for (DeviceConfig device : deviceList) {
+ notifyMsg(String.valueOf(SlaveType.Rgv), device.getDeviceNo());
}
}
@Scheduled(cron = "0/3 * * * * ? ")
public synchronized void notifyTask(){
notifyMsg("task", 1);
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public synchronized void notifyCrn(){
+ notifyMsg("crn", 1);
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public synchronized void notifyDualCrn(){
+ notifyMsg("dualCrn", 1);
}
private synchronized void notifyMsg(String notifyType, Integer device) {
@@ -100,6 +107,8 @@
continue;
}
NotifyDto notifyDto = (NotifyDto) object;
+ int id =notifyDto.getId().intValue();
+ notifyDto.setId((Long.valueOf(id)));
if (System.currentTimeMillis() - notifyDto.getLastRetryTime() < 1000 * notifyDto.getRetryTime()) {
continue;
--
Gitblit v1.9.1