diff --git a/february-fault-common/src/main/java/com/february/fault/config/MybatisPlusConfig.java b/february-fault-common/src/main/java/com/february/fault/config/MybatisPlusConfig.java new file mode 100644 index 0000000..2e160ed --- /dev/null +++ b/february-fault-common/src/main/java/com/february/fault/config/MybatisPlusConfig.java @@ -0,0 +1,26 @@ +package com.february.fault.config; + +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * @program: february-fault-information + * @description: + * @author: Mr.Wang + * @create: 2023-11-21 19:53 + **/ +@EnableTransactionManagement +@Configuration +@MapperScan("com.february.fault.mapper.FaultCodeMapper") +public class MybatisPlusConfig { + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor(){ + MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor(); + mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor()); + return mybatisPlusInterceptor; + } +} diff --git a/february-fault-server/src/main/java/com/february/fault/controller/FaultCodeController.java b/february-fault-server/src/main/java/com/february/fault/controller/FaultCodeController.java index 3d6dcbe..6c68562 100644 --- a/february-fault-server/src/main/java/com/february/fault/controller/FaultCodeController.java +++ b/february-fault-server/src/main/java/com/february/fault/controller/FaultCodeController.java @@ -12,9 +12,7 @@ import com.february.fault.domain.FaultCode; import com.february.fault.service.FaultCodeService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -33,12 +31,13 @@ public class FaultCodeController { /** * 查询车辆故障表信息列表 + * @param faultCode * @return */ - @GetMapping("/list") - public Result> faultCodeList(){ + @PostMapping("/list") + public Result> faultCodeList(@RequestBody FaultCode faultCode){ log.info("功能名称:车辆故障码列表,请求路径:{},请求方式:{}",request.getRequestURI(),request.getMethod()); - Result> result=faultCodeService.faultCodeList(); + Result> result=faultCodeService.faultCodeList(faultCode); log.info("响应结果:{}",result); return result; } diff --git a/february-fault-server/src/main/java/com/february/fault/service/FaultCodeService.java b/february-fault-server/src/main/java/com/february/fault/service/FaultCodeService.java index 05a5fe1..74e3143 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/FaultCodeService.java +++ b/february-fault-server/src/main/java/com/february/fault/service/FaultCodeService.java @@ -14,5 +14,5 @@ import java.util.List; **/ public interface FaultCodeService extends IService { - Result> faultCodeList(); + Result> faultCodeList(FaultCode faultCode); } diff --git a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultCodeServiceImpl.java b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultCodeServiceImpl.java index b5a2559..740ca60 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultCodeServiceImpl.java +++ b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultCodeServiceImpl.java @@ -1,6 +1,7 @@ package com.february.fault.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.february.common.core.domain.Result; import com.february.fault.domain.FaultCode; @@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * @program: february-fault-information @@ -25,9 +27,17 @@ public class FaultCodeServiceImpl extends ServiceImpl> faultCodeList() { + public Result> faultCodeList(FaultCode faultCode) { QueryWrapper faultCodeQueryWrapper = new QueryWrapper<>(); - List faultCodes = faultCodeMapper.selectList(faultCodeQueryWrapper); - return Result.success(faultCodes); + if(!Objects.equals(faultCode.getFaultBh(), "") && faultCode.getFaultBh()!=null){ + faultCodeQueryWrapper.eq("fault_bh",faultCode.getFaultBh()); + } + if(!Objects.equals(faultCode.getFaultSeat(), "") && faultCode.getFaultSeat()!=null){ + faultCodeQueryWrapper.eq("fault_seat",faultCode.getFaultSeat()); + } + Page faultCodePage = new Page<>(1,2); + List records = faultCodeMapper.selectPage(faultCodePage, faultCodeQueryWrapper).getRecords(); +// List faultCodes = faultCodeMapper.selectList(faultCodeQueryWrapper); + return Result.success(records); } }