From bac87061c69aaca6c23a84e08f76f3dfd0c77c4a Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期五, 11 十月 2024 15:46:32 +0800
Subject: [PATCH] fix:更新出场

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

diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index afd3e77..bc44840 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -385,7 +385,7 @@
                 if(one == null){
                     return R.failed("鏈煡璇㈠埌杞﹁締瀛樺湪");
                 }else {
-                    if(one.getCarNo().equals("鏃犵墝杞�")){
+                    if(one.getCarNo().equals("_鏃燺") || one.getCarNo().equals("鏃犵墝杞�")){
                         enterPark.setCreateTime(LocalDateTime.now());
                         QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
                         wrapper.lambda()
@@ -748,9 +748,9 @@
                     }
                 }
             }
-            if(StringUtils.isBlank(carDay) && !carNo.equals("鏃犵墝杞�")){
+            if(StringUtils.isBlank(carDay) && !carNo.equals("_鏃燺") && !carNo.equals("鏃犵墝杞�")){
                 carDay = "娆㈣繋鍏変复";
-            }else if(StringUtils.isBlank(carDay) && carNo.equals("鏃犵墝杞�")){
+            }else if(StringUtils.isBlank(carDay) || carNo.equals("_鏃燺") || carNo.equals("鏃犵墝杞�")){
                 carDay = "鎷掔粷椹跺叆";
             }
 
@@ -774,7 +774,7 @@
             String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
             data1 = data1.replaceAll("\r\n", "");
 
-            if(!carNo.equals("鏃犵墝杞�")){
+            if(!carNo.equals("_鏃燺") && !carNo.equals("鏃犵墝杞�")){
                 open(request,response,data1);//鍏ュ満寮�闂�
             }else {
                 noOpen(request,response,data1);
@@ -849,7 +849,7 @@
         String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
         data1 = data1.replaceAll("\r\n", "");
         if(type == 0){
-            if(carNo.equals("鏃犵墝杞�")){
+            if(carNo.equals("_鏃燺") || carNo.equals("鏃犵墝杞�")){
                 noOpen(request,response,data1);
             }else {
                 if(timeStamp.contains("璁板綍寮傚父")){
@@ -883,21 +883,21 @@
                     String jsonValue = JSON.toJSONString(outPark);
                     redisTemplate.opsForValue().set("outPark-"+outPark.getBarrierId(), jsonValue);
 
-                    enterParkService.deleteByCarNo(carNo, parkId);
+                    //enterParkService.deleteByCarNo(carNo, parkId);
                     redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
-                    int i = Integer.parseInt(redisnum);
-                    i--;
-                    if(i<0){
-                        String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
-                        writeTxt2(s);
-                        redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
-                        redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
-                    }else {
-                        String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
-                        writeTxt2(s);
-                        redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
-                        redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
-                    }
+//                    int i = Integer.parseInt(redisnum);
+//                    i--;
+//                    if(i<0){
+//                        String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
+//                        writeTxt2(s);
+//                        redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+//                        redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+//                    }else {
+//                        String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+//                        writeTxt2(s);
+//                        redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+//                        redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+//                    }
                 }
 
             }

--
Gitblit v1.9.1