From 64b11e539b05798b7b460305d2ee36e81489d8ae Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 03 十二月 2024 17:31:22 +0800
Subject: [PATCH] fix ： 新增修改出场接口
---
src/main/java/com/boying/controller/WhiteListController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/boying/controller/WhiteListController.java b/src/main/java/com/boying/controller/WhiteListController.java
index 4869fb2..6fba87b 100644
--- a/src/main/java/com/boying/controller/WhiteListController.java
+++ b/src/main/java/com/boying/controller/WhiteListController.java
@@ -8,30 +8,31 @@
import com.boying.entity.WhiteList;
import com.boying.service.ParkService;
import com.boying.service.WhiteListService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
@RestController
@RequestMapping("ffzf/whiteList")
@RequiredArgsConstructor
-@Tag(description = "ffzf/whiteList" , name = "鐧藉悕鍗曟帴鍙�" )
public class WhiteListController{
private final WhiteListService whiteListService;
private final ParkService parkService;
@PostMapping("/findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ //@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, String carNo) {
QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .orderByDesc(WhiteList::getId)
- .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
+ .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
+ .orderByDesc(WhiteList::getId);
Page<WhiteList> page1 = whiteListService.page(page, wrapper);
for (WhiteList record : page1.getRecords()) {
if(record.getParkId() != null){
@@ -42,12 +43,19 @@
}
@PostMapping("/findPageNew")
- @Operation(summary = "鍒嗛〉鏌ヨ锛堟柊锛�" , description = "鍒嗛〉鏌ヨ锛堟柊锛�" )
- public Object findPageNew(Page page, String carNo) {
+ public Object findPageNew(Page page, String carNo,Integer type,String date) throws ParseException {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if(StringUtils.isNotBlank(date)){
+ System.out.println(date);
+ Date parse = sdf.parse(date);
+ date = sdf.format(parse);
+ }
QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
wrapper.lambda()
.orderByDesc(WhiteList::getId)
- .eq(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
+ .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
+ .eq(type!=null,WhiteList::getType,type)
+ .le(StringUtils.isNotBlank(date),WhiteList::getEndTime,date);
Page<WhiteList> page1 = whiteListService.page(page, wrapper);
for (WhiteList record : page1.getRecords()) {
if(StringUtils.isNotBlank(record.getParkIds())){
@@ -69,14 +77,12 @@
}
@PostMapping("/save")
- @Operation(summary = "鏂板鐧藉悕鍗�" , description = "鏂板鐧藉悕鍗�" )
public Object save(WhiteList whiteList) {
whiteListService.saveOrUpdate(whiteList);
return R.ok("淇濆瓨鎴愬姛");
}
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎鐧藉悕鍗�" , description = "鍒犻櫎鐧藉悕鍗�" )
public Object delete(Long id) {
whiteListService.removeById(id);
return R.ok("鍒犻櫎鎴愬姛");
--
Gitblit v1.9.1