From fcdab15d11fc8c250a3b33d9b0795abef44be50f Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 22 二月 2023 08:11:38 +0800
Subject: [PATCH] 默认变更列表
---
src/main/java/com/boying/controller/car/PlateServlet.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 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..31c3651 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet.java
@@ -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;
+ }
}
}
}
--
Gitblit v1.9.1