#

Junjie

4 天以前 456273f11d75782e676d43763f0f0601ea5c37f8

 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java

@@ -41,7 +41,6 @@
import lombok.extern.slf4j.Slf4j;

import java.io.IOException;
import java.io.OutputStreamWriter;
import java.text.MessageFormat;
import java.util.*;

@@ -77,7 +76,7 @@
                    listenMessageFromRedis();
                    listenInit();//监听初始化事件
                    read();
                    Thread.sleep(50);
                    Thread.sleep(100);
                } catch (Exception e) {
                    log.error("ShuttleThread Fail", e);
                }
@@ -257,6 +256,15 @@

                InnerSuhttleExtend extend = new InnerSuhttleExtend();
                shuttleProtocol.setExtend(extend);
            }

            //----------读取四向穿梭车状态-----------
            DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
            NyShuttleHttpCommand readStatusCommand = getReadStatusCommand(slave.getId());
            //指令超过五条，不再下发任务状态请求
            TreeSet<String> deviceCommandMsgListKey = deviceMsgUtils.getDeviceCommandMsgListKey(SlaveType.Shuttle, slave.getId());
            if (deviceCommandMsgListKey.size() < 5) {
                requestCommand(readStatusCommand);//请求状态
            }

            if (this.socketReadResults.isEmpty()) {
@@ -1090,7 +1098,7 @@
            JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand));
            data.remove("nodes");

            String key = deviceMsgUtils.sendCommand(SlaveType.Shuttle, slave.getId(), data);
            String key = deviceMsgUtils.sendDeviceCommand(SlaveType.Shuttle, slave.getId(), data);

            String requestType = null;
            String taskId = null;