From 491ecec44a2d27823eaf95d439995a8268eaf3a1 Mon Sep 17 00:00:00 2001 From: ruyaxie <648179520@qq.comgit> Date: Sun, 29 Sep 2024 17:30:09 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E5=A2=9E=E6=B7=BB=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E7=9A=84YML?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parse/configure/MqttConsumerConfig.java | 9 ++- .../com/muyu/parse/process/ProcessData.java | 2 +- .../com/muyu/parse/uitl/DataParseUtil.java | 31 +++++----- .../src/main/resources/bootstrap.yml | 59 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 4 +- 5 files changed, 83 insertions(+), 22 deletions(-) create mode 100644 cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml diff --git a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/configure/MqttConsumerConfig.java b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/configure/MqttConsumerConfig.java index cbf14dd..308208f 100644 --- a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/configure/MqttConsumerConfig.java +++ b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/configure/MqttConsumerConfig.java @@ -30,16 +30,15 @@ public class MqttConsumerConfig { String content = "Message from MqttPublishSample"; int qos = 2; String broker = "tcp://123.57.152.124:1883"; - String clientId = "xyr1"; + String clientId = "xyr123456789"; @PostConstruct - public String connect() { - final String vin= ""; + public void connect() { try { MqttClient sampleClient = new MqttClient(broker, clientId, new MemoryPersistence()); MqttConnectOptions connOpts = new MqttConnectOptions(); //是否清空session - connOpts.setCleanSession(true); + connOpts.setCleanSession(false); System.out.println("Connecting to broker: " + broker); //连接 sampleClient.connect(connOpts); @@ -75,6 +74,6 @@ public class MqttConsumerConfig { me.printStackTrace(); } - return vin; + } } diff --git a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java index 5acfcf2..bf12597 100644 --- a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java +++ b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java @@ -31,7 +31,7 @@ public class ProcessData { public static JSONObject DataConversion(String jsonVin ) { String vin = DataParseUtil.dataParsing(jsonVin); - + System.out.println("车辆转换的vin是："+vin); Result byTemplateId = remoteMessageValueService.findByTemplateId(vin); Long templateId = byTemplateId.getData(); diff --git a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/uitl/DataParseUtil.java b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/uitl/DataParseUtil.java index a7c5402..1c0bbc4 100644 --- a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/uitl/DataParseUtil.java +++ b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/uitl/DataParseUtil.java @@ -1,32 +1,35 @@ package com.muyu.parse.uitl; +import lombok.extern.log4j.Log4j2; + /** * @version 1.0 * @Author xie ya ru * @Date 2024/9/28 16:48 * @注释 */ - +@Log4j2 public class DataParseUtil { - public static final Integer STARTPOSITION = 0; + public static final Integer STARTPOSITION = 1; public static final Integer ENDPOSITION = 18; public static final Integer INDEX = 16; public static String dataParsing(String jsonVin){ - jsonVin = jsonVin.substring(STARTPOSITION,ENDPOSITION); - StringBuilder asciiString = new StringBuilder(); - String[] split = jsonVin.split(" "); - for (int i = 0; i < split.length; i++) { - //十六进制转换为十进制 - int decimal = Integer.parseInt(split[i],INDEX); - //将十进制整数转换为字符 - char character =(char)decimal; - //添加字符到ASCII 字符串 - asciiString.append(character); + + //根据空格切割数据 + String[] hexArray = jsonVin.split(" "); + StringBuilder result = new StringBuilder(); + //遍历十六进制数据转换为字符 + for (String hex : hexArray) { + int decimal = Integer.parseInt(hex, INDEX); + result.append((char) decimal); } - System.out.println(asciiString.toString()); - return asciiString.toString(); + //取出车辆VIN码 + String vehicleVin = result.substring(STARTPOSITION, ENDPOSITION); + log.info("车辆VIN码: " + vehicleVin); + return vehicleVin; + } } diff --git a/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..6de1934 --- /dev/null +++ b/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml @@ -0,0 +1,59 @@ +# Tomcat +server: + port: 9705 + +# nacos线上地址 +nacos: + addr: 123.57.152.124:8848 + user-name: nacos + password: nacos + namespace: xyr +# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all +# Spring +spring: + amqp: + deserialization: + trust: + all: true + main: + allow-bean-definition-overriding: true + application: + # 应用名称 + name: cloud-parse + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + config: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# # xxl-job 配置文件 +# - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-vehicleGateway/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-vehicleGateway/src/main/resources/bootstrap.yml index 08feddf..32764e5 100644 --- a/cloud-modules/cloud-modules-vehicleGateway/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-vehicleGateway/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat -server: - port: 9703 +#server: +# port: 9703 # nacos线上地址 nacos: -- 2.40.1