From 8642c052138f087a1360b5b1e22362a99ee9aa33 Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Sun, 29 Sep 2024 18:29:49 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0=E8=BD=A6=E8=BE=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../com/muyu/web/service/impl/VechileInfoServiceImpl.java     | 4 ++--
 .../com/muyu/web/service/impl/VehicleInstanceServiceImpl.java | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 04851e1..975ff15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.muyu</groupId>
     <artifactId>VehicleSimulation</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/src/main/java/com/muyu/web/service/impl/VechileInfoServiceImpl.java b/src/main/java/com/muyu/web/service/impl/VechileInfoServiceImpl.java
index 2b23196..d49ee8f 100644
--- a/src/main/java/com/muyu/web/service/impl/VechileInfoServiceImpl.java
+++ b/src/main/java/com/muyu/web/service/impl/VechileInfoServiceImpl.java
@@ -47,7 +47,7 @@ public class VechileInfoServiceImpl extends ServiceImpl<VehicleInfoMapper, Vehic
     @Transactional
     public void generate (Integer sum, Long messageTemplateId) {
         List<VehicleInfo> vehicleInfoList =
-                Stream.generate(() -> VehicleInfo.gen(() -> messageTemplateId))
+                Stream.generate(() -> VehicleInfo.gen(() -> messageTemplateId == null ? 0 : messageTemplateId))
                         .limit(sum)
                         .toList();
         this.saveBatch(vehicleInfoList);
@@ -82,7 +82,7 @@ public class VechileInfoServiceImpl extends ServiceImpl<VehicleInfoMapper, Vehic
             throw new RuntimeException(errorMsg.toString());
         }
         List<VehicleInfo> vehicleInfoList = Arrays.stream(vinList)
-                .map((String vin) -> VehicleInfo.create(vin, () -> messageTemplateId))
+                .map((String vin) -> VehicleInfo.create(vin, () -> messageTemplateId == null ? 0 : messageTemplateId))
                 .toList();
         this.saveBatch(vehicleInfoList);
         vehicleInfoList.forEach(vehicleInstanceService::init);
diff --git a/src/main/java/com/muyu/web/service/impl/VehicleInstanceServiceImpl.java b/src/main/java/com/muyu/web/service/impl/VehicleInstanceServiceImpl.java
index 135ef16..dfdcd52 100644
--- a/src/main/java/com/muyu/web/service/impl/VehicleInstanceServiceImpl.java
+++ b/src/main/java/com/muyu/web/service/impl/VehicleInstanceServiceImpl.java
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 /**
@@ -66,7 +67,7 @@ public class VehicleInstanceServiceImpl implements VehicleInstanceService {
         vehicleInstance.setVehicleInfo(vehicleInfo);
         vehicleInstance.setVehicleData(VehicleData.vehicleBuild(vehicleInfo));
         vehicleInstance.setMessageTemplate(
-                messageTemplateCache.getIfPresent(vehicleInfo.getMessageTemplateId())
+                messageTemplateCache.get(vehicleInfo.getMessageTemplateId(), messageTemplateId -> MessageTemplateCacheModel.builder().build())
         );
         LocalContainer.setVehicleInstance(vehicleInstance);
         log.debug("构建车辆对象: [{}]", vehicleInfo.getVin());