ws:pwrAlarm参数表改为一个电源设备一个

whyclxw

2024-03-06 2beb8eff22f084ce37b8d6e2677f797fd889dfef

ws:pwrAlarm参数表改为一个电源设备一个

 src/main/java/com/whyc/service/PwrdevAlarmService.java

@@ -216,6 +216,36 @@
        return new Response().set(1, pageInfo);
    }


    //通信电源告警--认证送检-配电柜专用-webSocket
    public Response getAllPage2OfWebSocket_pid(PwrdevAlarm pwrdevAlarm) {
        //分页信息
        PageHelper.startPage(pwrdevAlarm.getPage().getPageCurr(), pwrdevAlarm.getPage().getPageSize());
        List<PwrdevAlarm> list=mapper.getAllPage2(pwrdevAlarm);
        for (PwrdevAlarm p:list) {
            int almType = p.getAlmType();
            AtomicBoolean matchFlag = new AtomicBoolean(false);
            String alarmParamTableName="tb_pwrdev_alarm_param_"+p.getPowerDeviceId();
            List<PwrdevAlarmParam>  paramList=subService.searchAll(alarmParamTableName);
            paramList.stream().forEach(param->{
                if(param.getAlarmId() == almType){
                    p.setAlarmName(param.getAlarmName());
                    matchFlag.set(true);
                    return;
                }
            });
            if (!matchFlag.get()) {
                p.setAlarmName("未知告警类型");
            }
            int alarmIndex = p.getAlmIndex();
            if (alarmIndex != 0) {
                p.setAlmIndex(alarmIndex);
                p.setAlarmName(p.getAlarmName().replace("N", "第" + alarmIndex + "路"));
            }
        }
        PageInfo pageInfo = new PageInfo(list);
        return new Response().set(1, pageInfo);
    }
    /**
     *
     * @param userId

 src/main/java/com/whyc/webSocket/PwrAlarmSocket.java

@@ -53,7 +53,9 @@
                        if (session.isOpen()) {
                            //推送信息
                            synchronized (session) {
                                session.getBasicRemote().sendObject(service.getAllPage2OfWebSocket(pwrdevAlarm));
                                //session.getBasicRemote().sendObject(service.getAllPage2OfWebSocket(pwrdevAlarm));
                                //获取告警参数改为一个机房一个
                                session.getBasicRemote().sendObject(service.getAllPage2OfWebSocket_pid(pwrdevAlarm));
                            }
                            threadFlagMap.put(thread.getId(),false);
                        }