优化

‘liusuyi’

2023-09-02 21e4a0b0f9bae6e4be7afde67a524e47c87dbad0

 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java

@@ -195,29 +195,29 @@
            case 1003:
                List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
                return ardAlarmRadarMoves.stream()
                        .map(ardAlarmRadar -> {
                        .map(ardAlarmRadarMove -> {
                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                                    .setId(ardAlarmRadar.getId())
                                    .setName(ardAlarmRadar.getName())
                                    .setAlarmTime(ardAlarmRadar.getAlarmTime())
                                    .setLongitude(ardAlarmRadar.getLongitude())
                                    .setLatitude(ardAlarmRadar.getLatitude())
                                    .setCount(ardAlarmRadar.getCount())
                                    .setTotal(ardAlarmRadar.getTotal());
                                    .setId(ardAlarmRadarMove.getId())
                                    .setName(ardAlarmRadarMove.getName())
                                    .setAlarmTime(ardAlarmRadarMove.getAlarmTime())
                                    .setLongitude(ardAlarmRadarMove.getLongitude())
                                    .setLatitude(ardAlarmRadarMove.getLatitude())
                                    .setCount(ardAlarmRadarMove.getCount())
                                    .setTotal(ardAlarmRadarMove.getTotal());
                            return globalAlarmData;
                        }).collect(Collectors.toList());
            case 1004:
                List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
                return ardAlarmRadarFires.stream()
                        .map(ardAlarmRadar -> {
                        .map(ardAlarmRadarFire -> {
                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                                    .setId(ardAlarmRadar.getId())
                                    .setName(ardAlarmRadar.getName())
                                    .setAlarmTime(ardAlarmRadar.getAlarmTime())
                                    .setLongitude(ardAlarmRadar.getLongitude())
                                    .setLatitude(ardAlarmRadar.getLatitude())
                                    .setCount(ardAlarmRadar.getCount())
                                    .setTotal(ardAlarmRadar.getTotal());
                                    .setId(ardAlarmRadarFire.getId())
                                    .setName(ardAlarmRadarFire.getName())
                                    .setAlarmTime(ardAlarmRadarFire.getAlarmTime())
                                    .setLongitude(ardAlarmRadarFire.getLongitude())
                                    .setLatitude(ardAlarmRadarFire.getLatitude())
                                    .setCount(ardAlarmRadarFire.getCount())
                                    .setTotal(ardAlarmRadarFire.getTotal());
                            return globalAlarmData;
                        }).collect(Collectors.toList());
            case 1005:
@@ -251,15 +251,15 @@
            case 1007:
                List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
                return ardAlarmRadarPumps.stream()
                        .map(ardAlarmRadar -> {
                        .map(ardAlarmRadarPump -> {
                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                                    .setId(ardAlarmRadar.getId())
                                    .setName(ardAlarmRadar.getName())
                                    .setAlarmTime(ardAlarmRadar.getAlarmTime())
                                    .setLongitude(ardAlarmRadar.getLongitude())
                                    .setLatitude(ardAlarmRadar.getLatitude())
                                    .setCount(ardAlarmRadar.getCount())
                                    .setTotal(ardAlarmRadar.getTotal());
                                    .setId(ardAlarmRadarPump.getId())
                                    .setName(ardAlarmRadarPump.getName())
                                    .setAlarmTime(ardAlarmRadarPump.getAlarmTime())
                                    .setLongitude(ardAlarmRadarPump.getLongitude())
                                    .setLatitude(ardAlarmRadarPump.getLatitude())
                                    .setCount(ardAlarmRadarPump.getCount())
                                    .setTotal(ardAlarmRadarPump.getTotal());
                            return globalAlarmData;
                        }).collect(Collectors.toList());
            case 1009:
@@ -353,15 +353,15 @@

        List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
        List<GlobalAlarmData> alarmData1003= ardAlarmRadarMoves.stream()
                .map(ardAlarmRadar -> {
                .map(ardAlarmRadarMove -> {
                    GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                            .setId(ardAlarmRadar.getId())
                            .setName(ardAlarmRadar.getName())
                            .setAlarmTime(ardAlarmRadar.getAlarmTime())
                            .setLongitude(ardAlarmRadar.getLongitude())
                            .setLatitude(ardAlarmRadar.getLatitude())
                            .setCount(ardAlarmRadar.getCount())
                            .setTotal(ardAlarmRadar.getTotal())
                            .setId(ardAlarmRadarMove.getId())
                            .setName(ardAlarmRadarMove.getName())
                            .setAlarmTime(ardAlarmRadarMove.getAlarmTime())
                            .setLongitude(ardAlarmRadarMove.getLongitude())
                            .setLatitude(ardAlarmRadarMove.getLatitude())
                            .setCount(ardAlarmRadarMove.getCount())
                            .setTotal(ardAlarmRadarMove.getTotal())
                            .setAlarmType("1003");
                    return globalAlarmData;
                }).collect(Collectors.toList());
@@ -371,15 +371,15 @@

        List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
        List<GlobalAlarmData> alarmData1004=  ardAlarmRadarFires.stream()
                .map(ardAlarmRadar -> {
                .map(ardAlarmRadarFire -> {
                    GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                            .setId(ardAlarmRadar.getId())
                            .setName(ardAlarmRadar.getName())
                            .setAlarmTime(ardAlarmRadar.getAlarmTime())
                            .setLongitude(ardAlarmRadar.getLongitude())
                            .setLatitude(ardAlarmRadar.getLatitude())
                            .setCount(ardAlarmRadar.getCount())
                            .setTotal(ardAlarmRadar.getTotal())
                            .setId(ardAlarmRadarFire.getId())
                            .setName(ardAlarmRadarFire.getName())
                            .setAlarmTime(ardAlarmRadarFire.getAlarmTime())
                            .setLongitude(ardAlarmRadarFire.getLongitude())
                            .setLatitude(ardAlarmRadarFire.getLatitude())
                            .setCount(ardAlarmRadarFire.getCount())
                            .setTotal(ardAlarmRadarFire.getTotal())
                            .setAlarmType("1004");
                    return globalAlarmData;
                }).collect(Collectors.toList());
@@ -425,15 +425,15 @@

        List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
        List<GlobalAlarmData> alarmData1007= ardAlarmRadarPumps.stream()
                .map(ardAlarmRadar -> {
                .map(ardAlarmRadarPump -> {
                    GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                            .setId(ardAlarmRadar.getId())
                            .setName(ardAlarmRadar.getName())
                            .setAlarmTime(ardAlarmRadar.getAlarmTime())
                            .setLongitude(ardAlarmRadar.getLongitude())
                            .setLatitude(ardAlarmRadar.getLatitude())
                            .setCount(ardAlarmRadar.getCount())
                            .setTotal(ardAlarmRadar.getTotal())
                            .setId(ardAlarmRadarPump.getId())
                            .setName(ardAlarmRadarPump.getName())
                            .setAlarmTime(ardAlarmRadarPump.getAlarmTime())
                            .setLongitude(ardAlarmRadarPump.getLongitude())
                            .setLatitude(ardAlarmRadarPump.getLatitude())
                            .setCount(ardAlarmRadarPump.getCount())
                            .setTotal(ardAlarmRadarPump.getTotal())
                            .setAlarmType("1007");
                    return globalAlarmData;
                }).collect(Collectors.toList());