#

Junjie

2025-03-17 85f43fd5d3b53b68e0339dfa71aca1439663aa07

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

@@ -120,6 +120,9 @@
//                    //小车空闲且有跑库程序
//                    shuttleAction.moveLoc(slave.getId());

                    //演示模式
                    shuttleAction.demo(slave.getId());

                    Thread.sleep(200);
                } catch (Exception e) {
                    e.printStackTrace();
@@ -455,13 +458,17 @@
            }

            for (NyShuttleHttpCommand requestCommand : commandList) {
                JSONObject result = requestCommand(requestCommand);
                if (result == null) {
                    return response;//请求失败
                while (true) {
                    JSONObject result = requestCommand(requestCommand);
                    if (result == null) {
//                        return response;//请求失败
                        continue;//请求失败尝试重新请求
                    }
                    this.shuttleProtocol.setSendTime(System.currentTimeMillis());//指令下发时间
                    response.setMessage(JSON.toJSONString(result));
                    response.setResult(true);
                    break;
                }
                this.shuttleProtocol.setSendTime(System.currentTimeMillis());//指令下发时间
                response.setMessage(JSON.toJSONString(result));
                response.setResult(true);
            }
            return response;
        } catch (Exception e) {
@@ -569,6 +576,7 @@
                && this.shuttleProtocol.getMode() == 1
                && this.shuttleProtocol.getPakMk()
                && this.shuttleProtocol.getErrorCode().equals("0")
                && this.shuttleProtocol.getTaskNo() == 0
                && (this.shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.IDLE.id
                || this.shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.WAITING.id
                || this.shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.CHARGING_WAITING.id)
@@ -800,6 +808,19 @@
            return true;
        }
        return false;
    }

    @Override
    public boolean enableDemo(boolean enable) {
        shuttleProtocol.setDemo(enable);
        return true;
    }

    @Override
    public boolean offerSystemMsg(String format, Object... arguments) {
        String msg = News.replace(format, arguments);
        shuttleProtocol.setSystemMsg(msg);
        return true;
    }

    @Override
@@ -1061,9 +1082,9 @@
        }

        // 获取服务器响应
        // 尝试10次
        // 尝试100次
        JSONObject result = null;
        for (int i = 0; i < 10; i++) {
        for (int i = 0; i < 100; i++) {
            result = getRequestBody(requestType);
            if (result == null) {
                try {