机车查询列表分页

business-service/src/main/java/com/ozs/entity/BaseVehicle.java

@@ -2,12 +2,13 @@ package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.ozs.common.vo.PageVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 机车信息表
@@ -18,7 +19,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class BaseVehicle implements Serializable {
+public class BaseVehicle extends PageVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,7 +47,7 @@ public class BaseVehicle implements Serializable {
     /**
      * 创建时间
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 更新者
@@ -56,7 +57,7 @@ public class BaseVehicle implements Serializable {
     /**
      * 更新时间
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 备注

business-service/src/main/java/com/ozs/service/BaseVehicleService.java

@@ -1,7 +1,8 @@
 package com.ozs.service;
 
-import com.ozs.entity.BaseVehicle;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.entity.BaseVehicle;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BaseVehicleService extends IService<BaseVehicle> {
 
+    IPage<BaseVehicle> vehicleList(BaseVehicle baseVehicle);
 }

business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -1,9 +1,14 @@
 package com.ozs.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ozs.common.utils.StringUtils;
 import com.ozs.entity.BaseVehicle;
 import com.ozs.mapper.BaseVehicleMapper;
 import com.ozs.service.BaseVehicleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +22,28 @@ import org.springframework.stereotype.Service;
 @Service
 public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseVehicle> implements BaseVehicleService {
 
+    @Autowired
+    private BaseVehicleMapper baseVehicleMapper;
+
+    @Override
+    public IPage<BaseVehicle> vehicleList(BaseVehicle baseVehicle) {
+        LambdaQueryWrapper<BaseVehicle> wrapper = new LambdaQueryWrapper<BaseVehicle>();
+        if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleName())) {
+            wrapper.eq(BaseVehicle::getVehicleName, baseVehicle.getVehicleName());
+        }
+        if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
+            wrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
+        }
+        int pageNum = Integer.parseInt(baseVehicle.getPageNum().toString());
+        int pageSize = Integer.parseInt(baseVehicle.getPageSize().toString());
+        com.github.pagehelper.Page<BaseVehicle> page = PageHelper.startPage(pageNum, pageSize)
+                .doSelectPage(() -> baseVehicleMapper.selectList(wrapper));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseVehicle> pageR =
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
+        pageR.setRecords(page.getResult());
+        pageR.setTotal(page.getTotal());
+        return pageR;
+    }
+
+
 }

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -1,9 +1,21 @@
 package com.ozs.web.controller.accountmanagment;
 
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ozs.common.annotation.Log;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.enums.BusinessType;
+import com.ozs.entity.BaseVehicle;
+import com.ozs.service.BaseVehicleService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+
 /**
  * <p>
  * 机车信息表 前端控制器
@@ -13,8 +25,31 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-04-11
  */
 @RestController
-@RequestMapping("/base-vehicle")
+@RequestMapping("/baseVehicle")
+@Slf4j
 public class BaseVehicleController {
 
+    @Autowired
+    private BaseVehicleService baseVehicleService;
+
+    public static void main(String[] args) {
+        System.out.println(new Date().getTime());
+    }
+
+    /**
+     * 机车信息表 分页查询
+     *
+     * @param baseVehicle
+     * @return
+     */
+    @ApiOperation(value = "机车信息表 分页查询")
+    @PostMapping("/vehicleList")
+    @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
+    public AjaxResult vehicleList(@RequestBody BaseVehicle baseVehicle) {
+        IPage<BaseVehicle> baseVehicleList = baseVehicleService.vehicleList(baseVehicle);
+        return AjaxResult.success(baseVehicleList);
+    }
+
+
 }