钥匙柜开门添加 指纹方式

rk

18 小时以前 5decddf6a5dd2cda32880c07c545b8246ceada2d

钥匙柜开门添加 指纹方式

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

@@ -75,6 +75,9 @@
    @ApiModelProperty(value = "位置主键")
    private String regionId;

    @ApiModelProperty(value = "设备主键")
    private String deviceId;

    @ApiModelProperty(value = "唯一标识")
    //@ExcelColumn(name="唯一标识")
    private String eventId;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java

@@ -906,9 +906,9 @@
            return false;
        }
        for (WarningRuleDetail warningRuleDetail:warningRuleDetails) {
            if(Objects.nonNull(warningRuleDetail.getRegionId())){
            if(Objects.nonNull(warningRuleDetail.getDeviceId())){
                if(warningEventList.stream().filter(i->Constants.equalsInteger(i.getWarningId(),warningRuleDetail.getWarningId())
                        && StringUtils.isNotBlank(i.getRegionId()) && i.getRegionId().equals(warningRuleDetail.getRegionId())
                        && StringUtils.isNotBlank(i.getDeviceId()) && i.getDeviceId().equals(warningRuleDetail.getDeviceId())
                ).collect(Collectors.toList()).size()<=Constants.ZERO){
                    return false;
                }

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

@@ -502,6 +502,7 @@
                    warningEvent.setSrcType(request.getSrcType());
                    warningEvent.setSrcName(request.getSrcName());
                    warningEvent.setWarningId(warning.getId());
                    warningEvent.setDeviceId(request.getSrcIndex());
                    warningEventMapper.insert(warningEvent);

                    if(Objects.nonNull(warningConfig)){