处理设备消息推送

rk

2025-12-09 255fa41e65297e5c9c9ebb807d904680f861b63b

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

@@ -67,9 +67,6 @@
    private DeviceMapper deviceMapper;

    @Autowired
    private InterfaceLogMapper interfaceLogMapper;

    @Autowired
    private MemberMapper memberMapper;

    @Autowired
@@ -718,24 +715,24 @@
                        warningEvent.setStatus(Constants.TWO);
                        warningEventMapper.updateById(warningEvent);
                    }

                }

            }
        }
    }

    public void sendDeviceNotice(WarningRule warningRule){
        if(Constants.equalsInteger(warningRule.getDeviceNotice(),Constants.ONE)
                &&StringUtils.isNotBlank(warningRule.getDeviceIds())
                &&StringUtils.isNotBlank(warningRule.getDeviceNoticeContent())){
        if(Constants.equalsInteger(warningRule.getDeviceNotice(),Constants.ONE)&&StringUtils.isNotBlank(warningRule.getDeviceIds())&&StringUtils.isNotBlank(warningRule.getDeviceNoticeContent())){
            List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>()
                    .lambda()
                    .eq(Device::getStatus,Constants.ZERO)
                    .in(Device::getId,Arrays.asList(warningRule.getDeviceIds().split(",")))
                    .eq(Device::getId,Arrays.asList(warningRule.getDeviceIds().split(",")))
            );
            if(CollectionUtils.isNotEmpty(deviceList)){
                for (Device device:deviceList) {
                    device.setSendInfo(warningRule.getDeviceNoticeContent());
                    DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device,interfaceLogMapper);
                    DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device);
                }
            }
        }
@@ -818,7 +815,7 @@

    }*/

    public List<Integer> processWarnFrontWithEvent(Constants.WarningConfig warningConfig,  List<WarningEvent> returnEventList){
    public List<Integer> processWarnFront(Constants.WarningConfig warningConfig){

        List<WarningRuleDetail> warningRuleDetailList = warningRuleDetailMapper.selectJoinList(WarningRuleDetail.class,new MPJLambdaWrapper<WarningRuleDetail>()
                .selectAll(WarningRuleDetail.class)
@@ -832,7 +829,7 @@
            return new ArrayList<>();
        }
        //所有报警规则配置信息
        List<Integer> ruleIdList = warningRuleDetailList.stream().map(i->i.getRuleId()).collect(Collectors.toList());
        List<Integer> ruleIdList = warningRuleDetailList.stream().map(i->i.getRuleId()).collect(Collectors.toList());;
        Set<Integer> ruleIdSet = new HashSet<>(ruleIdList);
            if(CollectionUtils.isNotEmpty(ruleIdSet)){
            List<Integer> resultList = new ArrayList<>();
@@ -868,9 +865,6 @@
                    );
                    if(this.processWarnFlag(wList,warningEventList)){
                        resultList.add(ruleId);
                        if(returnEventList != null){
                            returnEventList.addAll(warningEventList);
                        }
                    };
                }else{
                    List<WarningRuleDetail> wList = warningRuleDetails.stream().filter(i->i.getCode().equals(warningConfig.getKey()+"")).collect(Collectors.toList());
@@ -888,9 +882,6 @@
                        );
                        if(this.processWarnFlag(wList,warningEventList)){
                            resultList.add(ruleId);
                            if(returnEventList != null){
                                returnEventList.addAll(warningEventList);
                            }
                        }
                    }
                }
@@ -898,14 +889,10 @@
            return resultList;
        }
            return new ArrayList<>();
    }

    public List<Integer> processWarnFront(Constants.WarningConfig warningConfig){

        return  this.processWarnFrontWithEvent(warningConfig,null);


    }



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