diff --git a/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCustomerController.java b/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCustomerController.java index cdae97d..145c1ed 100644 --- a/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCustomerController.java +++ b/cpxt-admin/src/main/java/com/cpxt/web/controller/biz/BizCustomerController.java @@ -2,16 +2,13 @@ package com.cpxt.web.controller.biz; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cpxt.biz.domain.BizCarModel; +import com.cpxt.common.constant.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.cpxt.common.annotation.Log; import com.cpxt.common.core.controller.BaseController; import com.cpxt.common.core.domain.AjaxResult; @@ -35,15 +32,31 @@ public class BizCustomerController extends BaseController private IBizCustomerService bizCustomerService; /** - * 查询客户列表 + * 查询客户列表（分页） */ @PreAuthorize("@ss.hasPermi('biz:customer:list')") @GetMapping("/list") - public TableDataInfo list(BizCustomer bizCustomer) + public TableDataInfo list(BizCustomer bizCustomer, + @RequestParam(defaultValue = "1") int pageNum, + @RequestParam(defaultValue = "10") int pageSize) { - startPage(); - List list = bizCustomerService.selectBizCustomerList(bizCustomer); - return getDataTable(list); + Page recordPage = bizCustomerService.selectBizCustomerPage(bizCustomer,pageNum,pageSize); + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(recordPage.getRecords()); + rspData.setTotal(recordPage.getTotal()); + return rspData; + } + + /** + * 查询客户列表 + */ + @PreAuthorize("@ss.hasPermi('biz:customer:list')") + @GetMapping("/list2") + public AjaxResult list(BizCustomer bizCustomer) + { + return AjaxResult.success(bizCustomerService.selectBizCustomerList(bizCustomer)); } /** diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerWarehouse.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerWarehouse.java index 02b669c..1809a9d 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerWarehouse.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerWarehouse.java @@ -17,7 +17,7 @@ import com.cpxt.common.core.domain.BaseEntity; * @date 2024-12-16 */ @Data -public class BizCustomerWarehouse extends BaseEntity +public class BizCustomerWarehouse { private static final long serialVersionUID = 1L; diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarMapper.java index 3dfff1d..9ceb48f 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarMapper.java @@ -2,8 +2,11 @@ package com.cpxt.biz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizCar; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; /** * 车辆Mapper接口 @@ -14,6 +17,9 @@ import org.apache.ibatis.annotations.Select; @Mapper public interface BizCarMapper extends BaseMapper { + @Update("create table ${tableName} as select * from track_temp") + void createTable(String tableName); + @Select("select * from biz_car where car_no = #{carNo}") BizCar selectByCarNo(String carNo); } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCustomerService.java b/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCustomerService.java index d227e16..f4fcaf3 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCustomerService.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/IBizCustomerService.java @@ -1,6 +1,8 @@ package com.cpxt.biz.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cpxt.biz.domain.BizCustomer; /** @@ -19,6 +21,8 @@ public interface IBizCustomerService */ public BizCustomer selectBizCustomerById(Long id); + Page selectBizCustomerPage(BizCustomer bizCustomer, int pageNum, int pageSize); + /** * 查询客户列表 * @@ -58,4 +62,6 @@ public interface IBizCustomerService * @return 结果 */ public int deleteBizCustomerById(Long id); + + } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java index dd669f6..5192709 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java @@ -93,7 +93,14 @@ public class BizCarServiceImpl implements IBizCarService @Override public int insertBizCar(BizCar bizCar) { - return bizCarMapper.insert(bizCar); + int i = bizCarMapper.insert(bizCar); + // 新增完车辆后，创建该车辆的行驶轨迹表 + if (i > 0){ + Long id = bizCar.getId(); + String tableName = "track_" + id; + bizCarMapper.createTable(tableName); + } + return i; } /** diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java index bf95432..a2af5c7 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java @@ -5,9 +5,11 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cpxt.biz.domain.BizCarModel; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import com.cpxt.biz.mapper.BizCustomerMapper; import com.cpxt.biz.domain.BizCustomer; @@ -37,6 +39,20 @@ public class BizCustomerServiceImpl implements IBizCustomerService return bizCustomerMapper.selectById(id); } + /** + * 查询客户列表（分页） + * + * @param bizCustomer 客户 + * @return 客户 + */ + @Override + public Page selectBizCustomerPage(BizCustomer bizCustomer, int pageNum, int pageSize) { + LambdaQueryWrapper queryWrapper= new LambdaQueryWrapper<>(); + + return bizCustomerMapper.selectPage(new Page<>(pageNum,pageSize),queryWrapper); + } + + /** * 查询客户列表 * diff --git a/cpxt-system/src/main/resources/mapper/biz/BizCarMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizCarMapper.xml new file mode 100644 index 0000000..b6cd4bd --- /dev/null +++ b/cpxt-system/src/main/resources/mapper/biz/BizCarMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file