From d46beba25ccb64a1047a98d642b6ce45e82f0bee Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 17 十月 2022 18:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 e8d07f3..59e643e 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,6 +4,7 @@
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;
@@ -35,7 +36,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 +49,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<>();
@@ -57,6 +58,23 @@
return CommonResult.success(iCarSlagcarService
.page(carSlagcarPage, new LambdaQueryWrapper<CarSlagcar>()
.like(StringUtils.isNotBlank(carNum), CarSlagcar::getCarNumber, carNum)));
+ }
+
+
+ @ApiOperation(value = "鏌ョ湅璇︽儏鎵ф硶杞�")
+ @GetMapping("/query_enforce_one")
+ public CommonResult searchEnforceCar(@RequestParam Integer id) {
+ return CommonResult.success(iCarEnforcecarService
+ .getOne(new LambdaQueryWrapper<CarEnforcecar>()
+ .eq(CarEnforcecar::getId, id)));
+ }
+
+ @ApiOperation(value = "鏌ョ湅璇︽儏娓ｅ湡杞�")
+ @GetMapping("/query_slag_one")
+ public CommonResult searchSlagCar(@RequestParam Integer id) {
+ return CommonResult.success(iCarSlagcarService
+ .getOne(new LambdaQueryWrapper<CarSlagcar>()
+ .eq(CarSlagcar::getId, id)));
}
@ApiOperation("淇敼鎵ф硶杞�")
@@ -73,24 +91,28 @@
@ApiOperation("娣诲姞鎵ф硶杞�")
@PostMapping("/addition_enforce")
+ @LogSave(operationType = "杞︿咯绠＄悊",contain = "娣诲姞鎵ф硶杞�")
public CommonResult addEnforceCar(@RequestBody CarEnforcecar carEnforcecar) {
return CommonResult.success(iCarEnforcecarService.save(carEnforcecar));
}
@ApiOperation("娣诲姞娓ｅ湡杞�")
@PostMapping("/addition_slag")
+ @LogSave(operationType = "杞︿咯绠＄悊",contain = "娣诲姞娓ｅ湡杞�")
public CommonResult addSlagCar(@RequestBody CarSlagcar carSlagcar) {
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_enforce")
+ @DeleteMapping("/deletion_slag")
+ @LogSave(operationType = "杞︿咯绠＄悊",contain = "鍒犻櫎娓ｅ湡杞�")
public CommonResult deleteSlagCar(@RequestParam Integer id) {
return CommonResult.success(iCarSlagcarService.removeById(id));
}
--
Gitblit v1.8.0