From acf352921487e857810a943b008121e33404e9ae Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期二, 15 四月 2025 16:56:50 +0800
Subject: [PATCH] fix:白名单新增bug
---
src/main/java/com/boying/controller/WhiteListController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/boying/controller/WhiteListController.java b/src/main/java/com/boying/controller/WhiteListController.java
index e4d27a3..3c804ec 100644
--- a/src/main/java/com/boying/controller/WhiteListController.java
+++ b/src/main/java/com/boying/controller/WhiteListController.java
@@ -9,13 +9,19 @@
import com.boying.service.ParkService;
import com.boying.service.WhiteListService;
import lombok.RequiredArgsConstructor;
+import org.apache.catalina.security.SecurityUtil;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.security.Security;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
@RestController
-@RequestMapping("whiteList")
+@RequestMapping("ffzf/whiteList")
@RequiredArgsConstructor
public class WhiteListController{
@@ -23,11 +29,12 @@
private final ParkService parkService;
@PostMapping("/findPage")
+ //@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, String carNo) {
QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .orderByDesc(WhiteList::getId)
- .eq(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){
@@ -38,11 +45,19 @@
}
@PostMapping("/findPageNew")
- 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())){
@@ -65,6 +80,13 @@
@PostMapping("/save")
public Object save(WhiteList whiteList) {
+ if(StringUtils.isBlank(whiteList.getCarNo())){
+ return R.failed("璇疯緭鍏ユ纭溅鐗屽彿");
+ }
+ whiteList.setCarNo(whiteList.getCarNo().replaceAll("\\s", ""));
+ if(whiteList.getCarNo().length()>7){
+ return R.failed("璇疯緭鍏ユ纭溅鐗屽彿");
+ }
whiteListService.saveOrUpdate(whiteList);
return R.ok("淇濆瓨鎴愬姛");
}
--
Gitblit v1.9.1