优化

‘liusuyi’

2023-09-02 170ad1e50ece65f84a35968b675bafdc4402206c

优化

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

@@ -776,7 +776,7 @@
                                ardAlarmRadarMove.setAlarmTime(radarAlarmData.getAlarmTime());
                                ardAlarmRadarMove.setCreateTime(new Date());
                                ardAlarmRadarMove.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
                                ardAlarmRadarMove.setAlarmType("sys_radar_move");
                                ardAlarmRadarMove.setAlarmType("运动目标检测");
                                ardAlarmRadarMove.setLongitude(longitude);
                                ardAlarmRadarMove.setLatitude(latitude);
                                //入库
@@ -791,7 +791,7 @@
                                ardAlarmRadarFire.setAlarmTime(radarAlarmData.getAlarmTime());
                                ardAlarmRadarFire.setCreateTime(new Date());
                                ardAlarmRadarFire.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
                                ardAlarmRadarFire.setAlarmType("sys_radar_fire");
                                ardAlarmRadarFire.setAlarmType("热源检测");
                                ardAlarmRadarFire.setLongitude(longitude);
                                ardAlarmRadarFire.setLatitude(latitude);
                                //入库
@@ -806,7 +806,7 @@
                                ardAlarmRadarPump.setAlarmTime(radarAlarmData.getAlarmTime());
                                ardAlarmRadarPump.setCreateTime(new Date());
                                ardAlarmRadarPump.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");
                                ardAlarmRadarPump.setAlarmType("sys_radar_pump");
                                ardAlarmRadarPump.setAlarmType("雷达抽油机停机");
                                ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
                                if (StringUtils.isNotNull(ardAlarmpointsWell)) {
                                    ardAlarmRadarPump.setLongitude(ardAlarmpointsWell.getLongitude());
@@ -918,7 +918,14 @@
            //相机ID
            guideTask.setCameraId(cameraId);
            //报警类型
            guideTask.setAlarmType(alarmType);
            String aType="";
            switch (alarmType)
            {
                case "运动目标检测": aType="sys_radar_move";break;
                case "热源检测": aType="sys_radar_fire";break;
                case "雷达抽油机停机": aType="sys_radar_pump";break;
            }
            guideTask.setAlarmType(aType);
            //通道(通过日夜时间研判)
            String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
            Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
@@ -928,7 +935,7 @@
            //接收时间
            guideTask.setReceiveTime(fmt.format(receiveTime));
            //报警优先级(通过优先级字典)
            String priority = DictUtils.getDictValue("cameras_priority", alarmType);
            String priority = DictUtils.getDictValue("cameras_priority", aType);
            if (StringUtils.isEmpty(priority)) {
                log.debug("未匹配到优先级,请检查优先级字典配置");
                return;
@@ -1039,6 +1046,7 @@
        //按兴趣点去重,然后按引导逻辑进行引导入队
        ardAlarmRadarMoves = ardAlarmRadarMoves.stream()
                .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAlarmRadarMove::getName))), ArrayList::new));
        if(ardAlarmRadarMoves.size()>0) {
        for (ArdAlarmRadarMove ardAlarmRadarMove : ardAlarmRadarMoves) {
            //遍历报警数据进行引导
            if (StringUtils.isNull(ardAlarmRadarMove.getLongitude()) || StringUtils.isNull(ardAlarmRadarMove.getLatitude())) {
@@ -1083,6 +1091,7 @@
            //更新
            ardAlarmRadarMoveMapper.updateArdAlarmRadarMove(ardAlarmRadarMove);
        }
        }
        //endregion
    }
    private void radarFireGuide(List<ArdAlarmRadarFire> ardAlarmRadarFires,RadarAlarmData radarAlarmData)
@@ -1090,6 +1099,7 @@
        //按兴趣点去重,然后按引导逻辑进行引导入队
        ardAlarmRadarFires = ardAlarmRadarFires.stream()
                .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAlarmRadarFire::getName))), ArrayList::new));
        if(ardAlarmRadarFires.size()>0) {
        for (ArdAlarmRadarFire ardAlarmRadarFire : ardAlarmRadarFires) {
            //遍历报警数据进行引导
            if (StringUtils.isNull(ardAlarmRadarFire.getLongitude()) || StringUtils.isNull(ardAlarmRadarFire.getLatitude())) {
@@ -1133,6 +1143,7 @@
            //更新
            ardAlarmRadarFireMapper.updateArdAlarmRadarFire(ardAlarmRadarFire);
        }
        }
        //endregion
    }
    private void radarPumpGuide(List<ArdAlarmRadarPump> ardAlarmRadarPumps,RadarAlarmData radarAlarmData)
@@ -1140,6 +1151,7 @@
        //按兴趣点去重,然后按引导逻辑进行引导入队
        ardAlarmRadarPumps = ardAlarmRadarPumps.stream()
                .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAlarmRadarPump::getName))), ArrayList::new));
        if(ardAlarmRadarPumps.size()>0) {
        for (ArdAlarmRadarPump ardAlarmRadarPump : ardAlarmRadarPumps) {
            //遍历报警数据进行引导
            if (StringUtils.isNull(ardAlarmRadarPump.getLongitude()) || StringUtils.isNull(ardAlarmRadarPump.getLatitude())) {
@@ -1183,6 +1195,7 @@
            //更新
            ardAlarmRadarPumpMapper.updateArdAlarmRadarPump(ardAlarmRadarPump);
        }
        }
        //endregion
    }
}