From 552c700f584700316e8d1919dd1ad7f551c53ec4 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 12 十一月 2024 10:03:22 +0800
Subject: [PATCH] fix : 新增日统计接口

---
 src/main/java/com/boying/controller/car/PlateServlet3.java |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index f942c1b..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());
@@ -232,19 +235,19 @@
                         redisTemplate.delete("outPark-"+outPark.getBarrierId());
                     }
                 }
-                if(barrier.getType() == 1){
-                    boolean in = barrierService.getDateDifIn(park.getId());
-                    if(in){
-                        inLedShowDefault(park.getId(),request,response);
-                    }
-                }else if(barrier.getType() == 0){
-                    boolean out = barrierService.getDateDifOut(barrier.getId());
-                    if(out){
-                        outLedShowDefault(request,response);
-                    }
+
+            }
+            if(barrier.getType() == 1){
+                boolean in = barrierService.getDateDifIn(park.getId());
+                if(in){
+                    inLedShowDefault(park.getId(),request,response);
+                }
+            }else if(barrier.getType() == 0){
+                boolean out = barrierService.getDateDifOut(barrier.getId());
+                if(out){
+                    outLedShowDefault(request,response);
                 }
             }
-
         }else {
             easyNoOpen(request,response);
         }
@@ -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);
@@ -474,7 +478,8 @@
                 String s= "1."+byCode2.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐筡n";
                 writeTxt2(s);
                 byCode2.setType2(1);
-                barrierService.updateById(byCode2);
+                String jsonValue = JSON.toJSONString(byCode2);
+                redisTemplate.opsForValue().set("barrier-"+byCode2.getCode(), jsonValue);
                 return R.ok(outPark);
             }else {
                 //闇�瑕佺即璐规垨鑰呮湁杩濈珷
@@ -482,6 +487,8 @@
                 String s= "1."+byCode2.getCarNo()+"璇ヨ溅闇�瑕佺即璐筡n";
                 writeTxt2(s);
                 barrierService.updateById(byCode2);
+                String jsonValue = JSON.toJSONString(byCode2);
+                redisTemplate.opsForValue().set("barrier-"+byCode2.getCode(), jsonValue);
                 return R.ok(outPark);
             }
 

--
Gitblit v1.9.1