From acbddf98c44468429bb3a1e76ad108869fb95f9c Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Wed, 11 Dec 2024 15:09:57 +0800 Subject: [PATCH] =?UTF-8?q?fix()=EF=BC=9A=E8=BD=A6=E8=BE=86=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E4=B8=8A=E6=8A=A5=E5=9F=BA=E4=BA=8E=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/vehicle/VehicleInstance.java | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/muyu/vehicle/VehicleInstance.java b/src/main/java/com/muyu/vehicle/VehicleInstance.java index 03224c8..9c7dead 100644 --- a/src/main/java/com/muyu/vehicle/VehicleInstance.java +++ b/src/main/java/com/muyu/vehicle/VehicleInstance.java @@ -299,29 +299,31 @@ public class VehicleInstance { } List messageTemplateValueList = this.messageTemplate.getMessageTemplateValueList(); - for (MessageTemplateValue messageTemplateValue : messageTemplateValueList) { - String valueType = messageTemplateValue.getValueType(); - MessageTemplateValueType messageTemplateValueType - = MessageTemplateValueType.valueOf(valueType); - switch (messageTemplateValueType){ - // 固定值 - case FIXED -> { - String fixedValue = messageTemplateValue.getFixedValue(); - String[] split = fixedValue.split(","); - vehicleData.putData(messageTemplateValue.getCode(), split[0]); - } - // 区间值 - case INTERVAL -> { - vehicleData.putData( - messageTemplateValue.getCode(), - vehicleData.getValue( - vehicleData.genValue( - messageTemplateValue.getMinValue(), - messageTemplateValue.getMaxValue() - ), - messageTemplateValue.getLength() - ) - ); + if (messageTemplateValueList != null){ + for (MessageTemplateValue messageTemplateValue : messageTemplateValueList) { + String valueType = messageTemplateValue.getValueType(); + MessageTemplateValueType messageTemplateValueType + = MessageTemplateValueType.valueOf(valueType); + switch (messageTemplateValueType){ + // 固定值 + case FIXED -> { + String fixedValue = messageTemplateValue.getFixedValue(); + String[] split = fixedValue.split(","); + vehicleData.putData(messageTemplateValue.getCode(), split[0]); + } + // 区间值 + case INTERVAL -> { + vehicleData.putData( + messageTemplateValue.getCode(), + vehicleData.getValue( + vehicleData.genValue( + messageTemplateValue.getMinValue(), + messageTemplateValue.getMaxValue() + ), + messageTemplateValue.getLength() + ) + ); + } } } }