From 0f69561e397093b5165c4aac58530721d5c62178 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 25 十一月 2024 11:03:16 +0800
Subject: [PATCH] #led
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java
index 04df88d..a4a4f30 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java
@@ -1,14 +1,13 @@
package com.zy.asrs.wcs.core.timer;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.wcs.core.action.LiftAction;
import com.zy.asrs.wcs.core.action.ShuttleAction;
+import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.utils.RedisUtil;
import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
import com.zy.asrs.wcs.rcs.entity.Device;
-import com.zy.asrs.wcs.rcs.entity.DeviceType;
-import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.service.DeviceService;
-import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -25,24 +24,27 @@
@Autowired
private DeviceService deviceService;
@Autowired
- private DeviceTypeService deviceTypeService;
- @Autowired
private ShuttleAction shuttleAction;
+ @Autowired
+ private LiftAction liftAction;
+
+// @Scheduled(cron = "0/1 * * * * ? ")
+// public synchronized void executeShuttle() {
+// List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
+// .eq(Device::getStatus, 1)
+// .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val()));
+// for (Device device : list) {
+//
+// }
+// }
@Scheduled(cron = "0/1 * * * * ? ")
- public synchronized void executeShuttle() {
- DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
- .eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle))
- .eq(DeviceType::getStatus, 1));
- if (deviceType == null) {
- return;
- }
-
+ public synchronized void executeLift() {
List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
.eq(Device::getStatus, 1)
- .eq(Device::getDeviceType, deviceType.getId()));
+ .eq(Device::getDeviceType, DeviceCtgType.LIFT.val()));
for (Device device : list) {
- Object object = redisUtil.get(DeviceRedisConstant.SHUTTLE_FLAG + device.getDeviceNo());
+ Object object = redisUtil.get(DeviceRedisConstant.LIFT_FLAG + device.getDeviceNo());
if (object == null) {
continue;
}
@@ -50,14 +52,9 @@
Integer taskNo = Integer.valueOf(String.valueOf(object));
if (taskNo != 0) {
//瀛樺湪浠诲姟闇�瑕佹墽琛�
- shuttleAction.executeWork(device, taskNo);
+ boolean result = liftAction.executeWork(device, taskNo);
}
}
- }
-
- @Scheduled(cron = "0/1 * * * * ? ")
- public synchronized void executeLift() {
-
}
@Scheduled(cron = "0/1 * * * * ? ")
--
Gitblit v1.9.1