From a5f790ca04f2cdf9b9c112896756a2f02d14d439 Mon Sep 17 00:00:00 2001 From: cbs <18617195505@163.com> Date: Wed, 30 Apr 2025 16:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E9=81=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/robot/RemoteRobotService.java | 1 - .../service/task/RemoteTaskServiceImpl.java | 1 - .../module/system/enums/ErrorCodeConstants.java | 2 +- .../RemoteControllerInformationServiceImpl.java | 17 +++++++++++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/robot/RemoteRobotService.java b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/robot/RemoteRobotService.java index e16c5b623..2505eca72 100644 --- a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/robot/RemoteRobotService.java +++ b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/robot/RemoteRobotService.java @@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.system.api.remote.dto.RemoteRobotDTO; import cn.iocoder.yudao.module.system.api.remote.dto.RemoteRobotStatusDTO; import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; import java.util.List; public interface RemoteRobotService { diff --git a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/task/RemoteTaskServiceImpl.java b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/task/RemoteTaskServiceImpl.java index 7544efb87..78d6a9fa9 100644 --- a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/task/RemoteTaskServiceImpl.java +++ b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/task/RemoteTaskServiceImpl.java @@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Collections; import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java index 0312e6064..48a3de670 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java @@ -281,7 +281,7 @@ public interface ErrorCodeConstants { ErrorCode ROBOT_ALREADY_RECOVERY = new ErrorCode(1_002_052_003, "车辆已经恢复"); // ========== 远遥设备信息 1_002_053_001 ========== ErrorCode CONTROLLER_INFORMATION_NOT_EXISTS = new ErrorCode(1_002_053_001, "远遥设备信息不存在"); - ErrorCode REMOTE_DEVICE_NOT_SET_UP = new ErrorCode(1_002_053_002, "远遥设备未设置通讯信息"); + ErrorCode REMOTE_DEVICE_NOT_SET_UP = new ErrorCode(1_002_053_002, "远遥设备未选择车辆"); ErrorCode REMOTE_DEVICE_NEED_AUTOMATIC = new ErrorCode(1_002_053_003, "首次进入远遥设置,只能是自动模式"); ErrorCode REMOTE_DEVICE_CONTROLLER = new ErrorCode(1_002_053_004, "目前远遥设备控制的机器人是 "); ErrorCode REMOTE_NOT_HAVE_TASK = new ErrorCode(1_002_053_005, "车辆没有处理中的任务,不能切换成手动模式"); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/remote/RemoteControllerInformationServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/remote/RemoteControllerInformationServiceImpl.java index d21bf4da6..34ad4d1c9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/remote/RemoteControllerInformationServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/remote/RemoteControllerInformationServiceImpl.java @@ -432,6 +432,10 @@ public class RemoteControllerInformationServiceImpl extends ServiceImpl taskDetailActionLog = taskDetailActionLogService.getTaskDetailActionLogByDetailId(data.getId()); @@ -607,10 +612,14 @@ public class RemoteControllerInformationServiceImpl extends ServiceImpl doingTask = informationService.selectDoingTaskByRobotNo(robotNo); - if (ObjectUtil.isEmpty(doingTask)) { + List robotDoingTaskNo = taskDetailService.getRobotDoingTaskNo(robotNo); + if (ObjectUtil.isEmpty(robotDoingTaskNo)) { throw exception(REMOTE_NOT_HAVE_TASK); } + if (ObjectUtil.isNotEmpty(robotDoingTaskNo) && robotDoingTaskNo.size() > 1) { + throw exception(REMOTE_ROBOT_HAVE_MORE_TASK); + } + String operateAction = information.getRemoteIp() + " 切换远遥模式为 " + RemoteModeEnum.getMsg(remoteMode); setRemoteChangeLog(information, robotNo, remoteMode, operateAction); sendRemoteMsgToPP(robotNo, PathPlanningTopicConstant.START_REMOTE_CONTROLLER, RemoteOperationModeEnum.MAN.getType()); @@ -620,8 +629,8 @@ public class RemoteControllerInformationServiceImpl extends ServiceImpl doingTask = informationService.selectDoingTaskByRobotNo(robotNo); - if (ObjectUtil.isNotEmpty(doingTask)) { + List robotDoingTaskNo = taskDetailService.getRobotDoingTaskNo(robotNo); + if (ObjectUtil.isNotEmpty(robotDoingTaskNo)) { throw exception(REMOTE_HAVE_TASK); }