最新版本

nidapeng

2024-04-19 89610234a2bdc56f60e0998045892ef2672edccc

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -115,7 +115,7 @@
        }catch (Exception e) {
            log.error("【海康门禁事件推送】========失败=======：\n" + e.getMessage());
        }finally {
            saveInterfaceLog(param,"/business/hksync/push/acs",result);
            saveInterfaceLog(param,"/business/hksync/push/acs",result,false);//不计日志
        }
        return  null;

@@ -306,7 +306,7 @@

            log.error("【海康访客事件推送】========失败=======：\n"+e.getMessage());
        }
        saveInterfaceLog(param,"/business/hksync/push/visit",result);
        saveInterfaceLog(param,"/business/hksync/push/visit",result,true);
        return  null;

    }
@@ -478,7 +478,7 @@

            log.error("【海康停车场事件推送】========失败=======：\n"+e.getMessage());
        }
        saveInterfaceLog(param,"/business/hksync/push/parks",result);
        saveInterfaceLog(param,"/business/hksync/push/parks",result,false);
        return  null;
    }

@@ -541,14 +541,25 @@
            event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
        }
        if(StringUtils.isNotBlank(event.getPlateNos())){
                ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
                        .eq(ParkBook::getCarCode,event.getPlateNos())
                                .eq(ParkBook::getIsdeleted,Constants.ZERO )
            ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
                    .eq(ParkBook::getCarCode,event.getPlateNos())
                            .eq(ParkBook::getIsdeleted,Constants.ZERO )
                    .last("limit 1" ));
            if(cars!=null){
                event.setMemberId(cars.getMemberId());
            }else{
                Visits visits =  visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
                        .eq(Visits::getCarNos,event.getPlateNos())
                        .eq(Visits::getIsdeleted,Constants.ZERO )
                        .in(Visits::getStatus,Constants.VisitStatus.signin,Constants.VisitStatus.signout)//最近一个已到达或者已签离
                        .isNull(Visits::getParentId)
                        .orderByDesc(Visits::getId)
                        .last("limit 1" ));
                if(cars!=null){
                    event.setMemberId(cars.getMemberId());
                if(visits!=null){
                    //最近使用该车的申请人（已到达）
                    event.setMemberId(visits.getMemberId());
                }

            }
            if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
                //如果是入厂放行
                delRetentionList.add(event.getPlateNos());
@@ -575,7 +586,10 @@
        return retention;
    }

    private void saveInterfaceLog(Object param, String path,String result) {
    private void saveInterfaceLog(Object param, String path,String result,boolean need) {
        if(!need){
            return;
        }
        InterfaceLog hkMonitoryLogDO=new InterfaceLog();
        hkMonitoryLogDO.setType(1);
        hkMonitoryLogDO.setCreateDate(new Date());