From 83312b8e37194b15ee37f61705421ee286bbd54e Mon Sep 17 00:00:00 2001 From: WeiRan <2392355487@qq.com> Date: Sat, 28 Sep 2024 22:33:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=EF=BC=8Cmy?= =?UTF-8?q?batis->mybatis-plus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/domain/FaultCode.java | 13 +++ .../main/java/com/muyu/domain/FaultLabel.java | 11 +- .../main/java/com/muyu/domain/FaultLog.java | 10 -- .../controller/FaultCodeController.java | 12 --- .../muyu/server/mapper/FaultCodeMapper.java | 22 +--- .../server/mapper/FaultConditionMapper.java | 4 - .../muyu/server/mapper/FaultLogMapper.java | 5 +- .../muyu/server/service/FaultCodeService.java | 11 +- .../server/service/FaultLabelService.java | 21 ++++ .../service/impl/CarMessageServiceImpl.java | 1 + .../service/impl/FaultCodeServiceImpl.java | 92 ++++++++-------- .../impl/FaultConditionServiceImpl.java | 39 ++++--- .../service/impl/FaultLabelServiceImpl.java | 43 ++++++++ .../service/impl/FaultLogServiceImpl.java | 35 +++--- .../main/resources/mapper/FaultCodeMapper.xml | 102 ------------------ .../resources/mapper/FaultConditionMapper.xml | 56 ---------- .../main/resources/mapper/FaultLogMapper.xml | 45 -------- 17 files changed, 195 insertions(+), 327 deletions(-) delete mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultCodeMapper.xml delete mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultConditionMapper.xml delete mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultLogMapper.xml diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java index 9a9025c..18199b9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.req.FaultCodeAddReq; +import com.muyu.domain.req.FaultCodeUpdReq; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -74,6 +75,18 @@ public class FaultCode { .build(); } + public static FaultCode updfaultcode(FaultCodeUpdReq faultCodeUpdReq){ + return FaultCode.builder() + .faultcodeId(0) + .messageTypeId(faultCodeUpdReq.getMessageTypeId()) + .faultcodeNumber(faultCodeUpdReq.getFaultcodeNumber()) + .faultGroup(faultCodeUpdReq.getFaultGroup()) + .faultBit(faultCodeUpdReq.getFaultBit()) + .faultValue(faultCodeUpdReq.getFaultValue()) + .isWarning(faultCodeUpdReq.getIsWarning()) + .build(); + } + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java index e8cbcd6..78a1560 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java @@ -3,6 +3,7 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; 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.Data; @@ -30,7 +31,7 @@ public class FaultLabel { *自增主键 */ @TableId(value = "message_type_id",type = IdType.AUTO) - private String messageTypeId; + private long messageTypeId; /** *报文编码 */ @@ -45,6 +46,14 @@ public class FaultLabel { private String messageTypeBelongs; + public static FaultLabel addfaultLabel(FaultCodeAddReq faultCodeAddReq){ + return FaultLabel.builder() + .messageTypeId(0) + .messageTypeId(faultCodeAddReq.getMessageTypeId()) + .messageTypeName(faultCodeAddReq.getMessageTypeName()) + .messageTypeBelongs(faultCodeAddReq.getMessageTypeBelongs()) + .build(); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java index 31d39c8..e9dc9c4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java @@ -59,16 +59,6 @@ public class FaultLog { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") private Date endwarningTime; - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 车辆vin - */ - private String carInformationVIN; - - } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java index d4f15ba..9d550d9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java @@ -30,18 +30,6 @@ public class FaultCodeController { private FaultCodeService faultCodeService; - /** - * 故障码展示(仅故障码单表) - * @param faultCodeListReq - * @return - */ - @PostMapping(path = "/list") - @Operation(summary = "故障码列表(单)",description = "展示故障码信息") - public Result selectlist(@Validated @RequestBody FaultCodeListReq faultCodeListReq){ - return Result.success(faultCodeService.selectlist(faultCodeListReq)); - } - - /** * 故障码展示(故障码联查) * @param faultCodeListReq diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultCodeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultCodeMapper.java index 584e506..4d1b649 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultCodeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultCodeMapper.java @@ -2,11 +2,13 @@ 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; @@ -22,24 +24,6 @@ import java.util.List; * @Date：2024/9/17 14:52 */ @Mapper -public interface FaultCodeMapper extends BaseMapper { +public interface FaultCodeMapper extends MPJBaseMapper { - List selectfaultcodelist(FaultCodeListReq faultCodeListReq); - - - - //新增故障码 - FaultLabel selectfaultName(@Param("messageTypeName") String messageTypeName); - FaultCode selectfaultCode(@Param("faultcodeNumber") String faultcodeNumber); - Integer insertfaultlabel(FaultCodeAddReq faultCodeAddReq); - Integer insertfaultcode(FaultCodeAddReq faultCodeAddReq); - - //修改故障码 - Integer updfaultlabel(FaultCodeUpdReq faultCodeUpdReq); - Integer updfaultcode(FaultCodeUpdReq faultCodeUpdReq); - - - - Integer delfaultcode(@Param("messageTypeId") long messageTypeId); - Integer delfaultlabel(@Param("messageTypeId") long messageTypeId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java index 65e426b..6887c7d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java @@ -20,8 +20,4 @@ import java.util.List; @Mapper public interface FaultConditionMapper extends MPJBaseMapper { - List selectfaultconditionlist(FaultConditionListReq faultConditionListReq); - - - List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLogMapper.java index f349f12..07ba29b 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLogMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLogMapper.java @@ -2,6 +2,7 @@ package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.muyu.domain.FaultLog; import com.muyu.domain.req.FaultLogListReq; import org.apache.ibatis.annotations.Mapper; @@ -17,9 +18,7 @@ import java.util.List; * @Date：2024/9/20 9:33 */ @Mapper -public interface FaultLogMapper extends BaseMapper { +public interface FaultLogMapper extends MPJBaseMapper { - List selectfaultLogMapper(FaultLogListReq faultLogListReq); - } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java index 9ce6038..eb9368f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java @@ -2,9 +2,11 @@ package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; +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; @@ -17,14 +19,9 @@ import com.muyu.domain.vo.FaultCodeVO; * @name：FaultCodeService * @Date：2024/9/17 14:53 */ -public interface FaultCodeService extends IService { +public interface FaultCodeService extends IService { + - /** - * 故障码展示 - * @param faultCodeListReq - * @return - */ - FaultCodeTotalListResp selectlist(FaultCodeListReq faultCodeListReq); /** * 故障码展示(故障码联查) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java index 1d6d871..3491363 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java @@ -2,6 +2,7 @@ package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultLabel; +import com.muyu.domain.req.FaultCodeAddReq; import java.util.List; @@ -21,4 +22,24 @@ public interface FaultLabelService extends IService { */ List select(); + /** + * 判断故障名称是否存在 + * @param messageTypeName + * @return + */ + FaultLabel selectfaultName(String messageTypeName); + + /** + * 添加故障项表 + * @param faultCodeAddReq + * @return + */ + Integer insertfaultlabel(FaultCodeAddReq faultCodeAddReq); + + /** + * 删除对应的故障名称表信息 + * @param messageTypeId + * @return + */ + Integer delfaultlabel(Integer messageTypeId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java index 262f5f4..6cae031 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.server.service.impl; +import cn.hutool.db.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.common.core.domain.Result; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java index 42e7ae3..67f9ee5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java @@ -1,7 +1,9 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.common.core.utils.StringUtils; import com.muyu.domain.FaultCode; import com.muyu.domain.FaultLabel; @@ -13,6 +15,7 @@ import com.muyu.domain.resp.FaultCodeTotalListResp; import com.muyu.domain.vo.FaultCodeVO; import com.muyu.server.mapper.FaultCodeMapper; import com.muyu.server.service.FaultCodeService; +import com.muyu.server.service.FaultLabelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,32 +30,11 @@ import java.util.List; * @Date：2024/9/17 14:53 */ @Service -public class FaultCodeServiceImpl extends ServiceImpl implements FaultCodeService { +public class FaultCodeServiceImpl extends ServiceImpl implements FaultCodeService { @Autowired private FaultCodeMapper faultCodeMapper; - - /** - * 故障码展示 - * @param faultCodeListReq - * @return - */ - @Override - public FaultCodeTotalListResp selectlist(FaultCodeListReq faultCodeListReq) { - Integer pageNum = faultCodeListReq.getPageNum(); - Integer pageSize = faultCodeListReq.getPageSize(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultcodeNumber()), - FaultCodeVO::getFaultcodeNumber,faultCodeListReq.getFaultcodeNumber()); - queryWrapper.eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultBit()), - FaultCodeVO::getFaultBit,faultCodeListReq.getFaultBit()); - long count = this.count(queryWrapper); - queryWrapper.last("LIMIT "+ ((pageNum-1)*pageSize)+", "+pageSize); - List faultCodeVOList = this.list(queryWrapper); - List faultCodeListRespList = faultCodeVOList.stream() - .map(FaultCodeListResp::faultCodeListResp) - .toList(); - return FaultCodeTotalListResp.faultCodeTotalListResp(faultCodeListRespList,count); - } + @Autowired + private FaultLabelService faultLabelService; /** @@ -62,17 +44,31 @@ public class FaultCodeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); - int offset = (faultCodeListReq.getPageNum() - 1) * faultCodeListReq.getPageSize(); - faultCodeListReq.setPageNum(offset); - List selectfaultcodelist = faultCodeMapper.selectfaultcodelist(faultCodeListReq); - List faultCodeListRespList = selectfaultcodelist.stream() - .map(FaultCodeListResp::faultCodeListResp) - .toList(); - return FaultCodeTotalListResp.faultCodeTotalListResp(faultCodeListRespList,count); + + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.select( + FaultCode::getFaultcodeId, + FaultCode::getMessageTypeId, + FaultCode::getFaultcodeNumber, + FaultCode::getFaultGroup, + FaultCode::getFaultcodeId, + FaultCode::getFaultValue, + FaultCode::getIsWarning) + .select( + FaultLabel::getMessageTypeCode, + FaultLabel::getMessageTypeName) + .leftJoin(FaultLabel.class,FaultLabel::getMessageTypeId,FaultCode::getMessageTypeId) + .eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultcodeNumber()), + FaultCode::getFaultcodeNumber,faultCodeListReq.getFaultcodeNumber()) + .eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultBit()), + FaultCode::getFaultBit, faultCodeListReq.getFaultBit()); + Page page = faultCodeMapper.selectJoinPage(new Page<>(faultCodeListReq.getPageNum(), faultCodeListReq.getPageSize()), + FaultCodeListResp.class, wrapper); + + return FaultCodeTotalListResp.faultCodeTotalListResp(page.getRecords(),page.getTotal()); } + /** * 新增故障码 * @param faultCodeAddReq @@ -83,13 +79,23 @@ public class FaultCodeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotEmpty(faultcodeNumber), + FaultCode::getFaultcodeNumber, faultcodeNumber); + List list = this.list(queryWrapper); + FaultCode faultCode=null; + if (!list.isEmpty()){ + faultCode=list.get(0); + } + if (faultLabel==null && faultCode==null){ - faultCodeMapper.insertfaultlabel(faultCodeAddReq); - faultCodeMapper.insertfaultcode(faultCodeAddReq); + //添加故障项表 + faultLabelService.insertfaultlabel(faultCodeAddReq); + //添加故障码表 + faultCodeMapper.insert(FaultCode.addfaultcode(faultCodeAddReq)); } } @@ -101,9 +107,7 @@ public class FaultCodeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(FaultCode::getMessageTypeId, messageTypeId); // 假设FaultCode实体类中有一个getMessageTypeId方法 //删除故障码表信息 - faultCodeMapper.delfaultcode(messageTypeId); + faultCodeMapper.delete(queryWrapper); //删除对应的故障名称表信息 - faultCodeMapper.delfaultlabel(messageTypeId); + faultLabelService.delfaultlabel(messageTypeId); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java index e00c6e6..eaf92d2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java @@ -1,8 +1,12 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.FaultCondition; +import com.muyu.domain.FaultLabel; import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionListReq; import com.muyu.domain.resp.FaultConditionListResp; @@ -38,17 +42,22 @@ public class FaultConditionServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); - int offset = (faultConditionListReq.getPageNum() - 1) * faultConditionListReq.getPageSize(); - faultConditionListReq.setPageNum(offset); - - List selectfaultconditionlist = faultConditionMapper.selectfaultconditionlist(faultConditionListReq); - List faultConditionListRespList = selectfaultconditionlist - .stream() - .map(FaultConditionListResp::faultConditionListResp) - .toList(); - return FaultConditionTotalListResp.faultConditionTotalListResp(faultConditionListRespList,count); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(FaultCondition.class) + .select(CarType::getCarTypeName) + .select(FaultLabel::getMessageTypeName, + FaultLabel::getMessageTypeCode) + .leftJoin(CarType.class,CarType::getCarTypeId,FaultCondition::getCarTypeId) + .leftJoin(FaultLabel.class,FaultLabel::getMessageTypeId,FaultCondition::getMessageTypeId); + if (faultConditionListReq.getCarTypeId()!=0){ + wrapper.eq(CarType::getCarTypeId, faultConditionListReq.getCarTypeId()); + } + if (faultConditionListReq.getMessageTypeId()!=0){ + wrapper.eq(FaultLabel::getMessageTypeId, faultConditionListReq.getMessageTypeId()); + } + Page page = faultConditionMapper.selectJoinPage(new Page<>(faultConditionListReq.getPageNum(), faultConditionListReq.getPageSize()), + FaultConditionListResp.class, wrapper); + return FaultConditionTotalListResp.faultConditionTotalListResp(page.getRecords(),page.getTotal()); } @@ -59,7 +68,11 @@ public class FaultConditionServiceImpl extends ServiceImpl selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq) { - List faultConditionList = faultConditionMapper.selectBytypeAndlabel(faultConditionAddReq); - return faultConditionList; + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(FaultCondition::getCarTypeId,faultConditionAddReq.getCarTypeId()) + .eq(FaultCondition::getMessageTypeId,faultConditionAddReq.getMessageTypeId()); + List list = this.list(queryWrapper); + return list; } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java index af08236..7f541ff 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java @@ -2,7 +2,10 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.domain.FaultCode; import com.muyu.domain.FaultLabel; +import com.muyu.domain.req.FaultCodeAddReq; import com.muyu.server.mapper.FaultLabelMapper; import com.muyu.server.service.FaultLabelService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,4 +36,44 @@ public class FaultLabelServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); return this.list(queryWrapper); } + + /** + * 判断故障名称是否存在 + * @param messageTypeName + * @return + */ + @Override + public FaultLabel selectfaultName(String messageTypeName) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotEmpty(messageTypeName), + FaultLabel::getMessageTypeName, messageTypeName); + List list = this.list(queryWrapper); + if (!list.isEmpty()){ + return list.get(0); + } + return null; + } + + /** + * 添加故障项表 + * @param faultCodeAddReq + * @return + */ + @Override + public Integer insertfaultlabel(FaultCodeAddReq faultCodeAddReq) { + return faultLabelMapper.insert(FaultLabel.addfaultLabel(faultCodeAddReq)); + } + + /** + * 删除对应的故障名称表信息 + * @param messageTypeId + * @return + */ + @Override + public Integer delfaultlabel(Integer messageTypeId) { + // 使用LambdaQueryWrapper来构建查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(FaultLabel::getMessageTypeId, messageTypeId); // 假设FaultCode实体类中有一个getMessageTypeId方法 + return faultLabelMapper.delete(queryWrapper); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLogServiceImpl.java index 5696589..04c8008 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLogServiceImpl.java @@ -1,7 +1,12 @@ package com.muyu.server.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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.FaultLog; import com.muyu.domain.req.FaultLogListReq; import com.muyu.domain.resp.FaultLogListResp; @@ -10,9 +15,6 @@ 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 @@ -33,14 +35,23 @@ public class FaultLogServiceImpl extends ServiceImpl i */ @Override public FaultLogTotalListResp selectfaultlog(FaultLogListReq faultLogListReq) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); - int offset = (faultLogListReq.getPageNum() - 1) * faultLogListReq.getPageSize(); - faultLogListReq.setPageNum(offset); - List faultLogListResps = faultLogMapper.selectfaultLogMapper(faultLogListReq); - List faultLogListRespList = faultLogListResps.stream() - .map(FaultLogListResp::faultLogListResp) - .toList(); - return FaultLogTotalListResp.faultLogTotalListResp(faultLogListRespList,count); + + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(FaultLog.class) + .select(FaultCode::getFaultcodeNumber) + .select(CarInformation::getCarInformationVin) + .leftJoin(FaultCode.class,FaultCode::getFaultcodeId,FaultLog::getFaultcodeId) + .leftJoin(CarInformation.class,CarInformation::getCarInformationId,FaultLog::getCarInformationId) + .eq(StringUtils.isNotEmpty(faultLogListReq.getCarVin()), + FaultLog::getCarVin,faultLogListReq.getCarVin()); + if (faultLogListReq.getStartwarningTime()!=null){ + wrapper.eq(FaultLog::getStartwarningTime,faultLogListReq.getStartwarningTime()); + } + if (faultLogListReq.getEndwarningTime()!=null){ + wrapper.eq(FaultLog::getEndwarningTime,faultLogListReq.getEndwarningTime()); + } + Page ipage = faultLogMapper.selectJoinPage(new Page<>(faultLogListReq.getPageNum(), + faultLogListReq.getPageSize()), FaultLogListResp.class, wrapper); + return FaultLogTotalListResp.faultLogTotalListResp(ipage.getRecords(),ipage.getTotal()); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultCodeMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultCodeMapper.xml deleted file mode 100644 index 2dd107e..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultCodeMapper.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - SELECT - car_faultcode.faultcode_id, - car_faultcode.message_type_id, - car_fault_label.message_type_code, - car_faultcode.faultcode_number, - car_faultcode.fault_group, - car_faultcode.fault_bit, - car_faultcode.fault_value, - car_fault_label.message_type_name, - car_faultcode.is_warning - FROM - car_faultcode - LEFT JOIN car_fault_label ON car_faultcode.message_type_id = car_fault_label.message_type_id - - - - - - - - - - - - INSERT INTO `eight`.`car_fault_label` - (`message_type_id`, `message_type_code`, `message_type_name`, `message_type_belongs`) VALUES - (0, #{messageTypeCode}, #{messageTypeName}, '车辆基础'); - - - INSERT INTO `eight`.`car_faultcode` - (`faultcode_id`, `message_type_id`, `faultcode_number`, `fault_group`, `fault_bit`, `fault_value`, `is_warning`) VALUES - (0, #{messageTypeId}, #{faultcodeNumber}, #{faultGroup}, #{faultBit}, #{faultValue}, #{isWarning}); - - - - - - - UPDATE `eight`.`car_fault_label` - SET `message_type_code` = #{messageTypeCode}, - `message_type_name` = #{messageTypeName}, - `message_type_belongs` =#{messageTypeBelongs} - WHERE `message_type_id` = #{messageTypeId}; - - - UPDATE `eight`.`car_faultcode` - SET `message_type_id` = #{messageTypeId}, - `faultcode_number` = #{faultcodeNumber}, - `fault_group` = #{faultGroup}, - `fault_bit` = #{faultBit}, - `fault_value` = #{faultValue}, - `is_warning` = #{isWarning} - WHERE `faultcode_id` = #{faultcodeId}; - - - - - - delete from car_faultcode where message_type_id=#{messageTypeId} - - - delete from car_fault_label where message_type_id=#{messageTypeId} - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultConditionMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultConditionMapper.xml deleted file mode 100644 index b6a09f0..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultConditionMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - SELECT - car_fault_condition.*, - car_type.car_type_name, - car_fault_label.message_type_name, - car_fault_label.message_type_code - FROM - car_fault_condition - LEFT JOIN car_type ON car_fault_condition.car_type_id = car_type.car_type_id - LEFT JOIN car_fault_label ON car_fault_condition.message_type_id = car_fault_label.message_type_id - - - - - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultLogMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultLogMapper.xml deleted file mode 100644 index 803748f..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultLogMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - SELECT - car_fault_log.*, - car_faultcode.faultcode_number, - car_information.car_information_VIN - FROM - car_fault_log - LEFT JOIN car_faultcode ON car_fault_log.faultcode_id = car_faultcode.faultcode_id - LEFT JOIN car_information ON car_fault_log.car_information_id = car_information.car_information_id - - - - -