From f9a85d68b1a08b03753d297f76bd4e87bb4d2b3e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 11 四月 2024 14:42:26 +0800
Subject: [PATCH] fix：手动抬杆接口更新
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index 3aaf2e4..9cde223 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -331,8 +331,8 @@
inLedFullShow(code, license,barrier.getParkId(),request,response);
}else {
//led鏄剧ず
- inLedShow(code, license,barrier.getParkId(),request,response);
enterPark(license,barrier.getId(),barrier.getParkId(),fileInfo);
+ inLedShow(code, license,barrier.getParkId(),request,response);
s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
}
}
@@ -740,9 +740,9 @@
}
}
}
- if(StringUtils.isBlank(carDay) && !carNo.equals("鏃犺溅鐗�")){
+ if(StringUtils.isBlank(carDay) && !carNo.equals("鏃犵墝杞�")){
carDay = "娆㈣繋鍏変复";
- }else if(StringUtils.isBlank(carDay) && carNo.equals("鏃犺溅鐗�")){
+ }else if(StringUtils.isBlank(carDay) && carNo.equals("鏃犵墝杞�")){
carDay = "鎷掔粷椹跺叆";
}
@@ -766,7 +766,7 @@
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
- if(!carNo.equals("鏃犺溅鐗�")){
+ if(!carNo.equals("鏃犵墝杞�")){
open(request,response,data1);//鍏ュ満寮�闂�
}else {
noOpen(request,response,data1);
@@ -841,11 +841,32 @@
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
if(type == 0){
- if(carNo.equals("鏃犺溅鐗�")){
+ if(carNo.equals("鏃犵墝杞�")){
noOpen(request,response,data1);
}else {
if(timeStamp.contains("璁板綍寮傚父")){
- noOpen(request,response,data1);
+ OutPark by5min = outParkService.findBy5min(carNo, parkId, LocalDateTime.now());
+ if(by5min != null){
+ //寮�闂�
+ open(request,response,data1);
+ 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);
+ }
+ }else {
+ noOpen(request,response,data1);
+ }
}else {
//寮�闂�
open(request,response,data1);
--
Gitblit v1.9.1