告警接口更新

whycxzp

2023-01-11 bdaf974ab56bfba24018eee7b3e9f00aeefe9ac0

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

@@ -320,7 +320,7 @@
    }


    //项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的五条)
    //项目下方的滚动，查询30天的电池告警和设备告警和电源告警
    @Transactional
    public Response getRealAlarm(int uId){
        Calendar instance = Calendar.getInstance();
@@ -349,21 +349,21 @@
            }
        }
        //添加电源告警
//        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, "查询成功");