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

修改bug

master
WeiRan 2024-09-29 16:53:08 +08:00
parent fa3b9b2244
commit 1627aa3dab
14 changed files with 81 additions and 99 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

@ -46,7 +46,7 @@ public class CarInformation {
*/
// @TableName(value = "car_information_VIN")
@TableField(value = "car_information_VIN")
private String carInformationVin;
private String carInformationVIN;
/**
* 车牌号
*/
@ -135,7 +135,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())

17
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java
View File

@ -60,7 +60,22 @@ public class FaultCode {
*是否警告
*/
private Integer isWarning;
/**
*故障类型名称
*/
private String faulttypeName;
/**
* 故障名称
*/
private String messageTypeName;
/**
* 报文编码
*/
private String messageTypeCode;
/**
*报文所属类别
*/
private String messageTypeBelongs;
public static FaultCode addfaultcode(FaultCodeAddReq faultCodeAddReq){

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

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.domain.req.FaultCodeAddReq;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@ -50,6 +51,7 @@ public class FaultLabel {
return FaultLabel.builder()
.messageTypeId(0)
.messageTypeId(faultCodeAddReq.getMessageTypeId())
.messageTypeCode(faultCodeAddReq.getMessageTypeCode())
.messageTypeName(faultCodeAddReq.getMessageTypeName())
.messageTypeBelongs(faultCodeAddReq.getMessageTypeBelongs())
.build();

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

@ -55,7 +55,7 @@ public class FaultLog {
/**
* 车辆VIN
*/
private String carInformationVin;
private String carInformationVIN;
/**
* 开始报警时间
*/

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

@ -21,6 +21,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Builder
public class FaultCodeListReq {
/**
*故障码
*/

38
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java
View File

@ -1,11 +1,12 @@
package com.muyu.domain.resp;
import com.muyu.domain.vo.FaultCodeVO;
import com.muyu.domain.FaultCode;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 故障码信息响应对象
@ -19,6 +20,7 @@ import lombok.Data;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Tag(name="故障码信息响应对象",description = "故障码查询的响应结果")
public class FaultCodeListResp {
@ -54,14 +56,14 @@ public class FaultCodeListResp {
*故障类型名称
*/
private String faulttypeName;
/**
* 故障名称
*/
private String messageTypeName;
/**
*报文编码
*/
private String messageTypeCode;
/**
*报文名称
*/
private String messageTypeName;
/**
*报文所属类别
*/
@ -69,22 +71,22 @@ public class FaultCodeListResp {
/**
* 数据库对象构建为返回结果对象
* @param faultCodeVO
* @param faultCode
* @return
*/
public static FaultCodeListResp faultCodeListResp(FaultCodeVO faultCodeVO){
public static FaultCodeListResp faultCodeListResp(FaultCode faultCode){
return FaultCodeListResp.builder()
.faultcodeId(faultCodeVO.getFaultcodeId())
.messageTypeId(faultCodeVO.getMessageTypeId())
.faultcodeNumber(faultCodeVO.getFaultcodeNumber())
.faultGroup(faultCodeVO.getFaultGroup())
.faultBit(faultCodeVO.getFaultBit())
.faultValue(faultCodeVO.getFaultValue())
.isWarning(faultCodeVO.getIsWarning())
.faulttypeName(faultCodeVO.getFaulttypeName())
.messageTypeName(faultCodeVO.getMessageTypeName())
.messageTypeCode(faultCodeVO.getMessageTypeCode())
.messageTypeBelongs(faultCodeVO.getMessageTypeBelongs())
.faultcodeId(faultCode.getFaultcodeId())
.messageTypeId(faultCode.getMessageTypeId())
.faultcodeNumber(faultCode.getFaultcodeNumber())
.faultGroup(faultCode.getFaultGroup())
.faultBit(faultCode.getFaultBit())
.faultValue(faultCode.getFaultValue())
.isWarning(faultCode.getIsWarning())
.faulttypeName(faultCode.getFaulttypeName())
.messageTypeName(faultCode.getMessageTypeName())
.messageTypeCode(faultCode.getMessageTypeCode())
.messageTypeBelongs(faultCode.getMessageTypeBelongs())
.build();
}
}

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

@ -77,7 +77,7 @@ public class FaultLogListResp {
.startwarningTime(faultLog.getStartwarningTime())
.endwarningTime(faultLog.getEndwarningTime())
.faultcodeNumber(faultLog.getFaultcodeNumber())
.carInformationVIN(faultLog.getCarInformationVin())
.carInformationVIN(faultLog.getCarInformationVIN())
.build();
}
}

44
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/vo/FaultCodeVO.java
View File

@ -1,44 +0,0 @@
package com.muyu.domain.vo;
import com.muyu.domain.FaultCode;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* 故障码视图(故障)
* @Author：weiran
* @Package：com.muyu.cloud.faultmanage.domain.vo
* @Project：cloud-faultmanage
* @name：FaultCodeVO
* @Date：2024/9/17 15:14
*/
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
@Tag(name = "故障码视图")
public class FaultCodeVO extends FaultCode {
/**
*故障类型名称
*/
private String faulttypeName;
/**
* 故障名称
*/
private String messageTypeName;
/**
* 报文编码
*/
private String messageTypeCode;
/**
*报文所属类别
*/
private String messageTypeBelongs;
}

12
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultCodeMapper.java
View File

@ -1,19 +1,9 @@
package com.muyu.server.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.muyu.domain.FaultCode;
import com.muyu.domain.FaultLabel;
import com.muyu.domain.req.FaultCodeAddReq;
import com.muyu.domain.req.FaultCodeListReq;
import com.muyu.domain.req.FaultCodeUpdReq;
import com.muyu.domain.resp.FaultCodeListResp;
import com.muyu.domain.vo.FaultCodeVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
/**
* 车辆故障码持久层

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

@ -6,9 +6,7 @@ import com.muyu.domain.FaultCode;
import com.muyu.domain.req.FaultCodeAddReq;
import com.muyu.domain.req.FaultCodeListReq;
import com.muyu.domain.req.FaultCodeUpdReq;
import com.muyu.domain.resp.FaultCodeListResp;
import com.muyu.domain.resp.FaultCodeTotalListResp;
import com.muyu.domain.vo.FaultCodeVO;
/**

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

@ -68,7 +68,7 @@ public class CarInformationServiceImpl
.leftJoin(CarType.class, CarType::getCarTypeId, CarInformation::getCarInformationType)
.leftJoin(CarFence.class, CarFence::getId, CarInformation::getCarInformationFence)
.eq(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN())
,CarInformation::getCarInformationVin
,CarInformation::getCarInformationVIN
, carInformationListReq.getCarInformationVIN())
.eq(StringUtils.isNotNull(carInformationListReq.getCarTypeId())
,CarType::getCarTypeId, carInformationListReq.getCarTypeId())
@ -79,7 +79,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

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

@ -12,7 +12,7 @@ import com.muyu.domain.req.FaultCodeListReq;
import com.muyu.domain.req.FaultCodeUpdReq;
import com.muyu.domain.resp.FaultCodeListResp;
import com.muyu.domain.resp.FaultCodeTotalListResp;
import com.muyu.domain.vo.FaultCodeVO;
import com.muyu.domain.resp.FaultConditionListResp;
import com.muyu.server.mapper.FaultCodeMapper;
import com.muyu.server.service.FaultCodeService;
import com.muyu.server.service.FaultLabelService;
@ -44,6 +44,8 @@ public class FaultCodeServiceImpl extends ServiceImpl<FaultCodeMapper, FaultCode
*/
@Override
public FaultCodeTotalListResp selectfaultcodelist(FaultCodeListReq faultCodeListReq) {
LambdaQueryWrapper<FaultCode> queryWrapper = new LambdaQueryWrapper<>();
long count = this.count(queryWrapper);
MPJLambdaWrapper<FaultCode> wrapper = new MPJLambdaWrapper<>();
wrapper.select(
@ -51,7 +53,6 @@ public class FaultCodeServiceImpl extends ServiceImpl<FaultCodeMapper, FaultCode
FaultCode::getMessageTypeId,
FaultCode::getFaultcodeNumber,
FaultCode::getFaultGroup,
FaultCode::getFaultcodeId,
FaultCode::getFaultValue,
FaultCode::getIsWarning)
.select(
@ -62,10 +63,9 @@ public class FaultCodeServiceImpl extends ServiceImpl<FaultCodeMapper, FaultCode
FaultCode::getFaultcodeNumber,faultCodeListReq.getFaultcodeNumber())
.eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultBit()),
FaultCode::getFaultBit, faultCodeListReq.getFaultBit());
Page<FaultCodeListResp> page = faultCodeMapper.selectJoinPage(new Page<>(faultCodeListReq.getPageNum(), faultCodeListReq.getPageSize()),
FaultCodeListResp.class, wrapper);
return FaultCodeTotalListResp.faultCodeTotalListResp(page.getRecords(),page.getTotal());
wrapper.last("LIMIT "+ ((faultCodeListReq.getPageNum()-1)*faultCodeListReq.getPageSize())+", "+faultCodeListReq.getPageSize());
List<FaultCodeListResp> faultCodeListResps = faultCodeMapper.selectJoinList(FaultCodeListResp.class, wrapper);
return FaultCodeTotalListResp.faultCodeTotalListResp(faultCodeListResps,count);
}

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

@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.muyu.domain.CarType;
import com.muyu.domain.FaultCode;
import com.muyu.domain.FaultCondition;
import com.muyu.domain.FaultLabel;
import com.muyu.domain.req.FaultConditionAddReq;
import com.muyu.domain.req.FaultConditionListReq;
import com.muyu.domain.resp.FaultConditionListResp;
import com.muyu.domain.resp.FaultConditionTotalListResp;
import com.muyu.domain.resp.FaultLogListResp;
import com.muyu.server.mapper.FaultConditionMapper;
import com.muyu.server.service.FaultConditionService;
import org.springframework.beans.factory.annotation.Autowired;
@ -42,8 +44,14 @@ public class FaultConditionServiceImpl extends ServiceImpl<FaultConditionMapper,
*/
@Override
public FaultConditionTotalListResp getfaultrulelist(FaultConditionListReq faultConditionListReq) {
LambdaQueryWrapper<FaultCondition> queryWrapper = new LambdaQueryWrapper<>();
long count = this.count(queryWrapper);
MPJLambdaWrapper<FaultCondition> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(FaultCondition.class)
wrapper.select(FaultCondition::getCarconditionId,
FaultCondition::getCarTypeId,
FaultCondition::getMessageTypeId,
FaultCondition::getFaultconditionIdentification,
FaultCondition::getFaultconditionParameter)
.select(CarType::getCarTypeName)
.select(FaultLabel::getMessageTypeName,
FaultLabel::getMessageTypeCode)
@ -55,9 +63,9 @@ public class FaultConditionServiceImpl extends ServiceImpl<FaultConditionMapper,
if (faultConditionListReq.getMessageTypeId()!=0){
wrapper.eq(FaultLabel::getMessageTypeId, faultConditionListReq.getMessageTypeId());
}
Page<FaultConditionListResp> page = faultConditionMapper.selectJoinPage(new Page<>(faultConditionListReq.getPageNum(), faultConditionListReq.getPageSize()),
FaultConditionListResp.class, wrapper);
return FaultConditionTotalListResp.faultConditionTotalListResp(page.getRecords(),page.getTotal());
wrapper.last("LIMIT "+ ((faultConditionListReq.getPageNum()-1)*faultConditionListReq.getPageSize())+", "+faultConditionListReq.getPageSize());
List<FaultConditionListResp> faultConditionListResps = faultConditionMapper.selectJoinList(FaultConditionListResp.class, wrapper);
return FaultConditionTotalListResp.faultConditionTotalListResp(faultConditionListResps,count);
}

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

@ -7,6 +7,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.domain.CarInformation;
import com.muyu.domain.FaultCode;
import com.muyu.domain.FaultCondition;
import com.muyu.domain.FaultLog;
import com.muyu.domain.req.FaultLogListReq;
import com.muyu.domain.resp.FaultLogListResp;
@ -15,6 +16,9 @@ import com.muyu.server.mapper.FaultLogMapper;
import com.muyu.server.service.FaultLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 故障日志业务实现层
* @Author：weiran
@ -35,11 +39,17 @@ public class FaultLogServiceImpl extends ServiceImpl<FaultLogMapper, FaultLog> i
*/
@Override
public FaultLogTotalListResp selectfaultlog(FaultLogListReq faultLogListReq) {
LambdaQueryWrapper<FaultLog> queryWrapper = new LambdaQueryWrapper<>();
long count = this.count(queryWrapper);
MPJLambdaWrapper<FaultLog> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(FaultLog.class)
wrapper.select(FaultLog::getLogId,
FaultLog::getFaultcodeId,
FaultLog::getCarInformationId,
FaultLog::getCarVin,
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()),
@ -50,8 +60,8 @@ public class FaultLogServiceImpl extends ServiceImpl<FaultLogMapper, FaultLog> i
if (faultLogListReq.getEndwarningTime()!=null){
wrapper.eq(FaultLog::getEndwarningTime,faultLogListReq.getEndwarningTime());
}
Page<FaultLogListResp> ipage = faultLogMapper.selectJoinPage(new Page<>(faultLogListReq.getPageNum(),
faultLogListReq.getPageSize()), FaultLogListResp.class, wrapper);
return FaultLogTotalListResp.faultLogTotalListResp(ipage.getRecords(),ipage.getTotal());
wrapper.last("LIMIT "+ ((faultLogListReq.getPageNum()-1)*faultLogListReq.getPageSize())+", "+faultLogListReq.getPageSize());
List<FaultLogListResp> faultLogListResps = faultLogMapper.selectJoinList(FaultLogListResp.class, wrapper);
return FaultLogTotalListResp.faultLogTotalListResp(faultLogListResps,count);
}
}