diff --git a/pom.xml b/pom.xml index 04851e1..975ff15 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.muyu VehicleSimulation - 1.0.6 + 1.0.7 17 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 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 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());