jiangping
2025-05-07 a383a31892e2d3c43771f0d96eacba819411dc9b
最新版本541200007
已修改1个文件
32 ■■■■■ 文件已修改
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -576,6 +576,7 @@
                record.setMemberType(Constants.ZERO);
                record.setIsdeleted(Constants.ZERO);
                record.setMemberName(visits.getName());
                record.setCarCode(request.getData().getVisitorInformationList().get(0).getPlateNo());
                record.setObjId(visits.getId());
                record.setMemberId(visits.getMemberId());
                record.setObjType(Constants.TWO);
@@ -584,6 +585,21 @@
                record.setInOrOut(Constants.ZERO);
                record.setHkEventId(request.getEventId());
                record.setHkId(visits.getHkId());
                Category category = null;
                if(StringUtils.isNotBlank(record.getCarCode())){
                      category = categoryMapper.selectJoinOne(Category.class, new MPJLambdaWrapper<Category>()
                            .selectAll(Category.class)
                            .select("t4.name",Category::getParentName)
                            .leftJoin("category t4 on t.parent_id=t4.id")
                            .eq(Category::getIsdeleted,Constants.ZERO)
                            .eq(Category::getBizType,Constants.RetentionCarType.fkCar)
                            .last("limit 1"));
                      if(category ==null){
                          category = new Category();
                          category.setName("访客车辆");
                      }
                    category.setParentName(StringUtils.defaultString(category.getParentName(),"访客车辆"));
                }
                //如果是访客通行
                if(request.getData()!=null&&request.getData().getParamValues()!=null &&
                        StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
@@ -600,6 +616,20 @@
                         !StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
                    inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
                    record.setInOrOut(Constants.ONE);
                }
                if(record.getCarCode()!=null){
                    record.setCarBizType(Constants.RetentionCarType.fkCar);
                    record.setCategoryId(category.getId());
                    record.setCategoryName(category.getName());
                    record.setCategoryParentId(category.getParentId());
                    record.setCategoryParentName(category.getParentName());
                    record.setRemark("访客跟随车辆离园并自动签离");
                    try {
                        //访客申请自动签离
                        visitsService.visitLevelForCarOut(visits);
                    }catch (Exception e){
                        log.error("访客跟随车辆出园自动签离失败:==========="+e.getMessage());
                    }
                }
                inoutRecordList.add(record);
            }
@@ -1038,7 +1068,7 @@
                carrecord.setInOrOut(Constants.ONE);
            }
            //车辆进入记录对应业务类型
            if(isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
            if(1==2 && isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
                //如果未识别到车型,不是固定车 也不是货运车辆,则检查是否是访客车
                visitsList =  visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
                                .eq(Visits::getCarNos,event.getPlateNos())