From 3979820ffea1120bc553accbdeba6445da91f277 Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期四, 16 十月 2025 14:58:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/NotifyScheduler.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/NotifyScheduler.java b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
index 43fe4f9..0b318c5 100644
--- a/src/main/java/com/zy/asrs/task/NotifyScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
@@ -4,15 +4,14 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.domain.NotifyDto;
+import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.HttpRequestLog;
+import com.zy.asrs.service.DeviceConfigService;
import com.zy.asrs.service.HttpRequestLogService;
import com.zy.asrs.utils.NotifyUtils;
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;
@@ -32,23 +31,27 @@
@Autowired
private NotifyUtils notifyUtils;
@Autowired
- private SlaveProperties slaveProperties;
- @Autowired
private ConfigService configService;
@Autowired
private HttpRequestLogService httpRequestLogService;
+ @Autowired
+ private DeviceConfigService deviceConfigService;
@Scheduled(cron = "0/3 * * * * ? ")
public synchronized void notifyShuttle(){
- for (ShuttleSlave slave : slaveProperties.getShuttle()) {
- notifyMsg(String.valueOf(SlaveType.Shuttle), slave.getId());
+ 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());
}
}
@Scheduled(cron = "0/3 * * * * ? ")
public synchronized void notifyForkLift(){
- for (ForkLiftSlave slave : slaveProperties.getForkLift()) {
- notifyMsg(String.valueOf(SlaveType.ForkLift), slave.getId());
+ 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());
}
}
--
Gitblit v1.9.1