From 0c6e652c89d5dcc1af9f8a6bfee0007adf7fda93 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Thu, 28 Dec 2023 14:37:18 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E6=94=B9=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E7=A0=81=E6=95=B0=E5=80=BC=E6=8F=90=E5=8F=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/service/impl/DevelopServiceImpl.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nladmin-system/src/main/java/org/nl/agv/service/impl/DevelopServiceImpl.java b/nladmin-system/src/main/java/org/nl/agv/service/impl/DevelopServiceImpl.java index 1db6e03..8ac1036 100644 --- a/nladmin-system/src/main/java/org/nl/agv/service/impl/DevelopServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/agv/service/impl/DevelopServiceImpl.java @@ -61,18 +61,18 @@ public class DevelopServiceImpl implements DevelopService { String teamViewerId = ""; String serviceResponse = ""; String rosStringOutput = ""; - // ServiceResponse response = sendToAgvUtil.send("HMISettingGetRemoteID"); - // serviceResponse = response.toString(); - // rosStringOutput = JSONObject.parseObject(response.toString()).getString("ROS_String_Output"); - String resultInfo = "GetRemotelD:1514937762 [1m TeamViewer ID:[Om 1469530530"; - if (StringUtils.isNotBlank(resultInfo)) { - String regex = "GetRemotelD:(\\d+) \\[1m TeamViewer ID:\\[Om (\\d+)"; - Pattern pattern = Pattern.compile(regex); - Matcher matcher = pattern.matcher(resultInfo); - // 查找匹配项 + ServiceResponse response = sendToAgvUtil.send("HMISettingGetRemoteID"); + serviceResponse = response.toString(); + rosStringOutput = JSONObject.parseObject(response.toString()).getString("ROS_String_Output"); + String resultInfo = "GetRemotelD:1514937762 [212m TeamViewer ID:[321m 1469530530"; + if (StringUtils.isNotBlank(rosStringOutput)) { + Pattern pattern = Pattern.compile("\\b(?!\\d+m)\\d+\\b"); + Matcher matcher = pattern.matcher(rosStringOutput); if (matcher.find()) { - anyDeskId = matcher.group(1); - teamViewerId = matcher.group(2); + anyDeskId = matcher.group(0); + if (matcher.find()) { + teamViewerId = matcher.group(0); + } } } JSONObject result = new JSONObject();