From 0ca20da56e1b9ed1d4a624b0fd5d2123b4a5962f Mon Sep 17 00:00:00 2001 From: Wtd <1658714322@qq.com> Date: Thu, 23 Nov 2023 21:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- february-fault-common/pom.xml | 6 ++++ .../com/february/fault/domain/FaultCode.java | 2 ++ .../fault/domain/req/FaultCodeQuery.java | 36 +++++++++++++++++++ .../com/february/fault/page/PageQuery.java | 14 ++++++-- .../fault/controller/FaultCodeController.java | 10 +++++- .../fault/service/FaultCodeService.java | 1 + .../service/impl/FaultCodeServiceImpl.java | 10 +++++- 7 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 february-fault-common/src/main/java/com/february/fault/domain/req/FaultCodeQuery.java diff --git a/february-fault-common/pom.xml b/february-fault-common/pom.xml index c0a5ea1..cb67f5a 100644 --- a/february-fault-common/pom.xml +++ b/february-fault-common/pom.xml @@ -135,6 +135,12 @@ org.springframework.boot spring-boot-starter-amqp + + com.february + february-common-core + 3.6.3 + + diff --git a/february-fault-common/src/main/java/com/february/fault/domain/FaultCode.java b/february-fault-common/src/main/java/com/february/fault/domain/FaultCode.java index 2af6bf0..7731eb5 100644 --- a/february-fault-common/src/main/java/com/february/fault/domain/FaultCode.java +++ b/february-fault-common/src/main/java/com/february/fault/domain/FaultCode.java @@ -8,10 +8,12 @@ package com.february.fault.domain; **/ import com.baomidou.mybatisplus.annotation.TableName; +import com.february.fault.page.PageQuery; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/february-fault-common/src/main/java/com/february/fault/domain/req/FaultCodeQuery.java b/february-fault-common/src/main/java/com/february/fault/domain/req/FaultCodeQuery.java new file mode 100644 index 0000000..a1f1a1d --- /dev/null +++ b/february-fault-common/src/main/java/com/february/fault/domain/req/FaultCodeQuery.java @@ -0,0 +1,36 @@ +package com.february.fault.domain.req; + +import com.february.fault.page.PageQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import javax.validation.constraints.NotEmpty; + +/** + * @program: february-fault-information + * @description: 查询车辆故障码 + * @author: Mr.Wang + * @create: 2023-11-23 20:33 + **/ + +/** + * 查询车辆故障码 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class FaultCodeQuery extends PageQuery { + /** + * 故障码 + */ + @NotEmpty(message = "故障码不为空") + private String faultBh; + /** + * 故障位 + */ + @NotEmpty(message = "故障位不为空") + private String faultSeat; +} diff --git a/february-fault-common/src/main/java/com/february/fault/page/PageQuery.java b/february-fault-common/src/main/java/com/february/fault/page/PageQuery.java index 52a8b70..e1d36d4 100644 --- a/february-fault-common/src/main/java/com/february/fault/page/PageQuery.java +++ b/february-fault-common/src/main/java/com/february/fault/page/PageQuery.java @@ -5,12 +5,14 @@ package com.february.fault.page;/** * @create: 2023-11-21 09:36 **/ -import io.swagger.models.auth.In; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.february.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import org.springframework.data.domain.Page; + /** * @description: @@ -35,4 +37,12 @@ public class PageQuery { */ private String orderBy; + public Page buildPage(){ + Page page = new Page<>(this.getPage(),this.getPageSize()); + if(StringUtils.isNotEmpty(this.getOrderBy())){ + page.addOrder(OrderItem.asc(this.getOrderBy())); + } + return page; + } + } 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 11238a2..6614520 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 @@ -14,10 +14,13 @@ import com.february.common.core.domain.FaultCode; //import com.february.fault.domain.FaultCode; +import com.february.common.core.web.page.TableDataInfo; import com.february.fault.aspect.WebLog; +import com.february.fault.domain.req.FaultCodeQuery; import com.february.fault.service.FaultCodeService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -36,7 +39,7 @@ public class FaultCodeController { /** * 查询车辆故障表信息列表 - * @param faultCode + * @param * @return */ @PostMapping("/list") @@ -77,4 +80,9 @@ public class FaultCodeController { public Result delFaultCode(@RequestParam Integer faultCodeId){ return faultCodeService.delFaultCode(faultCodeId); } +// @GetMapping("/tableList") +// public Result> selectTableList(@RequestBody @Validated FaultCodeQuery faultCodeQuery){ +// TableDataInfo tableDataInfo=faultCodeService.selectTableList(faultCodeQuery); +// return Result.success(tableDataInfo); +// } } 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 1d88dd1..b160167 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 @@ -3,6 +3,7 @@ package com.february.fault.service; import com.baomidou.mybatisplus.extension.service.IService; import com.february.common.core.domain.Result; import com.february.common.core.domain.FaultCode; +import com.february.fault.domain.req.FaultCodeQuery; import java.util.List; 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 55b57d3..4a05662 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,12 +1,15 @@ package com.february.fault.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper; 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.common.core.domain.FaultCode; +import com.february.common.core.utils.StringUtils; import com.february.fault.domain.FaultType; +import com.february.fault.domain.req.FaultCodeQuery; import com.february.fault.mapper.FaultCodeMapper; import com.february.fault.mapper.FaultTypeMapper; import com.february.fault.service.FaultCodeService; @@ -31,11 +34,16 @@ public class FaultCodeServiceImpl extends ServiceImpl> faultCodeList(FaultCode faultCode) { +// LambdaQueryWrapper faultCodeLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// if(StringUtils.isNotEmpty(faultCodeQuery.getFaultBh())){ +// faultCodeLambdaQueryWrapper.eq(FaultCode::getFaultBh,faultCodeQuery.getFaultBh()); +// } + QueryWrapper faultCodeQueryWrapper = new QueryWrapper<>(); if(!Objects.equals(faultCode.getFaultBh(), "") && faultCode.getFaultBh()!=null){ faultCodeQueryWrapper.eq("fault_bh",faultCode.getFaultBh());