From 85f5baee0e3d255860395278dcb5cbb5cc766023 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 10 七月 2023 15:13:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/car/PlateServlet.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet.java b/src/main/java/com/boying/controller/car/PlateServlet.java
index f1760f6..9fa4d11 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet.java
@@ -37,7 +37,7 @@
* Servlet implementation class PlateServlet
*/
@Controller
-@RequestMapping("/car")
+@RequestMapping("/car1")
@RequiredArgsConstructor
public class PlateServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -211,6 +211,7 @@
s+="鏌ヨ閬撻椄涓虹┖\n";
}else{
if(barrier.getType()==0){
+ //noOpen(request,response);
outPark(license, barrier.getId(), barrier.getParkId());
s+=license+"-淇濆瓨鍑哄満璁板綍\n";
}else{
@@ -224,6 +225,7 @@
if(Integer.parseInt(num) >= byId.getNum() ){
//led鏄剧ず
Boolean aBoolean = inLedFullShow(code, license,barrier.getParkId());
+ noOpen(request,response);
}else {
//led鏄剧ず
Boolean aBoolean = inLedShow(code, license,barrier.getParkId());
@@ -348,31 +350,32 @@
wrapper.lambda()
.eq(WhiteList::getCarNo,carNo);
List<WhiteList> all = whiteListService.list(wrapper);
-
- for(WhiteList w : all){
- if(w.getType()==0){
- outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId());
- barrier.setType2(1);
- barrierService.saveOrUpdate(barrier);
- OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
- outParkService.saveOrUpdate(byCarNoAndBarrierId);
- return 0.0;
- }else{
- if(w.getParkIds()!=null){
- if(w.getEndTime()!=null){
- String parkIds = w.getParkIds();
- String[] split = parkIds.split(",");
- for (String s : split) {
- int pid = Integer.parseInt(s);
- if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){
- outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId());
- barrier.setType2(1);
- barrierService.saveOrUpdate(barrier);
- OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
- outParkService.saveOrUpdate(byCarNoAndBarrierId);
- return 0.0;
+ if(all.size() >0){
+ for(WhiteList w : all){
+ if(w.getType()==0){
+ outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId());
+ barrier.setType2(1);
+ barrierService.saveOrUpdate(barrier);
+ OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
+ byCarNoAndBarrierId.setStatus(1);
+ outParkService.saveOrUpdate(byCarNoAndBarrierId);
+ return 0.0;
+ }else{
+ if(w.getParkIds()!=null){
+ if(w.getEndTime()!=null){
+ String parkIds = w.getParkIds();
+ String[] split = parkIds.split(",");
+ for (String s : split) {
+ int pid = Integer.parseInt(s);
+ if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){
+ outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId());
+ barrier.setType2(1);
+ barrierService.saveOrUpdate(barrier);
+ OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
+ byCarNoAndBarrierId.setStatus(1);
+ outParkService.saveOrUpdate(byCarNoAndBarrierId);
+ return 0.0;
+ }
}
}
}
@@ -381,6 +384,7 @@
}
outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId());
if(outPark.getPrice()==0&&outPark.getStatus3()==0){
+ System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
barrier.setType2(1);
}
barrierService.saveOrUpdate(barrier);
--
Gitblit v1.9.1