告警接口更新

whycxzp

2023-01-11 bdaf974ab56bfba24018eee7b3e9f00aeefe9ac0

告警接口更新

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

@@ -194,17 +194,30 @@
        for (BattalarmData alarm : battAlarmList) {
            String alarmName = AlarmDaoFactory.getAllAlarmName(alarm.getAlmSignalId());
            String alarmStartTime = format.format(alarm.getAlmStartTime());
            alarmMsgBuilder.append(alarm.getStationName()).append(",电池组编号为").append(alarm.getBattgroupname()).append(",单体为").append(alarm.getMonNum()).append(",在").append(alarmStartTime).append("发生了").append(alarmName).append("告警;");
            String stationName = alarm.getStationName();
            String district = stationName.split("-")[2];
            String stationNameUnion = stationName.substring(stationName.indexOf(district));

            //alarmMsgBuilder.append(stationNameUnion).append(",电池组编号为").append(alarm.getBattgroupname()).append(",单体为").append(alarm.getMonNum()).append(",在").append(alarmStartTime).append("发生了").append(alarmName).append("告警;");
            alarmMsgBuilder.append(stationNameUnion).append("发生了").append(alarmName).append("告警;");
        }
        for (DevalarmData alarm : devAlarmList) {
            String alarmName = AlarmDaoFactory.getAllAlarmName(alarm.getAlmType());
            String alarmStartTime = format.format(alarm.getAlmStartTime());
            alarmMsgBuilder.append(alarm.getStationName()).append(",设备编号为").append(alarm.getDevId()).append(",在").append(alarmStartTime).append("发生了").append(alarmName).append("告警;");
            String stationName = alarm.getStationName();
            String district = stationName.split("-")[2];
            String stationNameUnion = stationName.substring(stationName.indexOf(district));
            //alarmMsgBuilder.append(stationNameUnion).append(",设备编号为").append(alarm.getDevId()).append(",在").append(alarmStartTime).append("发生了").append(alarmName).append("告警;");
            alarmMsgBuilder.append(stationNameUnion).append("发生了").append(alarmName).append("告警;");
        }
        for (PwrdevAlarm alarm : powerAlarmList) {
            String alarmName = AlarmDaoFactory.getAllAlarmName(alarm.getAlmType());
            String alarmStartTime = format.format(alarm.getAlmStartTime());
            alarmMsgBuilder.append(alarm.getStationName()).append(",电源编号为").append(alarm.getPowerDeviceId()).append(",在").append(alarmStartTime).append("发生了").append(alarmName).append("告警;");
            String stationName = alarm.getStationName();
            String district = stationName.split("-")[2];
            String stationNameUnion = stationName.substring(stationName.indexOf(district));
            //alarmMsgBuilder.append(stationNameUnion).append(",电源编号为").append(alarm.getPowerDeviceId()).append(",在").append(alarmStartTime).append("发生了").append(alarmName).append("告警;");
            alarmMsgBuilder.append(stationNameUnion).append("发生了").append(alarmName).append("告警;");
        }

        File file = new File(unreadDirPath);

 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, "查询成功");

 src/main/resources/mapper/PwrdevAlarmMapper.xml

@@ -204,6 +204,7 @@
            and alarm.alm_cleared_type=0
            and alarm.alm_is_confirmed = 0
            and DATEDIFF(alm_start_time,NOW())=0
            and alarm.alm_type in (110010,110017,110018,110019,110020,110021,110022,110023,110024,110025,110026,110027,110028,110029,110030,110031,110032,110121,110122)
            and inf.StationId in ( select distinct inf.StationId from
            (select StationId from db_battinf.tb_battinf union select StationId from db_pwrdev_inf.tb_pwrdev_inf ) inf,
            db_user.tb_user_battgroup_baojigroup_battgroup,