a_bazu
/
cloud-server-8
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

dev.wei
WeiRan 2024-09-29 22:46:04 +08:00
parent 207125c795
commit 4aebd67ebc
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java
View File

@ -44,7 +44,7 @@ public class CarInformation {
*/ */
// @TableName(value = "car_information_VIN") // @TableName(value = "car_information_VIN")
@TableField(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) { public static CarInformation carInformationAddBuilder(CarInformationAddReq carInformation) {
return CarInformation.builder() return CarInformation.builder()
.carInformationVin(carInformation.getCarInformationVin()) .carInformationVIN(carInformation.getCarInformationVIN())
.carInformationLicensePlate(carInformation.getCarInformationLicensePlate()) .carInformationLicensePlate(carInformation.getCarInformationLicensePlate())
.carInformationBrand(carInformation.getCarInformationBrand()) .carInformationBrand(carInformation.getCarInformationBrand())
.carInformationColor(carInformation.getCarInformationColor()) .carInformationColor(carInformation.getCarInformationColor())

2
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationAddReq.java
View File

@ -21,7 +21,7 @@ public class CarInformationAddReq {
/** /**
* 车辆唯一VIN * 车辆唯一VIN
*/ */
private String carInformationVin; private String carInformationVIN;
/** /**
* 车牌号 * 车牌号

4
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java
View File

@ -65,7 +65,7 @@ public class CarInformationServiceImpl
.leftJoin(CarType.class, CarType::getCarTypeId, CarInformation::getCarInformationType) .leftJoin(CarType.class, CarType::getCarTypeId, CarInformation::getCarInformationType)
.eq(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN()) .eq(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN())
,CarInformation::getCarInformationVin ,CarInformation::getCarInformationVIN
, carInformationListReq.getCarInformationVIN()) , carInformationListReq.getCarInformationVIN())
.eq(StringUtils.isNotNull(carInformationListReq.getCarTypeId()) .eq(StringUtils.isNotNull(carInformationListReq.getCarTypeId())
,CarType::getCarTypeId, carInformationListReq.getCarTypeId()) ,CarType::getCarTypeId, carInformationListReq.getCarTypeId())
@ -76,7 +76,7 @@ public class CarInformationServiceImpl
,CarInformation::getCarInformationState ,CarInformation::getCarInformationState
, carInformationListReq.getCarInformationState()) , carInformationListReq.getCarInformationState())
.like(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN()) .like(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN())
,CarInformation::getCarInformationVin ,CarInformation::getCarInformationVIN
, carInformationListReq.getCarInformationVIN()) , carInformationListReq.getCarInformationVIN())
.eq(StringUtils.isNotEmpty( carInformationListReq.getCarInformationMotorModel()) .eq(StringUtils.isNotEmpty( carInformationListReq.getCarInformationMotorModel())
,CarInformation::getCarInformationMotorModel ,CarInformation::getCarInformationMotorModel

2
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLogServiceImpl.java
View File

@ -47,7 +47,7 @@ public class FaultLogServiceImpl extends ServiceImpl<FaultLogMapper, FaultLog> i
FaultLog::getStartwarningTime, FaultLog::getStartwarningTime,
FaultLog::getEndwarningTime) FaultLog::getEndwarningTime)
.select(FaultCode::getFaultcodeNumber) .select(FaultCode::getFaultcodeNumber)
.select(CarInformation::getCarInformationVin) .select(CarInformation::getCarInformationVIN)
.leftJoin(FaultCode.class,FaultCode::getFaultcodeId,FaultLog::getFaultcodeId) .leftJoin(FaultCode.class,FaultCode::getFaultcodeId,FaultLog::getFaultcodeId)
.leftJoin(CarInformation.class,CarInformation::getCarInformationId,FaultLog::getCarInformationId) .leftJoin(CarInformation.class,CarInformation::getCarInformationId,FaultLog::getCarInformationId)
.eq(StringUtils.isNotEmpty(faultLogListReq.getCarVin()), .eq(StringUtils.isNotEmpty(faultLogListReq.getCarVin()),

2
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java
View File

@ -52,7 +52,7 @@ public class FaultRuleServiceImpl extends ServiceImpl<FaultRuleMapper, CarFaultR
//根据车辆VIN判断它属于什么类型的车辆 //根据车辆VIN判断它属于什么类型的车辆
List<CarInformation> carInformationList = carInformationMapper.selectList( List<CarInformation> carInformationList = carInformationMapper.selectList(
new LambdaQueryWrapper<CarInformation>() new LambdaQueryWrapper<CarInformation>()
.eq(CarInformation::getCarInformationVin, carFaultRule.getVin())); .eq(CarInformation::getCarInformationVIN, carFaultRule.getVin()));
//根据车辆类型，查询表获取对应的类型的故障规则 //根据车辆类型，查询表获取对应的类型的故障规则
Integer carInformationType = null; Integer carInformationType = null;
for (CarInformation carInformation : carInformationList) { for (CarInformation carInformation : carInformationList) {