#
Junjie
8 天以前 077c158e71bec14810dcef0815d5d5b6aad8cbf0
#
1个文件已修改
1个文件已添加
46 ■■■■ 已修改文件
src/main/java/com/zy/core/task/ShuttleDemoScheduler.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/task/ShuttleDemoScheduler.java
New file
@@ -0,0 +1,33 @@
package com.zy.core.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.service.DeviceConfigService;
import com.zy.core.action.ShuttleAction;
import com.zy.core.enums.SlaveType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
@Slf4j
public class ShuttleDemoScheduler {
    @Autowired
    private DeviceConfigService deviceConfigService;
    @Autowired
    private ShuttleAction shuttleAction;
    @Scheduled(cron = "0/3 * * * * ? ")
    public synchronized void execute() {
        List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Shuttle)));
        for (DeviceConfig device : shuttleList) {
            shuttleAction.demo(device.getDeviceNo());
        }
    }
}
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -79,19 +79,6 @@
                    readStatus();
                    Thread.sleep(100);
                    ShuttleAction shuttleAction = null;
                    try {
                        shuttleAction = SpringUtils.getBean(ShuttleAction.class);
                    }catch (Exception e){
                        continue;
                    }
                    if (shuttleAction == null) {
                        continue;
                    }
                    //演示模式
                    shuttleAction.demo(deviceConfig.getDeviceNo());
//                    //小车空闲且有跑库程序
//                    shuttleAction.moveLoc(deviceConfig.getDeviceNo());
                } catch (Exception e) {