#

Junjie

2025-03-18 05f2733c4cdc4ea0765e08d61273728aebb70d16

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

@@ -220,7 +220,6 @@
                JSONObject resultResponse = JSON.parseObject(socketResult.get("response").toString());
                JSONObject resultBody = JSON.parseObject(resultResponse.get("body").toString());
                String responseType = resultBody.get("responseType").toString();
                String responseTaskId = resultBody.get("taskId").toString();
                if (DEBUG) {
                    result = socketResult;
                    break;
@@ -230,8 +229,11 @@
                    continue;//响应类型与请求类型不一致，不在调试模式下
                }

                if (!responseTaskId.equals(taskId)) {
                    continue;//响应ID与请求ID不一致，不在调试模式下
                if (taskId != null) {
                    String responseTaskId = resultBody.get("taskId").toString();
                    if (!responseTaskId.equals(taskId)) {
                        continue;//响应ID与请求ID不一致，不在调试模式下
                    }
                }

                result = socketResult;
@@ -464,18 +466,14 @@

            for (NyShuttleHttpCommand requestCommand : commandList) {
                while (true) {
                    int i = 0;
                    i++;
                    JSONObject result = requestCommand(requestCommand);
                    if (result == null) {
//                        return response;//请求失败
                        News.info("Socket命令下发失败，任务数据={}，次数={}", JSON.toJSON(requestCommand), i);
                        continue;//请求失败尝试重新请求
                    }
                    this.shuttleProtocol.setSendTime(System.currentTimeMillis());//指令下发时间
                    response.setMessage(JSON.toJSONString(result));
                    response.setResult(true);
                    News.info("Socket命令下发成功，任务数据={}，次数={}，响应数据={}", JSON.toJSON(requestCommand), i, JSON.toJSONString(result));
                    break;
                }
            }
@@ -1089,7 +1087,8 @@
            requestType = httpCommand.getRequest().getBody().get("requestType").toString();
            taskId = httpCommand.getRequest().getBody().get("taskId").toString();
        } catch (Exception e) {
            return null;
//            return null;
            //taskId可能取空，不报错，正常情况
        }

        // 获取服务器响应