dev.wei
parent
207125c795
commit
4aebd67ebc
|
@ -44,7 +44,7 @@ public class CarInformation {
|
|||
*/
|
||||
// @TableName(value = "car_information_VIN")
|
||||
@TableField(value = "car_information_VIN")
|
||||
private String carInformationVin;
|
||||
private String carInformationVIN;
|
||||
/**
|
||||
* 车牌号
|
||||
*/
|
||||
|
@ -133,7 +133,7 @@ public class CarInformation {
|
|||
|
||||
public static CarInformation carInformationAddBuilder(CarInformationAddReq carInformation) {
|
||||
return CarInformation.builder()
|
||||
.carInformationVin(carInformation.getCarInformationVin())
|
||||
.carInformationVIN(carInformation.getCarInformationVIN())
|
||||
.carInformationLicensePlate(carInformation.getCarInformationLicensePlate())
|
||||
.carInformationBrand(carInformation.getCarInformationBrand())
|
||||
.carInformationColor(carInformation.getCarInformationColor())
|
||||
|
|
|
@ -21,7 +21,7 @@ public class CarInformationAddReq {
|
|||
/**
|
||||
* 车辆唯一VIN
|
||||
*/
|
||||
private String carInformationVin;
|
||||
private String carInformationVIN;
|
||||
|
||||
/**
|
||||
* 车牌号
|
||||
|
|
|
@ -65,7 +65,7 @@ public class CarInformationServiceImpl
|
|||
.leftJoin(CarType.class, CarType::getCarTypeId, CarInformation::getCarInformationType)
|
||||
|
||||
.eq(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN())
|
||||
,CarInformation::getCarInformationVin
|
||||
,CarInformation::getCarInformationVIN
|
||||
, carInformationListReq.getCarInformationVIN())
|
||||
.eq(StringUtils.isNotNull(carInformationListReq.getCarTypeId())
|
||||
,CarType::getCarTypeId, carInformationListReq.getCarTypeId())
|
||||
|
@ -76,7 +76,7 @@ public class CarInformationServiceImpl
|
|||
,CarInformation::getCarInformationState
|
||||
, carInformationListReq.getCarInformationState())
|
||||
.like(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN())
|
||||
,CarInformation::getCarInformationVin
|
||||
,CarInformation::getCarInformationVIN
|
||||
, carInformationListReq.getCarInformationVIN())
|
||||
.eq(StringUtils.isNotEmpty( carInformationListReq.getCarInformationMotorModel())
|
||||
,CarInformation::getCarInformationMotorModel
|
||||
|
|
|
@ -47,7 +47,7 @@ public class FaultLogServiceImpl extends ServiceImpl<FaultLogMapper, FaultLog> i
|
|||
FaultLog::getStartwarningTime,
|
||||
FaultLog::getEndwarningTime)
|
||||
.select(FaultCode::getFaultcodeNumber)
|
||||
.select(CarInformation::getCarInformationVin)
|
||||
.select(CarInformation::getCarInformationVIN)
|
||||
.leftJoin(FaultCode.class,FaultCode::getFaultcodeId,FaultLog::getFaultcodeId)
|
||||
.leftJoin(CarInformation.class,CarInformation::getCarInformationId,FaultLog::getCarInformationId)
|
||||
.eq(StringUtils.isNotEmpty(faultLogListReq.getCarVin()),
|
||||
|
|
|
@ -52,7 +52,7 @@ public class FaultRuleServiceImpl extends ServiceImpl<FaultRuleMapper, CarFaultR
|
|||
//根据车辆VIN判断它属于什么类型的车辆
|
||||
List<CarInformation> carInformationList = carInformationMapper.selectList(
|
||||
new LambdaQueryWrapper<CarInformation>()
|
||||
.eq(CarInformation::getCarInformationVin, carFaultRule.getVin()));
|
||||
.eq(CarInformation::getCarInformationVIN, carFaultRule.getVin()));
|
||||
//根据车辆类型,查询表获取对应的类型的故障规则
|
||||
Integer carInformationType = null;
|
||||
for (CarInformation carInformation : carInformationList) {
|
||||
|
|
Loading…
Reference in New Issue