From 68270a251b81502f815ecbd04cb2ab23f3978d24 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 09 四月 2024 13:37:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/boying/service/OutParkService.java | 3 +++
src/main/java/com/boying/service/impl/OutParkServiceImpl.java | 19 +++++++++++++++++++
src/main/java/com/boying/controller/car/PlateServlet3.java | 2 +-
3 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index 198c90e..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";
}
}
diff --git a/src/main/java/com/boying/service/OutParkService.java b/src/main/java/com/boying/service/OutParkService.java
index f1074af..d655027 100644
--- a/src/main/java/com/boying/service/OutParkService.java
+++ b/src/main/java/com/boying/service/OutParkService.java
@@ -44,6 +44,9 @@
OutPark findByOrderId(String txnOrderId);
OutPark findBy5min(String carNo, Integer parkId, LocalDateTime dateTime);
+ OutPark findBy10min(String carNo, Integer parkId, LocalDateTime dateTime);
+ OutPark findBy5min2(String carNo, Integer parkId, LocalDateTime dateTime);
+
OutPark findBy10min(String carNo, Integer parkId, LocalDateTime dateTime, Integer outParkId);
}
diff --git a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
index c93130c..c6ace3d 100644
--- a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
@@ -232,6 +232,25 @@
}
@Override
+ public OutPark findBy5min2(String carNo, Integer parkId,LocalDateTime dateTime) {
+ LocalDateTime localDateTime = dateTime.minusMinutes(7);
+ QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(OutPark::getCarNo,carNo)
+ .eq(OutPark::getParkId,parkId)
+ .ge(OutPark::getCreateTime,localDateTime)
+ .ge(OutPark::getPrice,0)
+ .ne(OutPark::getStatus,1)
+ .isNotNull(OutPark::getPayCode)
+ .isNotNull(OutPark::getEnterTime);
+ List<OutPark> outParks = outParkMapper.selectList(wrapper);
+ if(outParks != null && outParks.size()>0){
+ return outParks.get(0);
+ }
+ return null;
+ }
+
+ @Override
public List<OutPark> getList(long current, long size, String carNo, Long parkId, String payCode, String date) {
return outParkMapper.getList((current-1)*size,size,carNo,parkId,payCode,date);
}
--
Gitblit v1.9.1