From 4722c9d44d1cb941920776016567daf077d87e13 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 24 十月 2022 16:33:00 +0800
Subject: [PATCH] 修改消息分页查询
---
ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
index 69cad1b..fcad4b0 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.carManage.CarEnforcecar;
import com.ycl.entity.carManage.CarSlagcar;
+import com.ycl.enums.common.ResultCode;
+import com.ycl.exception.ApiException;
import com.ycl.service.carManage.ICarEnforcecarService;
import com.ycl.service.carManage.ICarSlagcarService;
import io.swagger.annotations.Api;
@@ -35,7 +38,7 @@
@ApiOperation(value = "鏌ヨ鎵ф硶杞�")
@GetMapping("/query_enforce")
- public CommonResult searchEnforceCar(@RequestParam String carNum,
+ public CommonResult searchEnforceCar(@RequestParam(required = false) String carNum,
@RequestParam Integer size,
@RequestParam Integer current) {
Page<CarEnforcecar> carEnforcecarPage = new Page<>();
@@ -48,7 +51,7 @@
@ApiOperation(value = "鏌ヨ娓ｅ湡杞�")
@GetMapping("/query_slag")
- public CommonResult searchSlagCar(@RequestParam String carNum,
+ public CommonResult searchSlagCar(@RequestParam(required = false) String carNum,
@RequestParam Integer size,
@RequestParam Integer current) {
Page<CarSlagcar> carSlagcarPage = new Page<>();
@@ -90,24 +93,40 @@
@ApiOperation("娣诲姞鎵ф硶杞�")
@PostMapping("/addition_enforce")
+ @LogSave(operationType = "杞︿咯绠＄悊", contain = "娣诲姞鎵ф硶杞�")
public CommonResult addEnforceCar(@RequestBody CarEnforcecar carEnforcecar) {
+ CarEnforcecar enforceCar = iCarEnforcecarService
+ .getOne(new LambdaQueryWrapper<CarEnforcecar>()
+ .eq(CarEnforcecar::getCarNumber, carEnforcecar.getCarNumber()));
+ if (enforceCar != null && StringUtils.isNotBlank(enforceCar.getCarNumber())) {
+ throw new ApiException(ResultCode.CAR_NUMBER_REPETITION.getMessage());
+ }
return CommonResult.success(iCarEnforcecarService.save(carEnforcecar));
}
@ApiOperation("娣诲姞娓ｅ湡杞�")
@PostMapping("/addition_slag")
+ @LogSave(operationType = "杞︿咯绠＄悊", contain = "娣诲姞娓ｅ湡杞�")
public CommonResult addSlagCar(@RequestBody CarSlagcar carSlagcar) {
+ CarSlagcar slagCar = iCarSlagcarService
+ .getOne(new LambdaQueryWrapper<CarSlagcar>()
+ .eq(CarSlagcar::getCarNumber, carSlagcar.getCarNumber()));
+ if (slagCar != null && StringUtils.isNotBlank(slagCar.getCarNumber())) {
+ throw new ApiException(ResultCode.CAR_NUMBER_REPETITION.getMessage());
+ }
return CommonResult.success(iCarSlagcarService.save(carSlagcar));
}
@ApiOperation("鍒犻櫎鎵ф硶杞�")
@DeleteMapping("/deletion_enforce")
+ @LogSave(operationType = "杞︿咯绠＄悊", contain = "鍒犻櫎鎵ф硶杞�")
public CommonResult deleteEnforceCar(@RequestParam Integer id) {
return CommonResult.success(iCarEnforcecarService.removeById(id));
}
@ApiOperation("鍒犻櫎娓ｅ湡杞�")
@DeleteMapping("/deletion_slag")
+ @LogSave(operationType = "杞︿咯绠＄悊", contain = "鍒犻櫎娓ｅ湡杞�")
public CommonResult deleteSlagCar(@RequestParam Integer id) {
return CommonResult.success(iCarSlagcarService.removeById(id));
}
--
Gitblit v1.8.0