整理

nidapeng

2024-03-22 720c137ef8bb03b84ca8a8444a39642762ab29fc

整理

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java

@@ -158,5 +158,11 @@
    @ApiModelProperty(value = "人员海康编码")
    @TableField(exist = false)
    private String memberHkId;
    @ApiModelProperty(value = "人员海康同步状态 ")
    @TableField(exist = false)
    private Integer memberHkStatus;
    @ApiModelProperty(value = "人员是否删除 0否 1是")
    @TableField(exist = false)
    private Integer memberDeleted;

}

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

@@ -635,6 +635,8 @@
        MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Empower.class);
        queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
        queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
        queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
        queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
        queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
        queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);

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

@@ -543,7 +543,7 @@
        if(StringUtils.isNotBlank(event.getPlateNos())){
                ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
                        .eq(ParkBook::getCarCode,event.getPlateNos())
                                .eq(ParkBook::getIsdeleted,Constants.ONE )
                                .eq(ParkBook::getIsdeleted,Constants.ZERO )
                        .last("limit 1" ));
                if(cars!=null){
                    event.setMemberId(cars.getMemberId());