Merge remote-tracking branch 'origin/dev' into dev

cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/bean/CaffeineManager.java

@@ -3,16 +3,14 @@ package com.muyu.common.caffeine.bean;
 
 import com.muyu.common.caffeine.enums.CacheNameEnums;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.caffeine.CaffeineCache;
 import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 
@@ -26,7 +24,7 @@ import java.util.List;
  */
 
 @Slf4j
-@Component
+@Configuration
 public class CaffeineManager {
 
     /**
@@ -34,7 +32,7 @@ public class CaffeineManager {
      * @return  缓存管理器实例
      */
     @Bean
-    public SimpleCacheManager simpleCacheManager() {
+    public CacheManager cacheManager() {
         SimpleCacheManager cacheManager = new SimpleCacheManager();
         List<String> cacheNames = CacheNameEnums.getCodes();
         cacheManager.setCaches(cacheNames.stream()

cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/utils/CaffeineCacheUtils.java

@@ -1,97 +0,0 @@
-package com.muyu.common.caffeine.utils;
-
-
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.muyu.common.caffeine.constents.CaffeineContent;
-import com.muyu.common.caffeine.enums.CacheNameEnums;
-import com.muyu.common.redis.service.RedisService;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.caffeine.CaffeineCache;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Caffeine缓存工具
- * @Author: 胡杨
- * @Name: CaffeineUtils
- * @Description: 缓存工具类
- * @CreatedDate: 2024/9/26 下午2:53
- * @FilePath: com.muyu.common.caffeine
- */
-@Slf4j
-@Component
-public class CaffeineCacheUtils {
-    @Resource
-    private CacheManager cacheManager;
-    @Resource
-    private RedisTemplate<String, String> redisTemplate;
-
-
-    /**
-     * 车辆上线 - 新增缓存
-     */
-    public void addCarCache(String vin) {
-        // 从Redis中获取缓存信息
-        for (String name : CacheNameEnums.getCodes()) {
-            String value = redisTemplate.opsForValue().get(name+":"+vin);
-            cacheManager.getCache(name).put(vin, value);
-            log.info("存储缓存, 缓存分区:[{}], 车辆编码:[{}], 存储值:[{}]", name, vin, value);
-        }
-        log.info("车辆编码:{},本地缓存完成...",vin);
-    }
-
-    /**
-     * 车辆下线 - 删除缓存
-     */
-    public void deleteCarCache(String cacheName) {
-        if (!hasCarVinCache(cacheName,null)) {
-            log.warn("车辆编码:{},本地缓存不存在该车辆信息...", cacheName);
-            return;
-        }
-        cacheManager.getCache(cacheName).invalidate();
-        log.info("车辆编码:{},本地缓存删除完成...", cacheName);
-    }
-
-    /**
-     * 获取车辆信息缓存
-     */
-    public Object getCarCache(String cacheName, String key) {
-        if (!hasCarVinCache(cacheName, key)){
-            log.warn("车辆编码:{},本地缓存不存在该车辆信息...",cacheName);
-            return null;
-        }
-        return cacheManager.getCache(cacheName).get(key).get();
-    }
-
-    /**
-     * 获取车辆信息缓存
-     */
-    public <T> T getCarCache(String cacheName, String key, Class<T> type) {
-        if (!hasCarVinCache(cacheName,key)){
-            log.warn("车辆编码:{},本地缓存不存在该车辆信息...",cacheName);
-            return null;
-        }
-        return cacheManager.getCache(cacheName).get(key, type);
-    }
-
-    /**
-     * 判断缓存存在与否
-     */
-    public Boolean hasCarVinCache(String cacheName,String key) {
-        boolean notEmpty = ObjectUtils.isNotEmpty(cacheManager.getCache(cacheName));
-        if (notEmpty && StringUtils.isNotEmpty(key)){
-            return ObjectUtils.isNotEmpty(cacheManager.getCache(cacheName).get(key).get());
-        }
-        return notEmpty;
-
-    }
-
-}

cloud-common/cloud-common-caffeine/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1 @@
-com.muyu.common.caffeine.utils.CaffeineCacheUtils
 com.muyu.common.caffeine.bean.CaffeineManager

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java

@@ -21,6 +21,8 @@ public class ServiceNameConstants {
      */
     public static final String FILE_SERVICE = "cloud-file";
 
+    public static final String CAR_SERVICE = "cloud-car";
+
     /**
      * 智能车联服务
      */

cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/service/Impl/CarOneClickOperationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.muyu.cargateway.service.Impl;
 
+import com.muyu.cargateway.config.RabbitmqConfig;
 import com.muyu.cargateway.domain.VehicleConnection;
 import com.muyu.cargateway.domain.VinIp;
 import com.muyu.cargateway.domain.model.MqttServerModel;
@@ -44,7 +45,7 @@ public class CarOneClickOperationServiceImpl implements CarOneClickOperationServ
         log.info("车辆连接请求:{}",vehicleConnectionReq.toString());
 
         // 使用交换机发送消息
-        rabbitTemplate.convertAndSend("exchange_topics_inform","inform.#.email.#",vehicleConnectionReq.getVehicleVin());
+        rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM,RabbitmqConfig.ROUTINGKEY_EMAIL,vehicleConnectionReq.getVehicleVin());
         log.info("发送消息成功:{}",vehicleConnectionReq.getVehicleVin());
 
 

cloud-modules/cloud-modules-car-gateway/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 47.116.173.119:8848
   user-name: nacos
   password: nacos
-  namespace: one
+  namespace: oneone
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:

cloud-modules/cloud-modules-data-processing/pom.xml

@@ -90,51 +90,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-datasource</artifactId>
         </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>org.apache.iotdb</groupId>-->
-<!--            <artifactId>iotdb-jdbc</artifactId>-->
-<!--            <version>0.12.1</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>druid-spring-boot-starter</artifactId>-->
-<!--            <version>1.2.20</version>-->
-<!--        </dependency>-->
-
-
-<!--        <dependency>-->
-<!--            <groupId>org.mybatis</groupId>-->
-<!--            <artifactId>mybatis-spring</artifactId>-->
-<!--            <version>3.0.3</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
-<!--            <version>3.5.5</version>-->
-<!--        </dependency>-->
-
-<!--&lt;!&ndash;        <dependency>&ndash;&gt;-->
-<!--&lt;!&ndash;            <groupId>org.apache.iotdb</groupId>&ndash;&gt;-->
-<!--&lt;!&ndash;            <artifactId>iotdb-session</artifactId>&ndash;&gt;-->
-<!--&lt;!&ndash;            <version>1.3.2</version>&ndash;&gt;-->
-<!--&lt;!&ndash;        </dependency>&ndash;&gt;-->
-
-<!--        &lt;!&ndash; Druid &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>druid-spring-boot-3-starter</artifactId>-->
-<!--            <version>${druid.version}</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash; Dynamic DataSource &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>-->
-<!--            <version>${dynamic-ds.version}</version>-->
-<!--        </dependency>-->
-
-
     </dependencies>
 
     <build>

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/CloudVehicleEventApplication.java

@@ -5,6 +5,7 @@ import com.muyu.common.security.annotation.EnableMyFeignClients;
 import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * 数据处理模块启动器
@@ -17,7 +18,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableRabbit
 @EnableCustomConfig
 @EnableMyFeignClients
-@SpringBootApplication(scanBasePackages = {"com.muyu"})
+@ComponentScan(basePackages = {"com.muyu"})
+@SpringBootApplication
 public class CloudVehicleEventApplication {
     public static void main(String[] args) {
         SpringApplication.run(CloudVehicleEventApplication.class, args);

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/config/RabbitmqConfig.java

@@ -0,0 +1,100 @@
+package com.muyu.data.processing.config;
+
+import lombok.extern.log4j.Log4j2;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.core.*;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Lenovo
+ * @ Tool：IntelliJ IDEA
+ * @ Author：CHX
+ * @ Date：2024-10-04-15:13
+ * @ Version：1.0
+ * @ Description：rabbitmq配置类
+ */
+@Log4j2
+@Configuration
+public class RabbitmqConfig {
+    // 日志
+    private static final Logger logger = LoggerFactory.getLogger(RabbitmqConfig.class);
+
+    /**
+     * 队列
+     */
+    public static final String QUEUE_INFORM_EMAIL = "queue_inform_email";
+    /**
+     * 队列
+     */
+    public static final String QUEUE_INFORM_SMS = "queue_inform_sms";
+    /**
+     * 交换机
+     */
+    public static final String EXCHANGE_TOPICS_INFORM = "exchange_topics_inform";
+    /**
+     * 路由key
+     */
+    public static final String ROUTINGKEY_EMAIL = "inform.#.email.#";
+    /**
+     * 路由key
+     */
+    public static final String ROUTINGKEY_SMS = "inform.#.sms.#";
+
+    /**
+     * 声明交换机,做持久化
+     */
+    @Bean(EXCHANGE_TOPICS_INFORM)
+    public Exchange exchangeTopicsInform() {
+        try {
+            Exchange exchange = ExchangeBuilder.topicExchange(EXCHANGE_TOPICS_INFORM).durable(true).build();
+            log.info("创建的交换机为: {}", EXCHANGE_TOPICS_INFORM);
+            return exchange;
+        } catch (Exception e) {
+            log.error("创建该: {} 交换机失败", EXCHANGE_TOPICS_INFORM, e);
+            throw e;
+        }
+    }
+
+    // 声明QUEUE_INFORM_EMAIL队列
+    @Bean(QUEUE_INFORM_EMAIL)
+    public Queue queueInformEmail() {
+        try {
+            Queue queue = new Queue(QUEUE_INFORM_EMAIL);
+            log.info("创建的队列为: {}", QUEUE_INFORM_EMAIL);
+            return queue;
+        } catch (Exception e) {
+            log.error("创建该: {} 队列失败", QUEUE_INFORM_EMAIL, e);
+            throw e;
+        }
+    }
+
+    // 声明QUEUE_INFORM_SMS队列
+    @Bean(QUEUE_INFORM_SMS)
+    public Queue queueInformSms() {
+        try {
+            Queue queue = new Queue(QUEUE_INFORM_SMS);
+            log.info("创建的队列为: {}", QUEUE_INFORM_SMS);
+            return queue;
+        } catch (Exception e) {
+            log.error("创建该: {} 队列失败", QUEUE_INFORM_SMS, e);
+            throw e;
+        }
+    }
+
+    //ROUTINGKEY_EMAIL队列绑定交换机，指定routingKey
+    @Bean
+    public Binding bindingQueueInformEmail(@Qualifier(QUEUE_INFORM_EMAIL) Queue queue,
+                                           @Qualifier(EXCHANGE_TOPICS_INFORM) Exchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(ROUTINGKEY_EMAIL).noargs();
+    }
+
+    //ROUTINGKEY_SMS队列绑定交换机，指定routingKey
+    @Bean
+    public Binding bindingRoutingKeySms(@Qualifier(QUEUE_INFORM_SMS) Queue queue,
+                                        @Qualifier(EXCHANGE_TOPICS_INFORM) Exchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(ROUTINGKEY_SMS).noargs();
+    }
+}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/controller/DataProcessingController.java

@@ -1,20 +1,15 @@
 package com.muyu.data.processing.controller;
 
-import com.muyu.common.core.domain.Result;
+import com.muyu.data.processing.config.RabbitmqConfig;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.data.processing.domain.BasicData;
-import com.muyu.data.processing.domain.IotDbData;
 import com.muyu.data.processing.service.DataProcessingService;
 
 import javax.annotation.Resource;
 
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.web.bind.annotation.*;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
 /**
  * 数据处理控制层
  *
@@ -31,70 +26,12 @@ import java.util.List;
 public class DataProcessingController {
     @Resource
     private DataProcessingService service;
+    @Resource
+    private RabbitTemplate rabbitTemplate;
 
-    /**
+    @GetMapping("/goOnline")
-     * 查看数据库有多少组
+    public void goOnline(@RequestParam("vin") String vin) {
-     *
+        rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.email", vin);
-     * @return
+        log.info("发送消息成功:{}",vin);
-     */
-    @GetMapping("/selectStorageGroup")
-    public Result selectStorageGroup() {
-        List<String> v = service.selectStorageGroup();if (v.size() > 0) {v.forEach(x -> {
-            System.out.println("group------------------" + x.toString());
-        });
-            return Result.success(v);
-        } else {
-            return Result.error(false);
     }
 }
-
-    @GetMapping("/selectCarData")
-    public Result selectCarData(@RequestParam("vin") String vin) {
-//        String firmCode = SecurityUtils.getSaasKey();
-        String firmCode = "firm01";
-        return Result.success(service.selectCarData(firmCode,vin));
-    }
-
-    @PostMapping("/addCarData")
-    public Result addCarData(@RequestBody IotDbData data) {
-        HashMap<String, BasicData> hashMap = new HashMap<>();
-        hashMap.put("timestamp", BasicData
-                .builder()
-                .key("timestamp")
-                .label("时间戳")
-                .value(String.valueOf(data.getTimestamp()))
-                .type("string")
-                .build());
-        hashMap.put("vin", BasicData
-                .builder()
-                .key("vin")
-                .label("VIN码")
-                .value(data.getVin())
-                .type("string")
-                .build());
-        hashMap.put("latitude", BasicData
-                .builder()
-                .key("latitude")
-                .label("纬度")
-                .value(data.getLatitude())
-                .type("long")
-                .build());
-        hashMap.put("longitude", BasicData
-                .builder()
-                .key("longitude")
-                .label("经度")
-                .value(data.getLongitude())
-                .type("long")
-                .build());
-        hashMap.put("firmCode", BasicData
-                .builder()
-                .key("firmCode")
-                .label("企业编码")
-                .value("firm01")
-                .type("string")
-                .build());
-        return Result.success(service.addCarData(hashMap));
-    }
-
-
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/controller/TestController.java

@@ -1,165 +0,0 @@
-package com.muyu.data.processing.controller;
-
-
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.muyu.common.caffeine.enums.CacheNameEnums;
-import com.muyu.common.core.utils.uuid.UUID;
-import com.muyu.common.iotdb.config.IotDBSessionConfig;
-import com.muyu.common.kafka.constants.KafkaConstants;
-import com.muyu.common.rabbit.constants.RabbitConstants;
-import jakarta.annotation.Resource;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.cache.Cache;
-import org.springframework.cache.caffeine.CaffeineCache;
-import org.springframework.cache.support.SimpleCacheManager;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.*;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.ArrayList;
-
-/**
- * 测试控制层
- * @Author: 胡杨
- * @Name: Test
- * @Description:
- * @CreatedDate: 2024/9/27 上午10:54
- * @FilePath: com.muyu.data.processing.controller
- */
-@Slf4j
-@RestController
-@RequestMapping("/Test")
-public class TestController {
-    @Resource
-    private KafkaProducer<String,String> kafkaProducer;
-    @Resource
-    private RabbitTemplate rabbitTemplate;
-    @Resource
-    private IotDBSessionConfig iotDBSessionConfig;
-    @Resource
-    private RedisTemplate<String,String> redisTemplate;
-//    @Resource
-//    private CaffeineCacheUtils cacheUtils;
-
-    @Resource
-    private SimpleCacheManager cacheManager;
-
-    @GetMapping("/testKafka")
-    public void sendMsg() {
-        try {
-            // 测试数据
-            String jsonString = """
-                    [{
-                        "key": "vin",
-                        "label": "VIN码",
-                        "type": "String",
-                        "value": "vin999999"
-                    },{
-                        "key": "timestamp",
-                        "label": "时间戳",
-                        "type": "long",
-                        "value": "1727534036893"
-                    },{
-                        "key": "latitude",
-                        "label": "纬度",
-                        "type": "int",
-                        "value": "66.898"
-                    },{
-                        "key": "longitude",
-                        "label": "经度",
-                        "type": "int",
-                        "value": "99.12"
-                    }]""";
-            ProducerRecord<String, String> producerRecord = new ProducerRecord<>(KafkaConstants.KafkaTopic, jsonString);
-            kafkaProducer.send(producerRecord);
-            System.out.println("同步消息发送成功: " + jsonString);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.out.println("同步消息发送失败");
-        }
-    }
-
-    @GetMapping("/testRabbit/GoOnline")
-    public void testRabbitGoOnline(@RequestParam("msg") String msg) {
-        rabbitTemplate.convertAndSend(RabbitConstants.GO_ONLINE_QUEUE, msg, message -> {
-            message.getMessageProperties().setMessageId(UUID.randomUUID().toString().replace("-",""));
-            return message;
-        });
-    }
-
-    @GetMapping("/testRabbit/Downline")
-    public void testRabbitDownline(@RequestParam("msg") String msg) {
-        rabbitTemplate.convertAndSend(RabbitConstants.DOWNLINE_QUEUE, msg, message -> {
-            message.getMessageProperties().setMessageId(UUID.randomUUID().toString().replace("-",""));
-            return message;
-        });
-    }
-
-    @GetMapping("/insertData")
-    public void insertData(@RequestParam("deviceId") String deviceId, @RequestParam("time") long time, @RequestParam("value") double value) throws Exception {
-        String sql = String.format("insert into root.one.%s(timestamp, temperature) values (%d, %f)", deviceId, time, value);
-        iotDBSessionConfig.getSessionPool().executeNonQueryStatement(sql);
-    }
-
-    @GetMapping("/testSetRedis")
-    public void testSetRedis(@RequestParam("key") String key,@RequestParam("value") String value) {
-        redisTemplate.opsForValue().set(key,value);
-    }
-
-    @GetMapping("/testGetCache")
-    public void testGetCache(@RequestParam("cacheName") String cacheName,@RequestParam("key") String key) {
-        Cache cache = cacheManager.getCache(cacheName);
-        if (cache != null) {
-            String v = cache.get(key,String.class);
-            log.info("缓存值为: {}",v);
-        }else {
-            log.info("无缓存");
-        }
-    }
-
-    @GetMapping("/textSetCache")
-    public void textSetCache(
-            @RequestParam("cacheName") String cacheName,
-            @RequestParam("key") String key,
-            @RequestParam("value") String value) {
-        Cache cache = cacheManager.getCache(cacheName);
-        if (cache != null){
-            cache.put(key, value);
-            log.info("设置缓存成功");
-        }else {
-            log.info("无缓存");
-        }
-    }
-
-    @GetMapping("/testDelCache")
-    public void testDelCache(@RequestParam("cacheName") String cacheName) {
-        if (!CacheNameEnums.isCode(cacheName)){
-            log.info("缓存分区不存在");
-            return;
-        }
-        Cache cache = cacheManager.getCache(cacheName);
-        if (cache != null) {
-            cache.invalidate();
-            log.info("删除缓存成功");
-        }else{
-            log.info("无缓存");
-        }
-    }
-
-
-    @GetMapping("/testAddCache")
-    public void testAddCache(@RequestParam("vin") String vin) {
-        ArrayList<CaffeineCache> caches = new ArrayList<>();
-        caches.add(new CaffeineCache(vin, Caffeine.newBuilder().recordStats().build()));
-        cacheManager.setCaches(caches);
-        log.info("缓存管理器创建新分区: {}", vin);
-    }
-
-    @GetMapping("/testGetCacheNames")
-    public void testGetCacheNames() {
-        cacheManager.initializeCaches();
-        log.info("缓存分区列表: {}", cacheManager.getCacheNames());
-    }
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/domain/BasicData.java

@@ -26,11 +26,5 @@ public class BasicData implements Serializable {
     private String value;
     private String type;
 
-//    public void setValueClass() {
-//        Class<?> info = ClassType.getInfo(type);
-//        if (info.isInstance(value)){
-//            value = info.cast(value);
-//        }
-//    }
 }
 

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/kafka/KafkaConsumerService.java

@@ -39,13 +39,14 @@ public class KafkaConsumerService implements InitializingBean {
     private StartStrategy startStrategy;
 
     @Override
-    public void afterPropertiesSet() throws Exception {
+    public void afterPropertiesSet() {
-        Thread thread = new Thread(() -> {
+        new Thread(() -> {
             log.info("启动线程监听Topic: {}", KafkaConstants.KafkaTopic);
-            ThreadUtil.sleep(1000);
             Collection<String> topics = Lists.newArrayList(KafkaConstants.KafkaTopic);
             kafkaConsumer.subscribe(topics);
             while (true) {
+                try {
+                    ThreadUtil.sleep(1000);
                     System.out.println("开始消费数据,等待中...");
                     ConsumerRecords<String, String> consumerRecords = kafkaConsumer.poll(Duration.ofMillis(1000));
                     for (ConsumerRecord consumerRecord : consumerRecords) {
@@ -58,9 +59,11 @@ public class KafkaConsumerService implements InitializingBean {
                         // 执行策略
                         startStrategy.applyStrategy(getDataMap(dataList));
                     }
+                }catch (Exception e) {
+                    log.error("kafka执行异常：" + e.getMessage());
                 }
-        });
+            }
-        thread.start();
+        }).start();
     }
 
     private HashMap<String, BasicData> getDataMap(List<BasicData> dataList) {

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/mapper/DataProcessingMapper.java

@@ -23,13 +23,4 @@ import java.util.List;
 @Mapper
 public interface DataProcessingMapper{
 
-    List<String> selectStorageGroup();
-
-    Integer insIotDbData(@Param("key") String key, @Param("value") String value);
-
-    void strategyCheck(@Param("dataList") List<BasicData> dataList);
-
-    Integer insIotDbDataVo(IotDbData build);
-
-    List<CarData> selectCarData(@Param("tableName") String tableName);
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/rebbit/DownlineRabbitConsumer.java

@@ -1,74 +1,72 @@
-package com.muyu.data.processing.rebbit;
+//package com.muyu.data.processing.rebbit;
-
+//
-
+//
-import com.muyu.common.caffeine.enums.CacheNameEnums;
+//import com.muyu.common.rabbit.constants.RabbitConstants;
-import com.muyu.common.rabbit.constants.RabbitConstants;
+//import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Channel;
+//import jakarta.annotation.Resource;
-import jakarta.annotation.Resource;
+//import lombok.Setter;
-import lombok.Setter;
+//import lombok.extern.slf4j.Slf4j;
-import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.ObjectUtils;
+//import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.Message;
+//import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.Queue;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.cache.Cache;
-import org.springframework.cache.Cache;
+//import org.springframework.cache.CacheManager;
-import org.springframework.cache.CacheManager;
+//import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.RedisTemplate;
+//import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Component;
+//
-
+//import java.io.IOException;
-import java.io.IOException;
+//
-import java.util.HashSet;
+///**
-
+// * 下线事件监听
-/**
+// * @Author: 胡杨
- * 下线事件监听
+// * @Name: DownlineRabbitConsumer
- * @Author: 胡杨
+// * @Description: 车辆下线监听器
- * @Name: DownlineRabbitConsumer
+// * @CreatedDate: 2024/9/26 下午8:21
- * @Description: 车辆下线监听器
+// * @FilePath: com.muyu.data.processing.rebbit
- * @CreatedDate: 2024/9/26 下午8:21
+// */
- * @FilePath: com.muyu.data.processing.rebbit
+//@Slf4j
- */
+//@Component
-@Slf4j
+//@Setter
-@Component
+//public class DownlineRabbitConsumer {
-@Setter
+//    @Resource
-public class DownlineRabbitConsumer {
+//    private RedisTemplate<String,String> redisTemplate;
-    @Resource
+//    @Resource
-    private RedisTemplate<String,String> redisTemplate;
+//    private CacheManager cacheManager;
-    @Resource
+//
-    private CacheManager cacheManager;
+//    @RabbitListener(queuesToDeclare = {@Queue(RabbitConstants.DOWNLINE_QUEUE)})
-
+//    public void downline(String vin, Message message, Channel channel) {
-    @RabbitListener(queuesToDeclare = {@Queue(RabbitConstants.DOWNLINE_QUEUE)})
+//        log.info("车辆 {} 下线, 配置信息准备中。。。",vin);
-    public void downline(String vin, Message message, Channel channel) {
+//        try {
-        log.info("车辆 {} 下线, 配置信息准备中。。。",vin);
+//            // 重复性校验
-        try {
+//            Long add = redisTemplate.opsForSet().add(RabbitConstants.DOWNLINE_QUEUE, message.getMessageProperties().getMessageId());
-            // 重复性校验
+//            if (add>0) {
-            Long add = redisTemplate.opsForSet().add(RabbitConstants.DOWNLINE_QUEUE, message.getMessageProperties().getMessageId());
+//                deleteCarCache(vin);
-            if (add>0) {
+//                log.info("车辆 {} 下线, 消息已确认。。。",vin);
-                deleteCarCache(vin);
+//            } else {
-                log.info("车辆 {} 下线, 消息已确认。。。",vin);
+//                log.info("车辆 {} 下线, 消息重复消费，已确认。。。",vin);
-            } else {
+//            }
-                log.info("车辆 {} 下线, 消息重复消费，已确认。。。",vin);
+//            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            }
+//            log.info("车辆 {} 下线, 配置信息已准备完毕。。。",vin);
-            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+//        } catch (IOException e) {
-            log.info("车辆 {} 下线, 配置信息已准备完毕。。。",vin);
+//            try {
-        } catch (IOException e) {
+//                log.warn("车辆 {} 下线, 配置信息准备失败，返回队列，原因：{}", vin, e.getMessage());
-            try {
+//                channel.basicAck(message.getMessageProperties().getDeliveryTag(), true);
-                log.warn("车辆 {} 下线, 配置信息准备失败，返回队列，原因：{}", vin, e.getMessage());
+//            } catch (IOException ex) {
-                channel.basicAck(message.getMessageProperties().getDeliveryTag(), true);
+//                log.warn("车辆 {} 下线, 消息返回队列失败，原因：{}", vin, ex.getMessage());
-            } catch (IOException ex) {
+//            }
-                log.warn("车辆 {} 下线, 消息返回队列失败，原因：{}", vin, ex.getMessage());
+//        }
-            }
+//    }
-        }
+//
-    }
+//
-
+//    /**
-
+//     * 车辆下线 - 删除缓存
-    /**
+//     */
-     * 车辆下线 - 删除缓存
+//    public void deleteCarCache(String vin) {
-     */
+//        Cache cache = cacheManager.getCache(vin);
-    public void deleteCarCache(String vin) {
+//        if (ObjectUtils.isNotEmpty(cache)){
-        Cache cache = cacheManager.getCache(vin);
+//            cache.invalidate();
-        if (ObjectUtils.isNotEmpty(cache)){
+//        }
-            cache.invalidate();
+//        log.info("车辆编码:{},本地缓存删除完成...", vin);
-        }
+//    }
-        log.info("车辆编码:{},本地缓存删除完成...", vin);
+//}
-    }
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/rebbit/GoOnlineRabbitConsumer.java

@@ -3,6 +3,7 @@ package com.muyu.data.processing.rebbit;
 
 import com.muyu.common.caffeine.enums.CacheNameEnums;
 import com.muyu.common.rabbit.constants.RabbitConstants;
+import com.muyu.data.processing.config.RabbitmqConfig;
 import com.rabbitmq.client.Channel;
 import jakarta.annotation.Resource;
 import lombok.Setter;
@@ -10,13 +11,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.Queue;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.CacheManager;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.util.List;
 
 /**
  * 上线事件监听
@@ -28,14 +27,13 @@ import java.util.List;
  */
 @Slf4j
 @Component
-@Setter
 public class GoOnlineRabbitConsumer {
     @Resource
     private RedisTemplate<String,String> redisTemplate;
     @Resource
     private CacheManager cacheManager;
 
-    @RabbitListener(queuesToDeclare = {@Queue(RabbitConstants.GO_ONLINE_QUEUE)})
+    @RabbitListener(queues = {RabbitmqConfig.QUEUE_INFORM_EMAIL})
     public void goOnline(String vin, Message message, Channel channel){
         log.info("车辆 {} 上线, 配置信息准备中。。。",vin);
         try {

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/service/DataProcessingService.java

@@ -19,18 +19,4 @@ import java.util.List;
 
 public interface DataProcessingService{
 
-    /**
-     * 选择存储组
-     *
-     * @return {@link List }<{@link String }>
-     */
-    List<String> selectStorageGroup();
-
-    void strategyCheck(List<BasicData> dataList);
-
-    Integer insIotDbData(String key, String value);
-
-    List<CarData> selectCarData(String firmCode, String vin);
-
-    Object addCarData(HashMap<String, BasicData> hashMap);
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/service/impl/DataProcessingServiceImpl.java

@@ -3,26 +3,14 @@ package com.muyu.data.processing.service.impl;
 
 import javax.annotation.Resource;
 
-import com.muyu.common.iotdb.config.IotDBSessionConfig;
-import com.muyu.data.processing.domain.CarData;
-import com.muyu.data.processing.domain.IotDbData;
-import com.muyu.data.processing.domain.BasicData;
-import org.apache.iotdb.isession.SessionDataSet;
-import org.apache.iotdb.isession.pool.SessionDataSetWrapper;
-import org.apache.iotdb.rpc.IoTDBConnectionException;
-import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.pool.SessionPool;
-import org.apache.iotdb.tsfile.read.common.Field;
+import org.springframework.cache.Cache;
-import org.apache.iotdb.tsfile.read.common.RowRecord;
+import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
 import com.muyu.data.processing.mapper.DataProcessingMapper;
 import com.muyu.data.processing.service.DataProcessingService;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
 /**
  * 数据处理实现层
  *
@@ -40,109 +28,10 @@ public class DataProcessingServiceImpl implements DataProcessingService {
     private DataProcessingMapper mapper;
     @Resource
     private SessionPool sessionPool;
+    @Resource
+    private CacheManager cacheManager;
 
 
-    @Override
-    public List<String> selectStorageGroup() {
-        return mapper.selectStorageGroup();
-    }
-
-    @Override
-    public void strategyCheck(List<BasicData> dataList) {
-        HashMap<String, BasicData> kafkaDataHashMap = new HashMap<>();
-        dataList.forEach(data -> kafkaDataHashMap.put(data.getKey(), data));
-//        Result<String[]> result = rootStrategy.applyStrategy(kafkaDataHashMap);
-//        String[] data = result.getData();
-//        insIotDbData(data[0],data[1]);
-        IotDbData build = IotDbData.builder()
-                .vin(kafkaDataHashMap.get("vin").getValue())
-                .timestamp(Long.parseLong(kafkaDataHashMap.get("timestamp").getValue()))
-                .latitude(kafkaDataHashMap.get("latitude").getValue())
-                .longitude(kafkaDataHashMap.get("longitude").getValue())
-                .build();
-        mapper.insIotDbDataVo(build);
-//        dataList.forEach(KafkaData::setValueClass);
-//        mapper.strategyCheck(dataList);
-    }
-
-    @Override
-    public Integer insIotDbData(String key, String value) {
-        return mapper.insIotDbData(key, value);
-    }
-
-    @Override
-    public List<CarData> selectCarData(String firmCode, String vin) {
-        ArrayList<CarData> carDataList = new ArrayList<>();
-        String sql = "select * from root.one."+firmCode+"."+vin;
-        try {
-            SessionDataSetWrapper dataSetWrapper = sessionPool.executeQueryStatement(sql);
-            List<String> columnNames = dataSetWrapper.getColumnNames();
-            while (dataSetWrapper.hasNext()){
-                RowRecord next = dataSetWrapper.next();
-                CarData data = getCarData(vin, next, columnNames);
-                carDataList.add(data);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return carDataList;
-    }
-
-    @Override
-    public Object addCarData(HashMap<String, BasicData> hashMap) {
-//        StringBuilder sql = new StringBuilder("insert into root.one.");
-//        sql.append(hashMap.get("firmCode").getValue())
-//                .append(".")
-//                .append(hashMap.get("vin").getValue())
-//                .append("(");
-//        hashMap.remove("firmCode");
-//        hashMap.remove("vin");
-//        StringBuilder keys = new StringBuilder();
-//        StringBuilder values = new StringBuilder();
-//        hashMap.keySet().forEach(key -> {
-//            if (hashMap.get(key) != null) {
-//                keys.append(key).append(",");
-//                if ("String".equals(hashMap.get(key).getType())) {
-//                    values.append("'")
-//                            .append(hashMap.get(key).getValue())
-//                            .append("'")
-//                            .append(",");
-//                }else {
-//                    values.append(hashMap.get(key).getValue())
-//                            .append(",");
-//                }
-//            }
-//        });
-//        sql.append(keys.substring(0, keys.length() - 1))
-//                .append(") values (")
-//                .append(values.substring(0, values.length() - 1))
-//                .append(")");
-//        try {
-//            sessionPool.executeNonQueryStatement(sql.toString());
-//        } catch (StatementExecutionException e) {
-//            throw new RuntimeException(e);
-//        } catch (IoTDBConnectionException e) {
-//            throw new RuntimeException(e);
-//        }
-//        log.info("成功执行sql语句: [{}]", sql);
-//        return sql;
-        return null;
-    }
-
-    private static CarData getCarData(String vin, RowRecord next, List<String> columnNames) {
-        List<Field> fields = next.getFields();
-        CarData data = new CarData();
-        data.setVin(vin);
-        data.setTimestamp(next.getTimestamp());
-        for (int i = 0; i < columnNames.size(); i++) {
-            if (columnNames.get(i).contains("latitude")) {
-                data.setLatitude(fields.get(i-1).getStringValue());
-            }else if (columnNames.get(i).contains("longitude")) {
-                data.setLongitude(fields.get(i-1).getStringValue());
-            }
-        }
-        return data;
-    }
 
 
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/abstractStrategyRouter.java

@@ -1,7 +1,10 @@
 package com.muyu.data.processing.strategy;
 
+import com.github.yulichang.toolkit.SpringContentUtils;
+import com.muyu.data.processing.utils.CacheUtils;
 import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;
@@ -17,6 +20,8 @@ import java.util.Objects;
 @Component
 public abstract class abstractStrategyRouter<T,R> {
 
+    protected static CacheUtils cacheUtils = new CacheUtils();
+
     /**
      * 策略映射器, 指定入参与出参以决定策略处理者
      * @param <T>   策略入参

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FaultJudgmentStrategy.java

@@ -27,12 +27,12 @@ public class FaultJudgmentStrategy extends abstractStrategyRouter<HashMap<String
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("故障判断节点已通过。。。");
         return param-> new FaultAlarmStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("故障判断节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FaultProcessingStrategy.java

@@ -26,12 +26,12 @@ public class FaultProcessingStrategy  extends abstractStrategyRouter<HashMap<Str
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("故障数据处理节点已通过。。。");
         return param-> new FaultJudgmentStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("故障数据处理节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FenceJudgmentStrategy.java

@@ -27,12 +27,12 @@ public class FenceJudgmentStrategy extends abstractStrategyRouter<HashMap<String
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("围栏数据判断节点通过。。。");
         return param-> new FenceAlarmStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("围栏数据判断节点通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FenceProcessingStrategy.java

@@ -25,12 +25,12 @@ public class FenceProcessingStrategy extends abstractStrategyRouter<HashMap<Stri
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("围栏数据处理节点已通过。。。");
         return param-> new FenceJudgmentStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("围栏数据处理节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeJudgmentStrategy.java

@@ -27,12 +27,12 @@ public class RealTimeJudgmentStrategy extends abstractStrategyRouter<HashMap<Str
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("实时数据判断节点已通过。。。");
         return param-> new RealTimeAlarmStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("实时数据判断节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeProcessingStrategy.java

@@ -25,12 +25,12 @@ public class RealTimeProcessingStrategy extends abstractStrategyRouter<HashMap<S
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("实时数据处理节点已通过。。。");
         return param-> new RealTimeJudgmentStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("实时数据处理节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/WarningJudgmentStrategy.java

@@ -27,12 +27,12 @@ public class WarningJudgmentStrategy extends abstractStrategyRouter<HashMap<Stri
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("预警数据判断节点已通过。。。");
         return param-> new WarningAlarmStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("预警数据判断节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/WarningProcessingStrategy.java

@@ -25,12 +25,12 @@ public class WarningProcessingStrategy extends abstractStrategyRouter<HashMap<St
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("预警数据处理节点已通过。。。");
         return param-> new WarningJudgmentStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("预警数据处理节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/core/BasicStrategy.java

@@ -1,13 +1,18 @@
 package com.muyu.data.processing.strategy.core;
 
+import com.github.yulichang.toolkit.SpringContentUtils;
 import com.muyu.common.caffeine.enums.CacheNameEnums;
+import com.muyu.common.core.utils.StringUtils;
 import com.muyu.data.processing.domain.BasicData;
 import java.util.HashMap;
-import java.util.List;
+
 import com.muyu.data.processing.domain.Temporary2;
+import com.muyu.data.processing.service.impl.DataProcessingServiceImpl;
 import com.muyu.data.processing.strategy.StrategyHandler;
 import com.muyu.data.processing.strategy.abstractStrategyRouter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Component;
 
 /**
@@ -24,8 +29,10 @@ import org.springframework.stereotype.Component;
 @Component
 public class BasicStrategy extends abstractStrategyRouter<HashMap<String, BasicData>, Temporary2>
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
+
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("基础校验节点已通过。。。");
         return param -> new RoutingStrategy();
     }
 
@@ -33,9 +40,14 @@ public class BasicStrategy extends abstractStrategyRouter<HashMap<String, BasicD
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
         log.info("开始执行基础校验节点。。。");
         basicDataMap.put(CacheNameEnums.STORAGE.getCode(), null);
-        basicDataMap.put(CacheNameEnums.FAULT.getCode(), null);
+        CacheNameEnums.getCodes().forEach(code-> {
-        basicDataMap.put(CacheNameEnums.REALTIME.getCode(), null);
+            // 通过VIN码获取所有事件的缓存信息
-        log.info("基础校验节点已通过。。。");
+            Object cacheValue = cacheUtils.getCacheValue(code, basicDataMap.get("VIN").getKey());
+            // 如果缓存信息不为空，则说明车辆需要处理该事件
+            if (ObjectUtils.isNotEmpty(cacheValue)){
+                basicDataMap.put(code, null);
+            }
+        });
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/core/EndStrategy.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
 public class EndStrategy implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("结束节点已通过。。。");
+        log.info("车辆VIN: {},已通过结束节点。。。", basicDataMap.get("VIN").getValue());
         return null;
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/core/RoutingStrategy.java

@@ -36,10 +36,10 @@ public class RoutingStrategy   extends abstractStrategyRouter<HashMap<String, Ba
 
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("路由节点已通过。。。");
         return param -> {
             // 编写路由规则
-            List<String> codes = CacheNameEnums.getCodes();
+            for (String code : map.keySet()) {
-            for (String code : codes) {
                 if(param.containsKey(code)){
                     param.remove(code);
                     return map.get(code);
@@ -53,7 +53,6 @@ public class RoutingStrategy   extends abstractStrategyRouter<HashMap<String, Ba
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> stringListHashMap) {
-        log.info("路由节点已通过。。。");
         return applyStrategy(stringListHashMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/core/StartStrategy.java

@@ -41,7 +41,10 @@ import java.util.List;
 public class StartStrategy extends abstractStrategyRouter<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
-        return param -> new BasicStrategy();
+        return param -> {
+            log.info("车辆VIN :{},开始数据处理...", param.get("VIN").getValue());
+            return new BasicStrategy();
+        };
     }
 
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/DataStorageStrategy.java

@@ -1,23 +1,16 @@
 package com.muyu.data.processing.strategy.leaves;
 
-import com.muyu.common.caffeine.enums.CacheNameEnums;
 import com.muyu.common.iotdb.config.IotDBSessionConfig;
 import com.muyu.data.processing.domain.BasicData;
 import java.util.HashMap;
-import java.util.List;
+
 import com.muyu.data.processing.domain.Temporary2;
-import com.muyu.data.processing.service.DataProcessingService;
-import com.muyu.data.processing.service.impl.DataProcessingServiceImpl;
 import com.muyu.data.processing.strategy.StrategyHandler;
 import com.muyu.data.processing.strategy.abstractStrategyRouter;
 import com.muyu.data.processing.strategy.core.RoutingStrategy;
-import jakarta.annotation.Resource;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.pool.SessionPool;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -37,10 +30,8 @@ public class DataStorageStrategy extends abstractStrategyRouter<HashMap<String,
 
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
-        return param -> {
+        log.info("数据持久化分支已完成。。。");
-            log.info("数据持久化节点已通过。。。");
+        return param -> new RoutingStrategy();
-            return new RoutingStrategy();
-        };
     }
 
     @Override

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FaultAlarmStrategy.java

@@ -1,9 +1,8 @@
 package com.muyu.data.processing.strategy.leaves;
 
-import com.muyu.common.caffeine.enums.CacheNameEnums;
 import com.muyu.data.processing.domain.BasicData;
 import java.util.HashMap;
-import java.util.List;
+
 import com.muyu.data.processing.domain.Temporary2;
 import com.muyu.data.processing.strategy.StrategyHandler;
 import com.muyu.data.processing.strategy.abstractStrategyRouter;
@@ -27,12 +26,12 @@ public class FaultAlarmStrategy extends abstractStrategyRouter<HashMap<String, B
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("故障报警分支已完成。。。");
         return param -> new RoutingStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("故障报警节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FenceAlarmStrategy.java

@@ -1,9 +1,8 @@
 package com.muyu.data.processing.strategy.leaves;
 
-import com.muyu.common.caffeine.enums.CacheNameEnums;
 import com.muyu.data.processing.domain.BasicData;
 import java.util.HashMap;
-import java.util.List;
+
 import com.muyu.data.processing.domain.Temporary2;
 import com.muyu.data.processing.strategy.StrategyHandler;
 import com.muyu.data.processing.strategy.abstractStrategyRouter;
@@ -27,12 +26,12 @@ public class FenceAlarmStrategy extends abstractStrategyRouter<HashMap<String, B
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("围栏报警分支已完成。。。");
         return param -> new RoutingStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("围栏报警节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java

@@ -1,9 +1,8 @@
 package com.muyu.data.processing.strategy.leaves;
 
-import com.muyu.common.caffeine.enums.CacheNameEnums;
 import com.muyu.data.processing.domain.BasicData;
 import java.util.HashMap;
-import java.util.List;
+
 import com.muyu.data.processing.domain.Temporary2;
 import com.muyu.data.processing.strategy.StrategyHandler;
 import com.muyu.data.processing.strategy.abstractStrategyRouter;
@@ -27,12 +26,12 @@ public class RealTimeAlarmStrategy extends abstractStrategyRouter<HashMap<String
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("实时数据处理分支已完成。。。");
         return param -> new RoutingStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("实时数据处理节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/WarningAlarmStrategy.java

@@ -1,9 +1,8 @@
 package com.muyu.data.processing.strategy.leaves;
 
-import com.muyu.common.caffeine.enums.CacheNameEnums;
 import com.muyu.data.processing.domain.BasicData;
 import java.util.HashMap;
-import java.util.List;
+
 import com.muyu.data.processing.domain.Temporary2;
 import com.muyu.data.processing.strategy.StrategyHandler;
 import com.muyu.data.processing.strategy.abstractStrategyRouter;
@@ -27,12 +26,12 @@ public class WarningAlarmStrategy extends abstractStrategyRouter<HashMap<String,
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
+        log.info("预警报警分支已完成。。。");
         return param -> new RoutingStrategy();
     }
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        log.info("预警报警节点已通过。。。");
         return applyStrategy(basicDataMap);
     }
 }

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/utils/CacheUtils.java

@@ -0,0 +1,79 @@
+package com.muyu.data.processing.utils;
+
+import com.github.yulichang.toolkit.SpringContentUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.stereotype.Component;
+
+/**
+* 缓存工具类
+* @Author: 胡杨
+* @Name: CacheUtils
+* @Description: 缓存工具类
+* @CreatedDate: 2024/10/9 下午4:21
+* @FilePath: com.muyu.data.processing.utils
+*/
+
+@Slf4j
+@Component
+public class CacheUtils {
+    private static CacheManager cacheManager = SpringContentUtils.getBean(CacheManager.class);
+
+    /**
+     * 获取缓存分区
+     * @param cacheName 缓存分区名称
+     * @return 缓存实例
+     */
+    public Cache getCache(String cacheName) {
+        Cache cache = cacheManager.getCache(cacheName);
+        if (cache == null){
+            throw new RuntimeException("缓存分区: "+cacheName+" 不存在");
+        }
+        return cache;
+    }
+
+    /**
+     * 设置缓存值
+     * @param cacheName 缓存分区名称
+     * @param key 键
+     * @param value 值
+     */
+    public void setCacheValue(String cacheName, String key, Object value) {
+        getCache(cacheName).put(key, value);
+        log.info("缓存存储成功:分区-{}, 键-{}, 值-{}", cacheName, key, value);
+    }
+
+
+    /**
+     * 判断缓存是否存在
+     * @param cacheName 缓存分区名称
+     * @param key 键
+     * @return  结果
+     */
+    public Boolean hasKey(String cacheName, String key) {
+        return ObjectUtils.isNotEmpty(getCache(cacheName).get(key));
+    }
+
+    /**
+     * 获取缓存值(不限定类型)
+     * @param cacheName 缓存分区名称
+     * @param key 键
+     * @return  结果
+     */
+    public Object getCacheValue(String cacheName, String key) {
+        return getCache(cacheName).get(key);
+    }
+
+    /**
+     * 获取缓存值(限定类型)
+     * @param cacheName 缓存分区名称
+     * @param key 键
+     * @param type 返回值类型
+     * @return  结果
+     */
+    public <T> T getCacheValue(String cacheName, String key, Class<T> type) {
+        return getCache(cacheName).get(key, type);
+    }
+}

cloud-modules/cloud-modules-data-processing/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 47.116.173.119:8848
   user-name: nacos
   password: nacos
-  namespace: one-saas
+  namespace: oneone
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:
@@ -68,5 +68,3 @@ spring:
 logging:
   level:
     com.muyu.system.mapper: DEBUG
-
-cacheNames: fault,fence,warming

cloud-modules/cloud-modules-data-processing/src/main/resources/mapper/processing/DataProcessingMapper.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.data.processing.mapper.DataProcessingMapper">
-
-    <select id="selectStorageGroup" resultType="java.lang.String">
-        show storage group
-    </select>
-
-    <select id="selectCarData" resultType="com.muyu.data.processing.domain.CarData">
-        select * from ${tableName};
-    </select>
-
-    <insert id="insIotDbData">
-        insert into root.one.data(${key}) values(${value});
-    </insert>
-    <insert id="strategyCheck">
-        insert into root.one.data
-            (
-             <foreach collection="dataList" item="data" separator=",">
-                 ${data.key}
-             </foreach>
-            ) values
-                  (
-                   <foreach collection="dataList" item="data" separator=",">
-                       #{data.value}
-                   </foreach>
-                   )
-
-    </insert>
-    <insert id="insIotDbDataVo">
-        insert into
-            root.one.data
-        (timestamp, vin, latitude,longitude)
-        values (#{timestamp}, #{vin}, #{latitude}, #{longitude})
-    </insert>
-
-
-</mapper>

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-remote/src/main/java/com/muyu/openbusiness/remote/SysCarRemoteService.java

@@ -1,10 +1,11 @@
 package com.muyu.openbusiness.remote;
 
+import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.common.core.domain.Result;
 import com.muyu.openbusiness.domain.SysCar;
 import org.springframework.cloud.openfeign.FeignClient;
 
-@FeignClient()
+@FeignClient(contextId = "sysCarRemoteService", value = ServiceNameConstants.CAR_SERVICE)
 public interface SysCarRemoteService {
 
     public Result<SysCar> findByVin(String vin);

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml

@@ -97,6 +97,11 @@
             <artifactId>cloud-common-rabbit</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-kafka</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/cahce/apply/SysCarCacheRemoteData.java

@@ -1,31 +1,31 @@
-package com.muyu.openbusiness.cahce.apply;
+//package com.muyu.openbusiness.cahce.apply;
-
+//
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.muyu.common.cache.BasicCacheData;
+//import com.muyu.common.cache.BasicCacheData;
-import com.muyu.openbusiness.domain.SysCar;
+//import com.muyu.openbusiness.domain.SysCar;
-import com.muyu.openbusiness.remote.SysCarRemoteService;
+//import com.muyu.openbusiness.remote.SysCarRemoteService;
-import com.muyu.openbusiness.service.impl.SysCarServiceImpl;
+//import com.muyu.openbusiness.service.impl.SysCarServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
+//import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Component;
+//import org.springframework.stereotype.Component;
-
+//
-/**
+///**
- * 键和值转换 - 车辆数据
+// * 键和值转换 - 车辆数据
- */
+// */
-@Primary
+//@Primary
-@Component
+//@Component
-public class SysCarCacheRemoteData implements BasicCacheData<String, SysCar> {
+//public class SysCarCacheRemoteData implements BasicCacheData<String, SysCar> {
-
+//
-
+//
-    @Autowired
+//    @Autowired
-    private SysCarServiceImpl sysCarService;
+//    private SysCarServiceImpl sysCarService;
-
+//
-    @Override
+//    @Override
-    public SysCar apply(String key) {
+//    public SysCar apply(String key) {
-        return sysCarService.getOne(
+//        return sysCarService.getOne(
-                new LambdaQueryWrapper<>(){{
+//                new LambdaQueryWrapper<>(){{
-                    eq(SysCar::getCarVin, key);
+//                    eq(SysCar::getCarVin, key);
-                }}
+//                }}
-        );
+//        );
-    }
+//    }
-}
+//}