修改代码

february-fault-common/pom.xml

@@ -135,6 +135,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.february</groupId>
+            <artifactId>february-common-core</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+
     </dependencies>
 
 </project>

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;

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;
+}

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 <T> Page<T> buildPage(){
+        Page<T> page = new Page<>(this.getPage(),this.getPageSize());
+        if(StringUtils.isNotEmpty(this.getOrderBy())){
+            page.addOrder(OrderItem.asc(this.getOrderBy()));
+        }
+        return page;
+    }
+
 }

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<TableDataInfo<FaultCode>> selectTableList(@RequestBody @Validated FaultCodeQuery faultCodeQuery){
+//        TableDataInfo<FaultCode> tableDataInfo=faultCodeService.selectTableList(faultCodeQuery);
+//        return Result.success(tableDataInfo);
+//    }
 }

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;
 

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<FaultCodeMapper, FaultCode
     private FaultCodeMapper faultCodeMapper;
     /**
      * 列表加查询加分页
-     * @param faultCode
+     * @param
      * @return
      */
     @Override
     public Result<List<FaultCode>> faultCodeList(FaultCode faultCode) {
+//        LambdaQueryWrapper<FaultCode> faultCodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        if(StringUtils.isNotEmpty(faultCodeQuery.getFaultBh())){
+//            faultCodeLambdaQueryWrapper.eq(FaultCode::getFaultBh,faultCodeQuery.getFaultBh());
+//        }
+
         QueryWrapper<FaultCode> faultCodeQueryWrapper = new QueryWrapper<>();
         if(!Objects.equals(faultCode.getFaultBh(), "") && faultCode.getFaultBh()!=null){
             faultCodeQueryWrapper.eq("fault_bh",faultCode.getFaultBh());