fix ： 新增bug

kongdeqiang

2024-10-22 13294325b4cf59b893a7667676f086befa4df339

 src/main/java/com/boying/controller/car/PlateServlet3.java

@@ -232,19 +232,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);
        }
@@ -385,22 +385,24 @@
                if(one == null){
                    return R.failed("未查询到车辆存在");
                }else {
                    if(one.getCarNo().equals("_无_")){
                    if(one.getCarNo().equals("_无_") || one.getCarNo().equals("无牌车")){
                        enterPark.setCreateTime(LocalDateTime.now());
                        QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
                        wrapper.lambda()
                                .eq(Ticket::getCarNo,enterPark.getCarNo())
                                .eq(Ticket::getPayStatus,1);
                        List<Ticket> tickets = ticketService.list(wrapper);
                        if(tickets.size()>0){
                            enterPark.setStatus(1);//发现有违章
                        }
//                        QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
//                        wrapper.lambda()
//                                .eq(Ticket::getCarNo,enterPark.getCarNo())
//                                .eq(Ticket::getPayStatus,1);
//                        List<Ticket> tickets = ticketService.list(wrapper);
//                        if(tickets.size()>0){
//                            enterPark.setStatus(1);//发现有违章
//                        }
                        enterPark.setStatus(0);
                        enterPark.setIsPay(0);
                        enterPark.setPrice(0);
                        enterParkService.deleteByCarNo(enterPark.getCarNo(),enterPark.getParkId());
                        enterParkService.save(enterPark);
                        barrier.setType2(1);
                        barrierService.updateById(barrier);
                        String jsonValue = JSON.toJSONString(barrier);
                        redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue);
                        return R.ok();
                    }else {
                        return R.failed("非法操作");
@@ -462,6 +464,8 @@
            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){
@@ -472,7 +476,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 {
                //需要缴费或者有违章
@@ -480,6 +485,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);
            }

@@ -748,9 +755,9 @@
                    }
                }
            }
            if(StringUtils.isBlank(carDay) && !carNo.equals("_无_")){
            if(StringUtils.isBlank(carDay) && !carNo.equals("_无_") && !carNo.equals("无牌车")){
                carDay = "欢迎光临";
            }else if(StringUtils.isBlank(carDay) && carNo.equals("_无_")){
            }else if(StringUtils.isBlank(carDay) || carNo.equals("_无_") || carNo.equals("无牌车")){
                carDay = "拒绝驶入";
            }

@@ -774,7 +781,7 @@
            String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
            data1 = data1.replaceAll("\r\n", "");

            if(!carNo.equals("_无_")){
            if(!carNo.equals("_无_") && !carNo.equals("无牌车")){
                open(request,response,data1);//入场开闸
            }else {
                noOpen(request,response,data1);
@@ -849,7 +856,7 @@
        String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
        data1 = data1.replaceAll("\r\n", "");
        if(type == 0){
            if(carNo.equals("_无_")){
            if(carNo.equals("_无_") || carNo.equals("无牌车")){
                noOpen(request,response,data1);
            }else {
                if(timeStamp.contains("记录异常")){