Merge remote-tracking branch 'origin/v26.2-jdk17springboot3-20240912' into dev_jdk17

performance-api/src/main/java/com/clx/performance/param/pc/vehiclewarn/VehicleWarnUserConfigUpdateParam.java

@@ -19,7 +19,7 @@ public class VehicleWarnUserConfigUpdateParam {
     private Integer id;
     @Schema(description = "订单预警类型列表")
     private List<VehicleWarnUserVO.WarnTypeItem> orderWarnTypeList;
-    @Schema(description = "运单预警类型列表")
+    @Schema(description = "运单预警类型列表", example = "1")
     private List<VehicleWarnUserVO.WarnTypeItem> warnTypeList;
     @Schema(description = "线路预警类型列表")
     private List<VehicleWarnUserVO.WarnTypeItem> lineWarnTypeList;

performance-api/src/main/java/com/clx/performance/vo/pc/vehiclewarn/VehicleWarnUserVO.java

@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,6 +52,10 @@ public class VehicleWarnUserVO {
         List<Integer> warnTypeList = JSON.parseArray(orderWarnTypeJson, Integer.class);
 
         List<WarnTypeItem> list = new ArrayList<>();
+
+        if(CollectionUtils.isEmpty(warnTypeList)){
+            return list;
+        }
         for (VehicleWarnConfigEnum.OrderWarnType item : VehicleWarnConfigEnum.OrderWarnType.values()) {
             if (warnTypeList.contains(item.getCode())){
                 list.add(new WarnTypeItem(item.getCode(), item.getMsg(), 1));
@@ -68,6 +73,9 @@ public class VehicleWarnUserVO {
         List<Integer> warnTypeList = JSON.parseArray(warnTypeJson, Integer.class);
 
         List<WarnTypeItem> list = new ArrayList<>();
+        if(CollectionUtils.isEmpty(warnTypeList)){
+            return list;
+        }
         for (VehicleWarnConfigEnum.WarnType item : VehicleWarnConfigEnum.WarnType.values()) {
             if (warnTypeList.contains(item.getCode())){
                 list.add(new WarnTypeItem(item.getCode(), item.getMsg(), 1));
@@ -85,6 +93,9 @@ public class VehicleWarnUserVO {
         List<Integer> warnTypeList = JSON.parseArray(lineWarnTypeJson, Integer.class);
 
         List<WarnTypeItem> list = new ArrayList<>();
+        if(CollectionUtils.isEmpty(warnTypeList)){
+            return list;
+        }
         for (LineWarnConfigEnum.WarnType item : LineWarnConfigEnum.WarnType.values()) {
             if (warnTypeList.contains(item.getCode())){
                 list.add(new WarnTypeItem(item.getCode(), item.getMsg(), 1));