From cddc7ed7269bf01e71085dc9274ec459b7f5e573 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Thu, 28 Dec 2023 14:15:03 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E5=A2=9E=E5=8A=A0=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=EF=BC=8C=E4=B8=8B=E8=BD=BD=E7=A0=81?= =?UTF-8?q?=EF=BC=9B=20fix:=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=AF=86=E7=A0=81=E4=BA=8C=E6=AC=A1=E5=8A=A0=E5=AF=86?= =?UTF-8?q?bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/agv/rest/DeveloperController.java | 13 +++++++ .../org/nl/agv/service/DevelopService.java | 9 +++++ .../agv/service/impl/DevelopServiceImpl.java | 36 +++++++++++++++++++ .../user/impl/ISysUserServiceImpl.java | 2 +- .../main/resources/config/application-dev.yml | 2 +- .../src/main/resources/config/application.yml | 2 +- 6 files changed, 61 insertions(+), 3 deletions(-) diff --git a/nladmin-system/src/main/java/org/nl/agv/rest/DeveloperController.java b/nladmin-system/src/main/java/org/nl/agv/rest/DeveloperController.java index 3ebb9b3..3381d09 100644 --- a/nladmin-system/src/main/java/org/nl/agv/rest/DeveloperController.java +++ b/nladmin-system/src/main/java/org/nl/agv/rest/DeveloperController.java @@ -38,6 +38,16 @@ public class DeveloperController { public ResponseEntity getIP(@RequestBody Map whereJson) { return new ResponseEntity<>(developService.getIP(whereJson), HttpStatus.OK); } + + + @PostMapping("/queryRemoteInfo") + @Log("远程支持查询远程码") + @ApiOperation("远程支持查询远程码") + public ResponseEntity queryRemoteInfo() { + return new ResponseEntity<>(developService.queryRemoteInfo(), HttpStatus.OK); + } + + @PostMapping("/getLogList") @Log("开发者选项查询日志列表") @ApiOperation("开发者选项查询日志列表") @@ -45,6 +55,7 @@ public class DeveloperController { public ResponseEntity getLogList(@RequestBody Map whereJson) { return new ResponseEntity<>(developService.getLogList(whereJson), HttpStatus.OK); } + @PostMapping("/getROSNodeList") @Log("开发者选项查询ros请求列表") @ApiOperation("开发者选项查询ros请求列表") @@ -76,6 +87,7 @@ public class DeveloperController { public ResponseEntity parameterSetting(@RequestBody Map whereJson) { return new ResponseEntity<>(developService.parameterSetting(whereJson), HttpStatus.OK); } + @PostMapping("/queryPassword") @Log("查询密码") @ApiOperation("查询密码") @@ -83,6 +95,7 @@ public class DeveloperController { public ResponseEntity queryPassword(@RequestBody Map whereJson) { return new ResponseEntity<>(developService.queryPassword(whereJson), HttpStatus.OK); } + @PostMapping("/softwareVersion") @Log("查询软硬件版本") @ApiOperation("查询软硬件版本") diff --git a/nladmin-system/src/main/java/org/nl/agv/service/DevelopService.java b/nladmin-system/src/main/java/org/nl/agv/service/DevelopService.java index c46756c..2c7a98a 100644 --- a/nladmin-system/src/main/java/org/nl/agv/service/DevelopService.java +++ b/nladmin-system/src/main/java/org/nl/agv/service/DevelopService.java @@ -11,6 +11,7 @@ import java.util.Map; * @date 2021-09-02 **/ public interface DevelopService { + /** * 开发者选项查询Ifconfig参数 * @@ -18,6 +19,14 @@ public interface DevelopService { * @return Map */ Map getIP(Map jsonObject); + + /** + * 远程支持查询远程码 + * + * @param + * @return Map + */ + Map queryRemoteInfo(); /** * 开发者选项查询日志列表 * 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 f9ae622..1db6e03 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 @@ -19,15 +19,19 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import edu.wpi.rail.jrosbridge.services.ServiceResponse; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.nl.agv.service.DevelopService; import org.nl.agv.unit.sendToAgvUtil; import org.nl.common.utils.LangUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.springframework.stereotype.Service; + import java.math.BigDecimal; import java.util.Iterator; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @author zhanghouying @@ -50,6 +54,38 @@ public class DevelopServiceImpl implements DevelopService { return returnjo; } + @Override + public Map queryRemoteInfo() { + JSONObject returnjo = new JSONObject(); + String anyDeskId = ""; + 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); + // 查找匹配项 + if (matcher.find()) { + anyDeskId = matcher.group(1); + teamViewerId = matcher.group(2); + } + } + JSONObject result = new JSONObject(); + result.put("teamViewerId", teamViewerId); + result.put("anyDeskId", anyDeskId); + returnjo.put("code", "1"); + returnjo.put("desc", LangUtils.getMsgLanguage("QuerySuccess", null)); + returnjo.put("result", result); + returnjo.put("serviceResponse", serviceResponse); + returnjo.put("rosStringOutput", rosStringOutput); + return returnjo; + } + @Override public Map getLogList(Map jsonObject) { JSONObject returnjo = new JSONObject(); diff --git a/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java index 585f2db..7b32af4 100644 --- a/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java @@ -101,7 +101,7 @@ public class ISysUserServiceImpl extends ServiceImpl impl sysUser.setPassword(SaSecureUtil.md5BySalt("123456", "salt")); } else{ - sysUser.setPassword(SaSecureUtil.md5BySalt(sysUser.getPassword(), "salt")); + sysUser.setPassword(SaSecureUtil.md5BySalt(RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,sysUser.getPassword()), "salt")); } String userId = IdUtil.getStringId(); sysUser.setUserId(userId); diff --git a/nladmin-system/src/main/resources/config/application-dev.yml b/nladmin-system/src/main/resources/config/application-dev.yml index f87cf3a..9e35d3a 100644 --- a/nladmin-system/src/main/resources/config/application-dev.yml +++ b/nladmin-system/src/main/resources/config/application-dev.yml @@ -6,7 +6,7 @@ spring: #url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:nl_apt}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true #nl_agv 192.168.137.41 nl_apt #url: jdbc:mysql://${DB_HOST:192.168.137.41}:${DB_PORT:3306}/${DB_NAME:nl_agv} - url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:nl_agv} + url: jdbc:mysql://${DB_HOST:47.98.105.245}:${DB_PORT:3306}/${DB_NAME:nl_agv} username: ${DB_USER:generallu} password: ${DB_PWD:123456} driver-class-name: com.mysql.cj.jdbc.Driver # 指定 MySQL 驱动 diff --git a/nladmin-system/src/main/resources/config/application.yml b/nladmin-system/src/main/resources/config/application.yml index bc43869..2812a7f 100644 --- a/nladmin-system/src/main/resources/config/application.yml +++ b/nladmin-system/src/main/resources/config/application.yml @@ -4,7 +4,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: