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

# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java

cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/VehicleType.java

@@ -41,7 +41,7 @@ public class VehicleType extends BaseEntity {
      * 报文模版外键
      */
     @Schema(type = "Integer",description = "报文模版外键")
-    private Integer messageTemplateId;
+    private Long messageTemplateId;
 
     /**
      * 添加车辆类型

cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java

@@ -48,13 +48,6 @@ public class VehicleController extends BaseController {
     //添加车辆缓存
     @Autowired
     private VehicleCacheService vehicleCacheService;
-    //车辆信息
-    @Autowired
-    private AllVehicleCacheService allVehicleCacheService;
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
 
     /**
      * 查询车辆管理列表
@@ -67,9 +60,10 @@ public class VehicleController extends BaseController {
         startPage();
         List<VehicleManageResp> list = vehicleService.getVehicleList(vehicleManageReq);
         //将车辆信息存到Redis
-        for (VehicleManageResp resp : list) {
-            allVehicleCacheService.put(resp.getVehicleVin(), resp);
-        }
+        List<Vehicle> vehicleList = vehicleService.list();
+        vehicleList.forEach(vehicle -> {
+            vehicleCacheService.put(vehicle.getVehicleVin(), vehicle);
+        });
         return getDataTable(list);
     }
 

cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/MessageValueServiceImpl.java

@@ -2,11 +2,12 @@ package com.muyu.enterprise.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.enterprise.mapper.MessageValueMapper;
-import com.muyu.enterprise.service.MessageValueService;
 import com.muyu.domain.MessageValue;
 import com.muyu.domain.req.MessageValueReq;
 import com.muyu.domain.resp.MessageValueListResp;
+import com.muyu.enterprise.cache.AllMessageValueCacheService;
+import com.muyu.enterprise.mapper.MessageValueMapper;
+import com.muyu.enterprise.service.MessageValueService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,9 @@ public class MessageValueServiceImpl
     @Autowired
     private MessageValueMapper messageValueMapper;
 
+    @Autowired
+    private AllMessageValueCacheService allMessageValueCacheService;
+
     public MessageValueServiceImpl(MessageValueMapper messageValueMapper) {
         this.messageValueMapper = messageValueMapper;
     }
@@ -63,11 +67,13 @@ public class MessageValueServiceImpl
         LambdaQueryWrapper<MessageValue> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MessageValue::getTemplateId, templateId);
         List<MessageValue> list = this.list(queryWrapper);
-        return list.stream()
+        List<MessageValueListResp> collect = list.stream()
                 .map(messageValue -> MessageValueListResp.valueBuild(
                                 messageValue
                         )
                 ).collect(Collectors.toList());
+        allMessageValueCacheService.put(String.valueOf(templateId), collect);
+        return collect;
     }
 
 

cloud-modules/cloud-modules-protocol-parsing/pom.xml

@@ -116,6 +116,12 @@
             <artifactId>cloud-common-kafka</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-modules-enterprise-cache</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+
     </dependencies>
 
     <build>

cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/RemoteServiceClient.java

@@ -1,40 +0,0 @@
-package com.muyu.cloud.protocol.parsing.feign;
-
-import com.muyu.common.core.domain.Result;
-import com.muyu.domain.resp.MessageValueListResp;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.util.List;
-
-/**
- * @Author: LiDongJia
- * @Package: com.muyu.cloud.protocol.parsing.feign
- * @Project: 2112-car-cloud-server
- * @name: RemoteServiceClient
- * @Date: 2024/9/28  14:49
- * @Description: 远程调用接口
- */
-@FeignClient(name = "cloud-car")
-public interface RemoteServiceClient {
-
-    /**
-     * 通过车辆vin码查询模板id
-     * @param vehicleVin
-     * @return
-     */
-    @GetMapping("/vehicleManage/findByVehicleVin/{vehicleVin}")
-    @Operation(description = "通过车辆vin码查询模板id")
-    public Result<Long> findByVehicleVin(@PathVariable("vehicleVin") String vehicleVin);
-
-    /**
-     * 根据报文模版id查询报文数据
-     * @param templateId
-     * @return
-     */
-    @GetMapping("/messageValue/findByTemplateId/{templateId}")
-    @Operation(summary = "根据报文模版id查询报文数据", description = "根据报文模版id查询报文数据")
-    public Result<List<MessageValueListResp>> findByTemplateId(@PathVariable("templateId") Long templateId);
-}

cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/factory/RemoteServiceClientFactory.java

@@ -1,40 +0,0 @@
-package com.muyu.cloud.protocol.parsing.feign.factory;
-
-import com.muyu.cloud.protocol.parsing.feign.RemoteServiceClient;
-import com.muyu.common.core.domain.Result;
-import com.muyu.domain.resp.MessageValueListResp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-
-import java.util.List;
-
-/**
- * 报文模版对象服务降级处理
- * @Author：李庆帅
- * @Package：com.muyu.analysis.parsing.remote.factory
- * @Project：cloud-server
- * @name：RemoteServiceClientFactory
- * @Date：2024/9/28 21:16
- */
-public class RemoteServiceClientFactory implements FallbackFactory<RemoteServiceClient>
-{
-    private static final Logger log = LoggerFactory.getLogger(com.muyu.cloud.protocol.parsing.feign.factory.RemoteServiceClientFactory.class);
-
-    @Override
-    public RemoteServiceClient create(Throwable throwable) {
-        log.error("报文模版传参调用失败:{}", throwable.getMessage());
-        return new RemoteServiceClient() {
-
-            @Override
-            public Result<Long> findByVehicleVin(String vehicleVin) {
-                return Result.success(Long.valueOf(vehicleVin));
-            }
-
-            @Override
-            public Result<List<MessageValueListResp>> findByTemplateId(Long templateId) {
-                return null;
-            }
-        };
-    }
-}

cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingMessage.java

@@ -1,16 +1,17 @@
 package com.muyu.cloud.protocol.parsing.test;
 
 import cn.hutool.json.JSONObject;
-import com.alibaba.fastjson.JSON;
-import com.muyu.cloud.protocol.parsing.feign.RemoteServiceClient;
-import com.muyu.common.core.domain.Result;
+import com.muyu.domain.Vehicle;
+import com.muyu.domain.VehicleType;
 import com.muyu.domain.resp.MessageValueListResp;
+import com.muyu.enterprise.cache.AllMessageValueCacheService;
+import com.muyu.enterprise.cache.VehicleCacheService;
+import com.muyu.enterprise.cache.VehicleTypeCacheService;
 import lombok.extern.log4j.Log4j2;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.eclipse.paho.client.mqttv3.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -27,17 +28,20 @@ import java.util.List;
  */
 @Log4j2
 @Component
-public class ParsingTest {
-
-    @Resource
-    private RedisTemplate<String, Object> redisTemplate;
-
-    @Autowired
-    private RemoteServiceClient remoteServiceClient;
+public class ParsingMessage {
 
     @Resource
     private KafkaProducer<String, String> kafkaProducer;
 
+    @Autowired
+    private VehicleCacheService vehicleCacheService;
+
+    @Autowired
+    private VehicleTypeCacheService vehicleTypeCacheService;
+
+    @Autowired
+    private AllMessageValueCacheService allMessageValueCacheService;
+
     /**
      * 协议解析
      */
@@ -92,32 +96,34 @@ public class ParsingTest {
                     String vehicleVin = result.substring(1, 18);
                     log.info("车辆VIN码: " + vehicleVin);
                     //根据车辆VIN码查询报文模板ID
-                    Result<Long> byVehicleVin = remoteServiceClient.findByVehicleVin(vehicleVin);
-                    Long templateId = byVehicleVin.getData();
-                    List<MessageValueListResp> templateList;
-                    //从redis缓存中获取报文模板数据
-                    try {
-                        String redisKey = "messageTemplate" + templateId;
-                        if (redisTemplate.hasKey(redisKey)) {
-                            List<Object> list = redisTemplate.opsForList().range(redisKey, 0, -1);
-                            templateList = list.stream()
-                                    .map(obj -> JSON.parseObject(obj.toString(), MessageValueListResp.class))
-                                    .toList();
-                            log.info("Redis缓存查询成功");
-                        } else {
-                            Result<List<MessageValueListResp>> byTemplateId = remoteServiceClient.findByTemplateId(templateId);
-                            templateList = byTemplateId.getData();
-                            templateList.forEach(
-                                    listResp ->
-                                            redisTemplate.opsForList().rightPush(
-                                                    redisKey, JSON.toJSONString(listResp)
-                                            )
-                            );
-                            log.info("数据库查询成功");
-                        }
-                    } catch (Exception e) {
-                        throw new RuntimeException("获取报文模板失败");
-                    }
+                    Vehicle vehicle = vehicleCacheService.get(vehicleVin);
+                    Long vehicleTypeId = vehicle.getVehicleTypeId();
+                    VehicleType vehicleType = vehicleTypeCacheService.get(String.valueOf(vehicleTypeId));
+                    Long templateId = vehicleType.getMessageTemplateId();
+                    List<MessageValueListResp> templateList = allMessageValueCacheService.get(String.valueOf(templateId));
+//                    //从redis缓存中获取报文模板数据
+//                    try {
+//                        String redisKey = "messageTemplate" + templateId;
+//                        if (redisTemplate.hasKey(redisKey)) {
+//                            List<Object> list = redisTemplate.opsForList().range(redisKey, 0, -1);
+//                            templateList = list.stream()
+//                                    .map(obj -> JSON.parseObject(obj.toString(), MessageValueListResp.class))
+//                                    .toList();
+//                            log.info("Redis缓存查询成功");
+//                        } else {
+//                            Result<List<MessageValueListResp>> byTemplateId = remoteServiceClient.findByTemplateId(templateId);
+//                            templateList = byTemplateId.getData();
+//                            templateList.forEach(
+//                                    listResp ->
+//                                            redisTemplate.opsForList().rightPush(
+//                                                    redisKey, JSON.toJSONString(listResp)
+//                                            )
+//                            );
+//                            log.info("数据库查询成功");
+//                        }
+//                    } catch (Exception e) {
+//                        throw new RuntimeException("获取报文模板失败");
+//                    }
                     //判断报文模板列表不为空
                     if (templateList.isEmpty()) {
                         throw new RuntimeException("报文模版为空");