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

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnUserServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -47,6 +46,10 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
             throw new ServiceSystemException(ResultEnum.VEHICLE_WARN_USER_EXIST);
         }
 
+
+        List<Integer> orderWarnTypeList = Arrays.stream(VehicleWarnConfigEnum.OrderWarnType.values())
+                .map(item -> item.getCode()).collect(Collectors.toList());
+
         List<Integer> warnTypeList = Arrays.stream(VehicleWarnConfigEnum.WarnType.values())
                 .map(item -> item.getCode()).collect(Collectors.toList());
         List<Integer> lineWarnTypeList = Arrays.stream(LineWarnConfigEnum.WarnType.values())
@@ -55,7 +58,7 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
         VehicleWarnUser vehicleWarnUser = new VehicleWarnUser();
         vehicleWarnUser.setName(param.getName());
         vehicleWarnUser.setMobile(param.getMobile());
-        vehicleWarnUser.setOrderWarnTypeJson(JSON.toJSONString(new ArrayList<>()));
+        vehicleWarnUser.setOrderWarnTypeJson(JSON.toJSONString(orderWarnTypeList));
         vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(warnTypeList));
         vehicleWarnUser.setLineWarnTypeJson(JSON.toJSONString(lineWarnTypeList));
         vehicleWarnUser.setCreateBy(loginUserInfo.getUserName());