From 7bc78d8f70a4d11e46f8bd640228804a3dd0dc68 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 22 四月 2024 10:52:29 +0800
Subject: [PATCH] Merge branch 'master2'
---
src/main/java/com/boying/controller/TicketBlackController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/boying/controller/TicketBlackController.java b/src/main/java/com/boying/controller/TicketBlackController.java
index 3a4aaf5..4694209 100644
--- a/src/main/java/com/boying/controller/TicketBlackController.java
+++ b/src/main/java/com/boying/controller/TicketBlackController.java
@@ -11,6 +11,8 @@
import com.boying.util.FileUtil;
import com.boying.util.NumberToCN;
import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
@@ -32,6 +34,7 @@
@RestController
@RequestMapping("ffzf/ticketblack")
@RequiredArgsConstructor
+@Tag(description = "ffzf/ticketblack" , name = "榛戝悕鍗曡〃鎺ュ彛" )
public class TicketBlackController {
@@ -43,17 +46,18 @@
@PostMapping("findPage")
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, TicketBlack ticket){
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(TicketBlack::getBlackType,0)
- .eq(StringUtils.isNotBlank(ticket.getCarNo()),TicketBlack::getCarNo,ticket.getCarNo())
+ .like(StringUtils.isNotBlank(ticket.getCarNo()),TicketBlack::getCarNo,ticket.getCarNo())
.eq(ticket.getIsActive() != null,TicketBlack::getIsActive,ticket.getIsActive())
.orderByDesc(TicketBlack::getCreateTime);
return R.ok(ticketBlackService.page(page, wrapper));
}
@PostMapping("/save")
+ @Operation(summary = "鏂板榛戝悕鍗�" , description = "鏂板榛戝悕鍗�" )
public Object save(TicketBlack ticket) throws IOException{
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -75,6 +79,7 @@
*/
@ApiOperation(value = "閫氳繃id鏌ヨ", notes = "閫氳繃id鏌ヨ")
@GetMapping("/{id}" )
+ @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
public R getById(@PathVariable("id" ) Integer id) {
TicketBlack byId = ticketBlackService.getById(id);
return R.ok(byId);
@@ -82,13 +87,21 @@
@PostMapping("/delete")
+ @Operation(summary = "鍒犻櫎榛戝悕鍗�" , description = "鍒犻櫎榛戝悕鍗�" )
public Object delete(Long id){
TicketBlack ticket =ticketBlackService.getById(id);
- ticketBlackService.saveOrUpdate(ticket);
- return R.ok("鎿嶄綔鎴愬姛");
+ if(ticket!=null){
+ if(ticket.getViolationCount() >0 ){
+ return R.failed("璇峰厛瑙ｅ喅杩濈珷");
+ }
+ ticketBlackService.removeById(ticket);
+ return R.ok("鎿嶄綔鎴愬姛");
+ }
+ return R.failed("鏈壘鍒拌杞�");
}
@PostMapping("/updateById")
+ @Operation(summary = "鏇存柊榛戝悕鍗�" , description = "鏇存柊榛戝悕鍗�" )
public Object updateById(TicketBlack ticket){
return R.ok( ticketBlackService.updateById(ticket));
}
--
Gitblit v1.9.1