提交 186b8415 authored 作者: 刘海泉's avatar 刘海泉

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

Former-commit-id: 49e7b9e9
...@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
...@@ -46,10 +47,6 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService { ...@@ -46,10 +47,6 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
throw new ServiceSystemException(ResultEnum.VEHICLE_WARN_USER_EXIST); 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()) List<Integer> warnTypeList = Arrays.stream(VehicleWarnConfigEnum.WarnType.values())
.map(item -> item.getCode()).collect(Collectors.toList()); .map(item -> item.getCode()).collect(Collectors.toList());
List<Integer> lineWarnTypeList = Arrays.stream(LineWarnConfigEnum.WarnType.values()) List<Integer> lineWarnTypeList = Arrays.stream(LineWarnConfigEnum.WarnType.values())
...@@ -58,7 +55,7 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService { ...@@ -58,7 +55,7 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
VehicleWarnUser vehicleWarnUser = new VehicleWarnUser(); VehicleWarnUser vehicleWarnUser = new VehicleWarnUser();
vehicleWarnUser.setName(param.getName()); vehicleWarnUser.setName(param.getName());
vehicleWarnUser.setMobile(param.getMobile()); vehicleWarnUser.setMobile(param.getMobile());
vehicleWarnUser.setOrderWarnTypeJson(JSON.toJSONString(orderWarnTypeList)); vehicleWarnUser.setOrderWarnTypeJson(JSON.toJSONString(new ArrayList<>()));
vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(warnTypeList)); vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(warnTypeList));
vehicleWarnUser.setLineWarnTypeJson(JSON.toJSONString(lineWarnTypeList)); vehicleWarnUser.setLineWarnTypeJson(JSON.toJSONString(lineWarnTypeList));
vehicleWarnUser.setCreateBy(loginUserInfo.getUserName()); vehicleWarnUser.setCreateBy(loginUserInfo.getUserName());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论