From fabfa0238b52b508c7c64445f8817e27c25a6e62 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 18 三月 2025 08:07:14 +0800 Subject: [PATCH] #输出socket下发日志 --- src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java index a585d5e..cc02ff6 100644 --- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java +++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java @@ -458,13 +458,21 @@ } for (NyShuttleHttpCommand requestCommand : commandList) { - JSONObject result = requestCommand(requestCommand); - if (result == null) { - return response;//璇锋眰澶辫触 + while (true) { + int i = 0; + i++; + JSONObject result = requestCommand(requestCommand); + if (result == null) { +// return response;//璇锋眰澶辫触 + News.info("Socket鍛戒护涓嬪彂澶辫触锛屼换鍔℃暟鎹�={}锛屾鏁�={}", JSON.toJSON(command), i); + continue;//璇锋眰澶辫触灏濊瘯閲嶆柊璇锋眰 + } + this.shuttleProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿 + response.setMessage(JSON.toJSONString(result)); + response.setResult(true); + News.info("Socket鍛戒护涓嬪彂鎴愬姛锛屼换鍔℃暟鎹�={}锛屾鏁�={}锛屽搷搴旀暟鎹�={}", JSON.toJSON(command), i, JSON.toJSONString(result)); + break; } - this.shuttleProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿 - response.setMessage(JSON.toJSONString(result)); - response.setResult(true); } return response; } catch (Exception e) { @@ -813,6 +821,13 @@ } @Override + public boolean offerSystemMsg(String format, Object... arguments) { + String msg = News.replace(format, arguments); + shuttleProtocol.setSystemMsg(msg); + return true; + } + + @Override public ShuttleCommand getMoveCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed, List<NavigateNode> nodes) { NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class); NyShuttleHttpCommand httpStandard = getHttpStandard(slave.getId(), taskNo); @@ -1071,9 +1086,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 { -- Gitblit v1.9.1