From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化
---
ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 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..beaffb5 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,16 +4,22 @@
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.dto.carManage.CarEnforcecarVo;
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;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -35,20 +41,16 @@
@ApiOperation(value = "鏌ヨ鎵ф硶杞�")
@GetMapping("/query_enforce")
- public CommonResult searchEnforceCar(@RequestParam String carNum,
- @RequestParam Integer size,
- @RequestParam Integer current) {
- Page<CarEnforcecar> carEnforcecarPage = new Page<>();
- carEnforcecarPage.setSize(size);
- carEnforcecarPage.setCurrent(current);
- return CommonResult.success(iCarEnforcecarService
- .page(carEnforcecarPage, new LambdaQueryWrapper<CarEnforcecar>()
- .like(StringUtils.isNotBlank(carNum), CarEnforcecar::getCarNumber, carNum)));
+ public CommonResult<Page<CarEnforcecarVo>> searchEnforceCar(@RequestParam(required = false) String carNum,
+ @RequestParam Integer size,
+ @RequestParam Integer current) {
+ Page<CarEnforcecarVo> page = iCarEnforcecarService.searchEnforceCar(size, current, carNum);
+ return CommonResult.success(page);
}
@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 +59,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,25 +92,55 @@
@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_enforce")
+ @DeleteMapping("/deletion_slag")
+ @LogSave(operationType = "杞︿咯绠＄悊", contain = "鍒犻櫎娓ｅ湡杞�")
public CommonResult deleteSlagCar(@RequestParam Integer id) {
return CommonResult.success(iCarSlagcarService.removeById(id));
}
+
+ @ApiOperation("鎵归噺鍒犻櫎鎵ф硶杞�")
+ @DeleteMapping("/batch_deletion_enforce")
+ @LogSave(operationType = "杞﹁締绠＄悊", contain = "鎵归噺鍒犻櫎鎵ф硶杞�")
+ public CommonResult batchDeleteEnforce(@RequestParam List<Long> ids) {
+ return CommonResult.success(iCarEnforcecarService.removeBatchByIds(ids));
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎娓ｅ湡杞�")
+ @DeleteMapping("/batch_deletion_slag")
+ @LogSave(operationType = "杞﹁締绠＄悊", contain = "鎵归噺鍒犻櫎娓ｅ湡杞�")
+ public CommonResult batchDeleteSlag(@RequestParam List<Long> ids) {
+ return CommonResult.success(iCarSlagcarService.removeBatchByIds(ids));
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0