From 7c508ceae328470856486227990cbdca70a5f19a Mon Sep 17 00:00:00 2001 From: cbs <18617195505@163.com> Date: Mon, 12 May 2025 14:56:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E9=81=A5=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/web/core/handler/GlobalExceptionHandler.java | 1 + .../yudao/module/remote/service/login/LoginServiceImpl.java | 2 +- .../module/system/api/remote/dto/RemoteRobotStatusDTO.java | 2 +- .../module/system/controller/admin/auth/vo/AuthLoginReqVO.java | 2 +- .../yudao/module/system/service/auth/AdminAuthServiceImpl.java | 2 +- .../service/remote/RemoteControllerInformationServiceImpl.java | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java index 63ef69ebf..e4062bbc0 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java +++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java @@ -251,6 +251,7 @@ public class GlobalExceptionHandler { for (StackTraceElement stackTrace : stackTraces) { if (ObjUtil.notEqual(stackTrace.getClassName(), ServiceExceptionUtil.class.getName())) { log.warn("[serviceExceptionHandler]\n\t{}", stackTrace); + log.warn("异常信息 :{}",ex.getMessage()); break; } } diff --git a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/login/LoginServiceImpl.java b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/login/LoginServiceImpl.java index b3d148436..4e62fb171 100644 --- a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/login/LoginServiceImpl.java +++ b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/login/LoginServiceImpl.java @@ -37,7 +37,7 @@ public class LoginServiceImpl implements LoginService { @Override public Boolean checkCommunication(LoginCheckDTO loginCheckDTO) { HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(); - factory.setConnectTimeout(5 * 1000); + factory.setConnectTimeout(2 * 1000); RestTemplate restTemplate = new RestTemplate(factory); String url = "http://" + loginCheckDTO.getSystemIp() + ":" + loginCheckDTO.getSystemPort() + checkUrl; LinkedMultiValueMap headers = new LinkedMultiValueMap<>(); diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/remote/dto/RemoteRobotStatusDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/remote/dto/RemoteRobotStatusDTO.java index 3b153051f..ede959e80 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/remote/dto/RemoteRobotStatusDTO.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/remote/dto/RemoteRobotStatusDTO.java @@ -18,7 +18,7 @@ public class RemoteRobotStatusDTO { private Integer remoteMode = 0; @Schema(description = "协控(0:关闭协控, 1:开启协控, 2:不显示协控)") - private Integer collaborativeControl = 0; + private Integer collaborativeControl = 2; @Schema(description = "车辆任务状态(3：待命 , 其他都是任务中)") private Integer robotStatus = 2; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java index a0d097aaf..26ba0c8fd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java @@ -52,7 +52,7 @@ public class AuthLoginReqVO { private String socialState; @Schema(description = "登录来源地址, 远遥传: remote") - private String clientId; + private String clientid; /** * 开启验证码的 Group diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java index 5d8f8fc33..817ff95d8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java @@ -106,7 +106,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState())); } - String clientId = ObjectUtil.isNotEmpty(reqVO.getClientId()) ? reqVO.getClientId() : OAuth2ClientConstants.CLIENT_ID_DEFAULT; + String clientId = ObjectUtil.isNotEmpty(reqVO.getClientid()) ? reqVO.getClientid() : OAuth2ClientConstants.CLIENT_ID_DEFAULT; // 创建 Token 令牌，记录登录日志 return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME, clientId); 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 ad12d4d16..62765f583 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 @@ -492,7 +492,7 @@ public class RemoteControllerInformationServiceImpl extends ServiceImpl robotDoingTaskNo = taskDetailService.getRobotDoingTaskNo(oldRobotNo); + List robotDoingTaskNo = taskDetailService.getRobotDoingTaskNo(information.getRobotNo()); if (ObjectUtil.isNotEmpty(robotDoingTaskNo)) { throw exception(REMOTE_ROBOT_HAVE_TASK); }