From 04450b84e63a420f9e98dfb05f7104d0e475e1ec Mon Sep 17 00:00:00 2001 From: ruyaxie <648179520@qq.comgit> Date: Mon, 7 Oct 2024 15:43:26 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=8F=90=E5=8F=96=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=9C=A8=E6=9C=80=E5=A4=A7=E7=9A=84pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/common/cache/CacheAbsBasic.java | 2 +- .../muyu/data/domain/EnterpriseCommon.java | 4 +++ .../cloud-modules-data-process-server/pom.xml | 1 - .../enterpise-service/pom.xml | 1 - cloud-modules/cloud-modules-parse/pom.xml | 4 --- .../parse/configure/MqttConsumerConfig.java | 6 +++- .../com/muyu/parse/process/ProcessData.java | 14 +++++---- pom.xml | 29 +++++++++++++++---- 8 files changed, 42 insertions(+), 19 deletions(-) diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java index 8d1b16d..a0513c9 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java @@ -22,7 +22,7 @@ public abstract class CacheAbsBasic implements CacheBasic{ public void put(K key, V value) { try { - redisService.setCacheObject(encode(key), value,30L,TimeUnit.MINUTES); + redisService.setCacheObject(encode(key), value); } catch (Exception e) { throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); } diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/domain/EnterpriseCommon.java b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/domain/EnterpriseCommon.java index bc2356f..dc82f0d 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/domain/EnterpriseCommon.java +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/domain/EnterpriseCommon.java @@ -42,4 +42,8 @@ public class EnterpriseCommon { */ private List fenceAndGroupMiddles; + /** + * 故障信息和车辆 + */ + } diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml index eecc8d0..31e8aba 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml @@ -86,7 +86,6 @@ com.muyu enterprise-cache - ${muyu.version} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml index 4e5d20d..478410a 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml @@ -96,7 +96,6 @@ com.muyu enterprise-cache - ${muyu.version} diff --git a/cloud-modules/cloud-modules-parse/pom.xml b/cloud-modules/cloud-modules-parse/pom.xml index 91a2e59..1875823 100644 --- a/cloud-modules/cloud-modules-parse/pom.xml +++ b/cloud-modules/cloud-modules-parse/pom.xml @@ -93,26 +93,22 @@ com.muyu enterpise-remote - ${muyu.version} com.muyu enterpise-common - ${muyu.version} com.muyu enterprise-cache - ${muyu.version} com.muyu cloud-common-kafka - ${muyu.version} 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 0d7c8f0..dba66d3 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 @@ -10,6 +10,7 @@ import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; +import javax.annotation.Resource; /** * @version 1.0 @@ -32,6 +33,9 @@ public class MqttConsumerConfig { String broker = "tcp://123.57.152.124:1883"; String clientId = "xyr123456789"; + @Resource + private ProcessData processData; + @PostConstruct public void connect() { try { @@ -55,7 +59,7 @@ public class MqttConsumerConfig { public void messageArrived(String s, MqttMessage mqttMessage) throws Exception { String s1 = new String(mqttMessage.getPayload()); System.out.println("接收到的主题是:" + s + "内容是:{}" + s1); - ProcessData.DataConversion(s1); + processData.DataConversion(s1); } 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 a953693..fcab72c 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 @@ -14,6 +14,7 @@ import lombok.extern.log4j.Log4j2; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.RecordMetadata; +import org.springframework.context.annotation.Configuration; import javax.annotation.Resource; import java.util.List; @@ -26,28 +27,29 @@ import java.util.List; * @注释 */ @Log4j2 +@Configuration public class ProcessData { //报文模版信息 @Resource - private static MessageValueCacheService messageValueCacheService; + private MessageValueCacheService messageValueCacheService; //车辆信息 @Resource - private static SysCarCacheService sysCarCacheService; + private SysCarCacheService sysCarCacheService; //车辆类型信息 @Resource - private static SysCarTypeCacheService sysCarTypeCacheService; + private SysCarTypeCacheService sysCarTypeCacheService; @Resource - private static KafkaProducerConfig kafkaProducerConfig; + private KafkaProducerConfig kafkaProducerConfig; private final static String topic = "sysCar_vin_topic"; - public static void DataConversion(String jsonVin ) { + public void DataConversion(String jsonVin ) { //设置数组存储车辆数据 JSONObject jsonObject = new JSONObject(); String vin = DataParseUtil.dataParsing(jsonVin); @@ -80,7 +82,7 @@ public class ProcessData { - private static void sendKafkaMessage(JSONObject jsonObject){ + private void sendKafkaMessage(JSONObject jsonObject){ ProducerRecord producerRecord = new ProducerRecord<>(topic, jsonObject); try { kafkaProducerConfig.kafkaProducer().send(new ProducerRecord<>(topic,jsonObject.toString())); diff --git a/pom.xml b/pom.xml index 144c170..3c394df 100644 --- a/pom.xml +++ b/pom.xml @@ -277,11 +277,30 @@ ${muyu.version} - - - - - + + com.muyu + enterpise-remote + ${muyu.version} + + + + com.muyu + enterpise-common + ${muyu.version} + + + + com.muyu + enterprise-cache + ${muyu.version} + + + + + com.muyu + cloud-common-kafka + ${muyu.version} + com.muyu