From 50db7a8a4ce92dc140a82f9ff2c8fed6f0760959 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期日, 17 十一月 2024 09:05:17 +0800
Subject: [PATCH] fix:更新手机号出场

---
 src/main/java/com/boying/controller/car/PlateServlet3.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index d7408fb..dde6393 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -41,6 +41,8 @@
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 /**
@@ -367,6 +369,15 @@
     @PostMapping("/inParkByPhone" )
     @ResponseBody
     public Object inParkByPhone( EnterPark enterPark){
+        if(redisTemplate.hasKey("PHONE_"+enterPark.getParkId() + "_" + enterPark.getCarNo())){
+            return R.failed(null,"璇锋眰棰戠箒");
+        }
+        Pattern pattern = Pattern.compile("^1[3-9]\\d{9}$");
+        Matcher matcher = pattern.matcher(enterPark.getCarNo());
+        System.out.println();
+        if(matcher.matches()==false){
+            return R.failed(null,"杈撳叆闈炴硶鏁版嵁");
+        }
         Barrier barrier = barrierService.getById(enterPark.getBarrierId());
         if(barrier!=null){
             String num = redisTemplate.opsForValue().get("car_park_" +  barrier.getParkId());
@@ -389,6 +400,7 @@
                     return R.failed("鏈煡璇㈠埌杞﹁締瀛樺湪");
                 }else {
                     if(one.getCarNo().equals("_鏃燺") || one.getCarNo().equals("鏃犵墝杞�")){
+                        redisTemplate.opsForValue().set("PHONE_"+enterPark.getParkId() + "_" + enterPark.getCarNo(),"true",2,TimeUnit.SECONDS);
                         enterPark.setCreateTime(LocalDateTime.now());
 //                        QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
 //                        wrapper.lambda()
@@ -425,12 +437,23 @@
     @PostMapping("/outParkByPhone" )
     @ResponseBody
     public Object outParkByPhone(String code2,String carNo){
+        Pattern pattern = Pattern.compile("^1[3-9]\\d{9}$");
+        Matcher matcher = pattern.matcher(carNo);
+        System.out.println();
+        if(matcher.matches()==false){
+            return R.failed(null,"杈撳叆闈炴硶鏁版嵁");
+        }
         Barrier byCode2 = barrierService.findByCode2(code2);
         QueryWrapper<EnterPark> wrapper =new QueryWrapper<>();
         wrapper.lambda()
                 .eq(EnterPark::getParkId,byCode2.getParkId())
-                .eq(EnterPark::getCarNo,carNo);
-        EnterPark one = enterParkService.getOne(wrapper);
+                .eq(EnterPark::getCarNo,carNo)
+                .orderByDesc(EnterPark::getId);
+        List<EnterPark> list = enterParkService.list(wrapper);
+        EnterPark one = null;
+        if(list !=null && list.size()>0){
+            one = list.get(0);
+        }
         if(one != null){
             double money = 0.0;
             String toDayHrMinSec = null;

--
Gitblit v1.9.1