From fe4585554ee6ca6194f71381e69cbfdca4984bdb Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 04 十一月 2024 16:24:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index 2d59510..d7408fb 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -151,6 +151,9 @@
@PostMapping("/status")
public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
Barrier barrier = barrierService.findByCode(serialno);
+ if(barrier == null){
+ return;
+ }
Park park = parkService.getOneById(barrier.getParkId());
// Park park = parkService.getById(barrier.getParkId());
// String redis = redisTemplate.opsForValue().get("park_up_" + park.getId());
@@ -399,6 +402,7 @@
enterPark.setIsPay(0);
enterPark.setPrice(0);
enterParkService.deleteByCarNo(enterPark.getCarNo(),enterPark.getParkId());
+ enterParkService.deleteByCarNo(one.getCarNo(),enterPark.getParkId());
enterParkService.save(enterPark);
barrier.setType2(1);
String jsonValue = JSON.toJSONString(barrier);
@@ -464,8 +468,6 @@
outPark.setPrice(money);
outPark.setStatus3(findTicket(carNo));
outParkService.saveOrUpdate(outPark);
- enterParkService.deleteByCarNo("鏃犺溅鐗�", outPark.getParkId());
- enterParkService.deleteByCarNo("_鏃燺", outPark.getParkId());
byCode2.setCarNo(carNo);
//led灞曠ず
if(toDayHrMinSec == null){
--
Gitblit v1.9.1