fix:合并代码

kongdeqiang

2024-09-26 da9a4f7ad988c452f3a356989eaf7a6c06ae5032

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

@@ -385,7 +385,7 @@
                if(one == null){
                    return R.failed("未查询到车辆存在");
                }else {
                    if(one.getCarNo().equals("无牌车")){
                    if(one.getCarNo().equals("_无_")){
                        enterPark.setCreateTime(LocalDateTime.now());
                        QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
                        wrapper.lambda()
@@ -748,9 +748,9 @@
                    }
                }
            }
            if(StringUtils.isBlank(carDay) && !carNo.equals("无牌车")){
            if(StringUtils.isBlank(carDay) && !carNo.equals("_无_")){
                carDay = "欢迎光临";
            }else if(StringUtils.isBlank(carDay) && carNo.equals("无牌车")){
            }else if(StringUtils.isBlank(carDay) && carNo.equals("_无_")){
                carDay = "拒绝驶入";
            }

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

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