第三方接口调整以及battAlarmFootSocket电源告警暂时注释

whyczh

2022-07-05 c9e4006f626199e587044726064c01c445eb036e

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

@@ -344,21 +344,22 @@
                lista.add(data);
            }
        }
        List<PwrdevAlarm> pwrAlarmList = pwrdevAlarmMapper.getRealAlarmFoot(yesterday,uId);
        if (pwrAlarmList!=null && pwrAlarmList.size()>0){
            for (PwrdevAlarm pAlarm:pwrAlarmList ) {
                BattalarmData data=new BattalarmData();
                data.setAlarmType("2");//2表示电源告警
                data.setAlmId(pAlarm.getAlmType());
                data.setStationName(pAlarm.getStationName());
                data.setStationName3(pAlarm.getStationName3());
                data.setAlmLevel(pAlarm.getAlmLevel());
                data.setNum(pAlarm.getNum());
                data.setAlmStartTime(pAlarm.getAlmStartTime());
                data.setAlarmName(AlarmDaoFactory.getAllAlarmName(pAlarm.getAlmType()));
                lista.add(data);
            }
        }
        //添加电源告警
//        List<PwrdevAlarm> pwrAlarmList = pwrdevAlarmMapper.getRealAlarmFoot(yesterday,uId);
//        if (pwrAlarmList!=null && pwrAlarmList.size()>0){
//            for (PwrdevAlarm pAlarm:pwrAlarmList ) {
//                BattalarmData data=new BattalarmData();
//                data.setAlarmType("2");//2表示电源告警
//                data.setAlmId(pAlarm.getAlmType());
//                data.setStationName(pAlarm.getStationName());
//                data.setStationName3(pAlarm.getStationName3());
//                data.setAlmLevel(pAlarm.getAlmLevel());
//                data.setNum(pAlarm.getNum());
//                data.setAlmStartTime(pAlarm.getAlmStartTime());
//                data.setAlarmName(AlarmDaoFactory.getAllAlarmName(pAlarm.getAlmType()));
//                lista.add(data);
//            }
//        }
        //排序,按照时间或者说是num
        lista.sort(Comparator.comparing(BattalarmData::getAlmStartTime).reversed());
        return new Response().set(1,lista,"查询成功");