From d8002fae52c8c54e35f6322a03148e5041c10c6e Mon Sep 17 00:00:00 2001 From: weitang Date: Fri, 25 Apr 2025 10:15:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=BA=E5=99=A8=E4=BA=BA/?= =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BootNettyChannelInboundHandlerAdapter.java | 12 ++++++------ .../nettyserver/NettyServerHandler.java | 4 +++- .../controller/LinkageSignalController.java | 2 +- .../controller/ExaminePlanController.java | 2 +- .../patroltask/controller/TaskController.java | 4 ++-- .../controller/TaskTodoController.java | 2 +- .../service/impl/StationRobotServiceImpl.java | 18 +++++++++--------- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/component/nettyclient/BootNettyChannelInboundHandlerAdapter.java b/riis-system/src/main/java/com/yfd/platform/component/nettyclient/BootNettyChannelInboundHandlerAdapter.java index ed4c4fc..9f9b8e3 100644 --- a/riis-system/src/main/java/com/yfd/platform/component/nettyclient/BootNettyChannelInboundHandlerAdapter.java +++ b/riis-system/src/main/java/com/yfd/platform/component/nettyclient/BootNettyChannelInboundHandlerAdapter.java @@ -446,8 +446,8 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler SubstationPatroldevice substationPatroldevice = list.get(0); // 发送任务到机器人 JSONArray jsonArray = JSONUtil.parseArray(items); - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), - httpServerConfig.getPatrolServerid(), substationPatroldevice.getCustom3(), Type, Command, + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), + httpServerConfig.getPatrolServerid(), substationPatroldevice.getInternationalId(), Type, Command, Code, jsonArray.toString()); } } @@ -846,7 +846,7 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler // 机器人系统编码 String internationalId = substationPatroldevice.getInternationalId(); // 机器人任务 - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), httpServerConfig.getPatrolServerid(), internationalId, Type, Command, Code, null); // 创建事件并注册 Event event = new Event(taskTodo.getTaskTodoId(), response -> { @@ -914,7 +914,7 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler // 机器人系统编码 String internationalId = substationPatroldevice.getInternationalId(); // 机器人任务 - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), httpServerConfig.getPatrolServerid(), internationalId, Type, Command, Code, null); // 创建事件并注册 Event event = new Event(taskTodo.getTaskTodoId(), response -> { @@ -991,7 +991,7 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler // 机器人系统编码 String internationalId = substationPatroldevice.getInternationalId(); // 机器人任务 - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), httpServerConfig.getPatrolServerid(), internationalId, Type, Command, Code, null); // 创建事件并注册 Event event = new Event(task.getTaskCode(), response -> { @@ -1063,7 +1063,7 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler // 机器人系统编码 String internationalId = substationPatroldevice.getInternationalId(); // 机器人任务 - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), httpServerConfig.getPatrolServerid(), internationalId, Type, Command, Code, null); // 创建事件并注册 Event event = new Event(taskTodo.getTaskTodoId(), response -> { diff --git a/riis-system/src/main/java/com/yfd/platform/component/nettyserver/NettyServerHandler.java b/riis-system/src/main/java/com/yfd/platform/component/nettyserver/NettyServerHandler.java index 95d80d0..8b396f0 100644 --- a/riis-system/src/main/java/com/yfd/platform/component/nettyserver/NettyServerHandler.java +++ b/riis-system/src/main/java/com/yfd/platform/component/nettyserver/NettyServerHandler.java @@ -187,7 +187,7 @@ public class NettyServerHandler extends SimpleChannelInboundHandler map = MyXmlUtil.xmlToMap(xml); String Type = map.get("Type").toString(); String Command = map.get("Command").toString(); + String SendCode = map.get("SendCode").toString(); String Code = ""; if (ObjectUtil.isNotEmpty(map.get("Code"))) { Code = map.get("Code").toString(); @@ -250,6 +251,7 @@ public class NettyServerHandler extends SimpleChannelInboundHandler list = substationPatroldeviceService.list(new LambdaQueryWrapper().eq(SubstationPatroldevice::getPatroldeviceCode, robotCode)); if (list.size() > 0) { SubstationPatroldevice substationPatroldevice = list.get(0); - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getCustom3(), + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getInternationalId(), SystemCode.TYPE_LINKAGE_TASK_ISSUED_CODE.getCode(), SystemCode.COMMAND_TASK_CONFIG_CODE.getCode(), code, jsonObject.toString()); } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/ExaminePlanController.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/ExaminePlanController.java index b5bfb1d..3958422 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/ExaminePlanController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/ExaminePlanController.java @@ -183,7 +183,7 @@ public class ExaminePlanController { List list = substationPatroldeviceService.list(new LambdaQueryWrapper().eq(SubstationPatroldevice::getPatroldeviceCode, robotCode)); if (list.size() > 0) { SubstationPatroldevice substationPatroldevice = list.get(0); - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getCustom3(), + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getInternationalId(), SystemCode.TYPE_EXAMINE_ISSUED_CODE.getCode(), SystemCode.COMMAND_EXAMINE_CONFIG_CODE.getCode(), examinePlan.getStationCode(), jsonObject.toString()); } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskController.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskController.java index 55c66ba..7026f98 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskController.java @@ -224,7 +224,7 @@ public class TaskController { taskService.createTodoTaskList(task); } } else { - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getCustom3(), SystemCode.TYPE_TASK_CONTROL_CODE.getCode(), SystemCode.COMMAND_TASK_START_CODE.getCode(), task.getTaskCode(), null); + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getInternationalId(), SystemCode.TYPE_TASK_CONTROL_CODE.getCode(), SystemCode.COMMAND_TASK_START_CODE.getCode(), task.getTaskCode(), null); } } @@ -346,7 +346,7 @@ public class TaskController { List list = substationPatroldeviceService.list(new LambdaQueryWrapper().eq(SubstationPatroldevice::getPatroldeviceCode, task.getRobotCode())); if (list.size() > 0) { SubstationPatroldevice substationPatroldevice = list.get(0); - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getCustom3(), + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getInternationalId(), SystemCode.TYPE_TASK_ISSUED_CODE.getCode(), SystemCode.COMMAND_TASK_CONFIG_CODE.getCode(), task.getStationCode(), jsonObject.toString()); } if ("1".equals(task.getTaskTodoType())) { diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskTodoController.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskTodoController.java index 7f2c5e4..04393e5 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskTodoController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskTodoController.java @@ -186,7 +186,7 @@ public class TaskTodoController { List list = substationPatroldeviceService.list(new LambdaQueryWrapper().eq(SubstationPatroldevice::getPatroldeviceCode, robotCode)); if (list.size() > 0) { SubstationPatroldevice substationPatroldevice = list.get(0); - stationRobotService.sendCommand(substationPatroldevice.getIpaddr(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getCustom3(), SystemCode.TYPE_TASK_CONTROL_CODE.getCode(), + stationRobotService.sendCommand(substationPatroldevice.getInternationalId(), httpServerConfig.getPatrolServerid(), substationPatroldevice.getInternationalId(), SystemCode.TYPE_TASK_CONTROL_CODE.getCode(), Command, Code, null); } LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/robotapi/service/impl/StationRobotServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/robotapi/service/impl/StationRobotServiceImpl.java index b64a354..bbe8496 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/robotapi/service/impl/StationRobotServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/robotapi/service/impl/StationRobotServiceImpl.java @@ -115,10 +115,10 @@ public class StationRobotServiceImpl extends ServiceImpl list = @@ -126,10 +126,10 @@ public class StationRobotServiceImpl extends ServiceImpl 0) { SubstationPatroldevice substationPatroldevice = list.get(0); - sendMsgtoRobot(substationPatroldevice.getIpaddr(), sendcode, substationPatroldevice.getCustom3(), type, command, code, items); + sendMsgtoRobot(substationPatroldevice.getInternationalId(), sendcode, substationPatroldevice.getInternationalId(), type, command, code, items); } } else { - sendMsgtoRobot(targetIp, sendcode, receivecode, type, command, code, items); + sendMsgtoRobot(targetId, sendcode, receivecode, type, command, code, items); } @@ -209,7 +209,7 @@ public class StationRobotServiceImpl extends ServiceImpl