kongdeqiang
2024-10-16 0dbcef10ee43cdab704ecf5e81fec50e884569e5
src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -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("非法操作");
@@ -748,9 +750,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 +776,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 +851,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("记录异常")){
@@ -877,7 +879,7 @@
                    }
                }else {
                    //开闸
                   // open(request,response,data1);
                    open(request,response,data1);
                    //缓存在redis里,心跳接口去抬杆
                    String jsonValue = JSON.toJSONString(outPark);