Merge remote-tracking branch 'origin/master'

kongdeqiang

2024-11-04 fe4585554ee6ca6194f71381e69cbfdca4984bdb

Merge remote-tracking branch 'origin/master'

 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){