From f5fa6fa5e5d14fb3d8703434b30648be76b6e7e6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 12 十二月 2023 17:08:47 +0800
Subject: [PATCH] 重构引导队列逻辑

---
 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java |  897 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 643 insertions(+), 254 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index 0af7c58..28d68cd 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -7,20 +7,20 @@
 import com.ruoyi.alarm.apponekey.mapper.ArdAlarmApponekeyMapper;
 import com.ruoyi.alarm.camera.domain.ArdAlarmCamera;
 import com.ruoyi.alarm.camera.mapper.ArdAlarmCameraMapper;
+import com.ruoyi.alarm.digitization3.domain.ArdAlarmDigitization3;
+import com.ruoyi.alarm.digitization3.mapper.ArdAlarmDigitization3Mapper;
 import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
 import com.ruoyi.alarm.external.mapper.ArdAlarmExternalMapper;
-import com.ruoyi.alarm.global.domain.GlobalAlarmCondition;
-import com.ruoyi.alarm.global.domain.GlobalAlarmData;
-import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
-import com.ruoyi.alarm.global.domain.GuideTask;
+import com.ruoyi.alarm.global.domain.*;
 import com.ruoyi.alarm.global.service.IGlobalAlarmService;
 import com.ruoyi.alarm.radar.domain.*;
 import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarFireMapper;
-import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMapper;
 import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMoveMapper;
 import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarPumpMapper;
 import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
 import com.ruoyi.alarm.steal.mapper.ArdAlarmStealelecMapper;
+import com.ruoyi.alarm.superbrain.domain.ArdAlarmSuperBrain;
+import com.ruoyi.alarm.superbrain.mapper.ArdAlarmSuperBrainMapper;
 import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
 import com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper;
 import com.ruoyi.alarm.wall.domain.ArdAlarmWall;
@@ -33,6 +33,7 @@
 import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.ConfigUtils;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -54,7 +55,6 @@
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 
@@ -66,9 +66,13 @@
  * @Version: 1.0
  **/
 @Service
-@Slf4j(topic = "mqtt")
+@Slf4j(topic = "alarm")
 public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
     //region 渚濊禆娉ㄥ叆
+    @Resource
+    private ArdAlarmSuperBrainMapper ardAlarmSuperBrainMapper;
+    @Resource
+    private ArdAlarmDigitization3Mapper ardAlarmDigitization3Mapper;
     @Resource
     private ArdAlarmWallMapper ardAlarmWallMapper;
     @Resource
@@ -106,14 +110,11 @@
     @Resource
     private RedisCache redisCache;
     @Resource
-    private QueueManager queueManager;
+    private QueueHandler queueHandler;
     @Resource
     private ArdEquipRadarMapper ardEquipRadarMapper;
     //endregion
-    //姣忎釜鐐逛綅鏈紩瀵兼鏁�
-    private Map<String, Integer> unGuideCountMapMove = new HashMap<>();
-    private Map<String, Integer> unGuideCountMapFire = new HashMap<>();
-    private Map<String, Integer> unGuideCountMapPump = new HashMap<>();
+
     /**
      * @鎻忚堪 鏌ヨ鎵�鏈夋姤璀︾殑褰撳墠鏁伴噺
      * @鍙傛暟 []
@@ -147,6 +148,10 @@
         countMap.put("1010", count1010);
         int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
         countMap.put("1014", count1014);
+        int count1012 = ardAlarmDigitization3Mapper.selectCountByAlarmTime(refreshTime);
+        countMap.put("1012", count1012);
+        int count1015 = ardAlarmSuperBrainMapper.selectCountByAlarmTime(refreshTime);
+        countMap.put("1015", count1015);
         map.put("20000", countMap);
         return map;
     }
@@ -290,6 +295,22 @@
                                     .setTotal(ardAlarmWall.getTotal());
                             return globalAlarmData;
                         }).collect(Collectors.toList());
+            case 1012:
+                List<ArdAlarmDigitization3> ardAlarmDigitization3s = ardAlarmDigitization3Mapper.selectListAllByCommand(refreshTime);
+                return ardAlarmDigitization3s.stream()
+                        .map(ardAlarmDigitization3 -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmDigitization3.getId())
+                                    .setName(ardAlarmDigitization3.getWellNo())
+                                    .setAlarmType(ardAlarmDigitization3.getAlarmType())
+                                    .setAlarmTime(ardAlarmDigitization3.getAlarmTime())
+                                    .setLongitude(ardAlarmDigitization3.getLongitude())
+                                    .setLatitude(ardAlarmDigitization3.getLatitude())
+                                    .setAltitude(ardAlarmDigitization3.getAltitude())
+                                    .setCount(ardAlarmDigitization3.getCount())
+                                    .setTotal(ardAlarmDigitization3.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
             case 1014:
                 List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
                 return ardAlarmTubes.stream()
@@ -303,6 +324,213 @@
                                     .setAltitude(ardAlarmTube.getAltitude())
                                     .setCount(ardAlarmTube.getCount())
                                     .setTotal(ardAlarmTube.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
+            case 1015:
+                List<ArdAlarmSuperBrain> ardAlarmSuperBrains = ardAlarmSuperBrainMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmSuperBrains.stream()
+                        .map(ardAlarmSuperBrain -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmSuperBrain.getId())
+                                    .setName(ardAlarmSuperBrain.getAlarmType())
+                                    .setAlarmType(ardAlarmSuperBrain.getAlarmType())
+                                    .setAlarmTime(ardAlarmSuperBrain.getAlarmTime())
+                                    .setLongitude(ardAlarmSuperBrain.getLongitude())
+                                    .setLatitude(ardAlarmSuperBrain.getLatitude())
+                                    .setAltitude(ardAlarmSuperBrain.getAltitude())
+                                    .setCount(ardAlarmSuperBrain.getCount())
+                                    .setTotal(ardAlarmSuperBrain.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * 鑾峰彇鐑姏鍥炬暟鎹�
+     * 鍒樿嫃涔�
+     * 2023/9/16 8:38:54
+     */
+    @Override
+    public List<GlobalAlarmData> selectThermalMap(GlobalAlarmCondition condition) {
+        String refreshTime = condition.getRefreshTime();
+        switch (condition.getCommand()) {
+            case 1001:
+                List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmStealelecs.stream()
+                        .map(ardAlarmStealelec -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmStealelec.getId())
+                                    .setName(ardAlarmStealelec.getDescribe())
+                                    .setAlarmTime(ardAlarmStealelec.getStartTime())
+                                    .setLongitude(ardAlarmStealelec.getLongitude())
+                                    .setLatitude(ardAlarmStealelec.getLatitude())
+                                    .setAltitude(ardAlarmStealelec.getAltitude())
+                                    .setCount(ardAlarmStealelec.getCount())
+                                    .setTotal(ardAlarmStealelec.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
+            case 1002:
+                List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmCameras.stream()
+                        .map(ardAlarmCamera -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmCamera.getId())
+                                    .setName(ardAlarmCamera.getCameraName())
+                                    .setAlarmTime(ardAlarmCamera.getAlarmTime())
+                                    .setLongitude(ardAlarmCamera.getLongitude())
+                                    .setLatitude(ardAlarmCamera.getLatitude())
+                                    .setCount(ardAlarmCamera.getCount())
+                                    .setTotal(ardAlarmCamera.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
+            case 1003:
+                //浠庣紦瀛樿幏鍙栨暟鎹�
+                //String key = "radar_alarm:" + DateUtils.getDate();
+                //List<ArdAlarmRadarMove> ardAlarmRadarMoves = redisCache.getCacheList(key);
+                //Map<String, List<ArdAlarmRadarMove>> groupedData = ardAlarmRadarMoves.stream()
+                //        .collect(Collectors.groupingBy(ArdAlarmRadarMove::getName));
+                //List<GlobalAlarmData> globalAlarmDataList = new ArrayList<>();
+                //for (String name : groupedData.keySet()) {
+                //    List<ArdAlarmRadarMove> ardAlarmRadarMove = groupedData.get(name);
+                //    GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                //            .setId(ardAlarmRadarMove.get(0).getId())
+                //            .setName(name)
+                //            .setAlarmTime(ardAlarmRadarMove.get(0).getAlarmTime())
+                //            .setLongitude(ardAlarmRadarMove.get(0).getLongitude())
+                //            .setLatitude(ardAlarmRadarMove.get(0).getLatitude())
+                //            .setTotal(ardAlarmRadarMove.size());
+                //    globalAlarmDataList.add(globalAlarmData);
+                //}
+                //return globalAlarmDataList;
+                //浠庢暟鎹簱鑾峰彇
+                List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmRadarMoves.stream()
+                        .map(ardAlarmRadarMove -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .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(ardAlarmRadarFire -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .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:
+                List<ArdAlarmExternal> ardAlarmExternals = ardAlarmExternalMapper.selectListAllByCommand(refreshTime, "闃插尯鎶ヨ");
+                return ardAlarmExternals.stream()
+                        .map(ardAlarmExternal -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmExternal.getId())
+                                    .setName(ardAlarmExternal.getAlarmName())
+                                    .setAlarmTime(ardAlarmExternal.getAlarmTime())
+                                    .setLongitude(ardAlarmExternal.getLongitude())
+                                    .setLatitude(ardAlarmExternal.getLatitude())
+                                    .setCount(ardAlarmExternal.getCount())
+                                    .setTotal(ardAlarmExternal.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
+            case 1006:
+                List<ArdAlarmAccess> ardAlarmAccesses = ardAlarmAccessMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmAccesses.stream()
+                        .map(ardAlarmAccess -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmAccess.getId())
+                                    .setName(ardAlarmAccess.getAcsName())
+                                    .setAlarmTime(ardAlarmAccess.getAlarmTime())
+                                    .setLongitude(ardAlarmAccess.getLongitude())
+                                    .setLatitude(ardAlarmAccess.getLatitude())
+                                    .setCount(ardAlarmAccess.getCount())
+                                    .setTotal(ardAlarmAccess.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
+            case 1007:
+                List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmRadarPumps.stream()
+                        .map(ardAlarmRadarPump -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .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:
+                List<ArdAlarmApponekey> ardAlarmApponekeys = ardAlarmApponekeyMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmApponekeys.stream()
+                        .map(ardAlarmApponekey -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmApponekey.getId())
+                                    .setName(ardAlarmApponekey.getName())
+                                    .setAlarmTime(ardAlarmApponekey.getCreateTime())
+                                    .setLongitude(ardAlarmApponekey.getLongitude())
+                                    .setLatitude(ardAlarmApponekey.getLatitude())
+                                    .setCount(ardAlarmApponekey.getCount())
+                                    .setTotal(ardAlarmApponekey.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
+            case 1010:
+                List<ArdAlarmWall> ardAlarmWalls = ardAlarmWallMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmWalls.stream()
+                        .map(ardAlarmWall -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmWall.getId())
+                                    .setName(ardAlarmWall.getWallName())
+                                    .setAlarmTime(ardAlarmWall.getAlarmTime())
+                                    .setLongitude(ardAlarmWall.getLongitude())
+                                    .setLatitude(ardAlarmWall.getLatitude())
+                                    .setCount(ardAlarmWall.getCount())
+                                    .setTotal(ardAlarmWall.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
+            case 1014:
+                List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmTubes.stream()
+                        .map(ardAlarmTube -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmTube.getId())
+                                    .setName(ardAlarmTube.getTubeName())
+                                    .setAlarmTime(ardAlarmTube.getAlarmTime())
+                                    .setLongitude(ardAlarmTube.getLongitude())
+                                    .setLatitude(ardAlarmTube.getLatitude())
+                                    .setAltitude(ardAlarmTube.getAltitude())
+                                    .setCount(ardAlarmTube.getCount())
+                                    .setTotal(ardAlarmTube.getTotal());
+                            return globalAlarmData;
+                        }).collect(Collectors.toList());
+            case 1015:
+                List<ArdAlarmSuperBrain> ardAlarmSuperBrains = ardAlarmSuperBrainMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmSuperBrains.stream()
+                        .map(ardAlarmSuperBrain -> {
+                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                                    .setId(ardAlarmSuperBrain.getId())
+                                    .setName(ardAlarmSuperBrain.getAlarmType())
+                                    .setAlarmType(ardAlarmSuperBrain.getAlarmType())
+                                    .setAlarmTime(ardAlarmSuperBrain.getAlarmTime())
+                                    .setLongitude(ardAlarmSuperBrain.getLongitude())
+                                    .setLatitude(ardAlarmSuperBrain.getLatitude())
+                                    .setAltitude(ardAlarmSuperBrain.getAltitude())
+                                    .setCount(ardAlarmSuperBrain.getCount())
+                                    .setTotal(ardAlarmSuperBrain.getTotal());
                             return globalAlarmData;
                         }).collect(Collectors.toList());
             default:
@@ -329,12 +557,12 @@
                             .setAlarmType("1001");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1001.size()>0) {
+        if (alarmData1001.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1001);
         }
 
         List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectListAllByCommand(refreshTime);
-        List<GlobalAlarmData> alarmData1002= ardAlarmCameras.stream()
+        List<GlobalAlarmData> alarmData1002 = ardAlarmCameras.stream()
                 .map(ardAlarmCamera -> {
                     GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                             .setId(ardAlarmCamera.getId())
@@ -347,12 +575,12 @@
                             .setAlarmType("1002");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1002.size()>0) {
+        if (alarmData1002.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1002);
         }
 
         List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
-        List<GlobalAlarmData> alarmData1003= ardAlarmRadarMoves.stream()
+        List<GlobalAlarmData> alarmData1003 = ardAlarmRadarMoves.stream()
                 .map(ardAlarmRadarMove -> {
                     GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                             .setId(ardAlarmRadarMove.getId())
@@ -365,12 +593,12 @@
                             .setAlarmType("1003");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1003.size()>0) {
+        if (alarmData1003.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1003);
         }
 
         List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
-        List<GlobalAlarmData> alarmData1004=  ardAlarmRadarFires.stream()
+        List<GlobalAlarmData> alarmData1004 = ardAlarmRadarFires.stream()
                 .map(ardAlarmRadarFire -> {
                     GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                             .setId(ardAlarmRadarFire.getId())
@@ -383,12 +611,12 @@
                             .setAlarmType("1004");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1004.size()>0) {
+        if (alarmData1004.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1004);
         }
 
         List<ArdAlarmExternal> ardAlarmExternals = ardAlarmExternalMapper.selectListAllByCommand(refreshTime, "闃插尯鎶ヨ");
-        List<GlobalAlarmData> alarmData1005=  ardAlarmExternals.stream()
+        List<GlobalAlarmData> alarmData1005 = ardAlarmExternals.stream()
                 .map(ardAlarmExternal -> {
                     GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                             .setId(ardAlarmExternal.getId())
@@ -401,12 +629,12 @@
                             .setAlarmType("1005");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1005.size()>0) {
+        if (alarmData1005.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1005);
         }
 
         List<ArdAlarmAccess> ardAlarmAccesses = ardAlarmAccessMapper.selectListAllByCommand(refreshTime);
-        List<GlobalAlarmData> alarmData1006= ardAlarmAccesses.stream()
+        List<GlobalAlarmData> alarmData1006 = ardAlarmAccesses.stream()
                 .map(ardAlarmAccess -> {
                     GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                             .setId(ardAlarmAccess.getId())
@@ -419,12 +647,12 @@
                             .setAlarmType("1006");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1006.size()>0) {
+        if (alarmData1006.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1006);
         }
 
         List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
-        List<GlobalAlarmData> alarmData1007= ardAlarmRadarPumps.stream()
+        List<GlobalAlarmData> alarmData1007 = ardAlarmRadarPumps.stream()
                 .map(ardAlarmRadarPump -> {
                     GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                             .setId(ardAlarmRadarPump.getId())
@@ -437,12 +665,12 @@
                             .setAlarmType("1007");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1007.size()>0) {
+        if (alarmData1007.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1007);
         }
 
         List<ArdAlarmApponekey> ardAlarmApponekeys = ardAlarmApponekeyMapper.selectListAllByCommand(refreshTime);
-        List<GlobalAlarmData> alarmData1009= ardAlarmApponekeys.stream()
+        List<GlobalAlarmData> alarmData1009 = ardAlarmApponekeys.stream()
                 .map(ardAlarmApponekey -> {
                     GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                             .setId(ardAlarmApponekey.getId())
@@ -455,12 +683,12 @@
                             .setAlarmType("1009");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1009.size()>0) {
+        if (alarmData1009.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1009);
         }
 
         List<ArdAlarmWall> ardAlarmWalls = ardAlarmWallMapper.selectListAllByCommand(refreshTime);
-        List<GlobalAlarmData> alarmData1010= ardAlarmWalls.stream()
+        List<GlobalAlarmData> alarmData1010 = ardAlarmWalls.stream()
                 .map(ardAlarmWall -> {
                     GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                             .setId(ardAlarmWall.getId())
@@ -473,12 +701,31 @@
                             .setAlarmType("1010");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1010.size()>0) {
+        if (alarmData1010.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1010);
         }
 
+        List<ArdAlarmDigitization3> ardAlarmDigitization3s = ardAlarmDigitization3Mapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1012 = ardAlarmDigitization3s.stream()
+                .map(ardAlarmDigitization3 -> {
+                    GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                            .setId(ardAlarmDigitization3.getId())
+                            .setName(ardAlarmDigitization3.getWellNo())
+                            .setAlarmTime(ardAlarmDigitization3.getAlarmTime())
+                            .setLongitude(ardAlarmDigitization3.getLongitude())
+                            .setLatitude(ardAlarmDigitization3.getLatitude())
+                            .setAltitude(ardAlarmDigitization3.getAltitude())
+                            .setCount(ardAlarmDigitization3.getCount())
+                            .setTotal(ardAlarmDigitization3.getTotal())
+                            .setAlarmType("1012");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if (alarmData1012.size() > 0) {
+            GlobalAlarmDataList.addAll(alarmData1012);
+        }
+
         List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
-        List<GlobalAlarmData> alarmData1014= ardAlarmTubes.stream()
+        List<GlobalAlarmData> alarmData1014 = ardAlarmTubes.stream()
                 .map(ardAlarmTube -> {
                     GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                             .setId(ardAlarmTube.getId())
@@ -492,11 +739,31 @@
                             .setAlarmType("1014");
                     return globalAlarmData;
                 }).collect(Collectors.toList());
-        if(alarmData1014.size()>0) {
+        if (alarmData1014.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1014);
         }
+
+        List<ArdAlarmSuperBrain> ardAlarmSuperBrains = ardAlarmSuperBrainMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1015 = ardAlarmSuperBrains.stream()
+                .map(ardAlarmSuperBrain -> {
+                    GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                            .setId(ardAlarmSuperBrain.getId())
+                            .setName(ardAlarmSuperBrain.getAlarmType())
+                            .setAlarmTime(ardAlarmSuperBrain.getAlarmTime())
+                            .setLongitude(ardAlarmSuperBrain.getLongitude())
+                            .setLatitude(ardAlarmSuperBrain.getLatitude())
+                            .setAltitude(ardAlarmSuperBrain.getAltitude())
+                            .setCount(ardAlarmSuperBrain.getCount())
+                            .setTotal(ardAlarmSuperBrain.getTotal())
+                            .setAlarmType("1015");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if (alarmData1015.size() > 0) {
+            GlobalAlarmDataList.addAll(alarmData1015);
+        }
+
         return GlobalAlarmDataList;
-}
+    }
 
     /**
      * @鎻忚堪 鍘嗗彶鎶ヨ鏌ヨ
@@ -571,12 +838,24 @@
                 aaw.setPageNum(pageNum);
                 aaw.setPageSize(pageSize);
                 return ardAlarmWallMapper.selectArdAlarmWallList(aaw);
+            case 1012:
+                ArdAlarmDigitization3 aad3 = new ArdAlarmDigitization3();
+                aad3.setParams(params);
+                aad3.setPageNum(pageNum);
+                aad3.setPageSize(pageSize);
+                return ardAlarmDigitization3Mapper.selectArdAlarmDigitization3List(aad3);
             case 1014:
                 ArdAlarmTube aat = new ArdAlarmTube();
                 aat.setParams(params);
                 aat.setPageNum(pageNum);
                 aat.setPageSize(pageSize);
                 return ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
+            case 1015:
+                ArdAlarmSuperBrain aasb = new ArdAlarmSuperBrain();
+                aasb.setParams(params);
+                aasb.setPageNum(pageNum);
+                aasb.setPageSize(pageSize);
+                return ardAlarmSuperBrainMapper.selectArdAlarmSuperBrainList(aasb);
         }
         return null;
     }
@@ -667,6 +946,14 @@
                     ardAlarmWallMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
                     return ardAlarmWall;
                 }
+            case 1012:
+                ArdAlarmDigitization3 ardAlarmDigitization3 = ardAlarmDigitization3Mapper.selectArdAlarmDigitization3ById(condition.getId());
+                if (StringUtils.isNotNull(ardAlarmDigitization3)) {
+                    String wellNo = ardAlarmDigitization3.getWellNo();
+                    String alarmTime = fmtms.format(ardAlarmDigitization3.getAlarmTime());
+                    ardAlarmDigitization3Mapper.updateViewTimeByWellNo(wellNo, alarmTime, DateUtils.getTime());
+                    return ardAlarmDigitization3;
+                }
             case 1014:
                 ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
                 if (StringUtils.isNotNull(ardAlarmTube)) {
@@ -674,6 +961,14 @@
                     String alarmTime = fmt.format(ardAlarmTube.getAlarmTime());
                     ardAlarmTubeMapper.updateViewTimeByTubeId(tubeId, alarmTime, DateUtils.getTime());
                     return ardAlarmTube;
+                }
+            case 1015:
+                ArdAlarmSuperBrain ardAlarmSuperBrain = ardAlarmSuperBrainMapper.selectArdAlarmSuperBrainById(condition.getId());
+                if (StringUtils.isNotNull(ardAlarmSuperBrain)) {
+                    String alarmType = ardAlarmSuperBrain.getAlarmType();
+                    String alarmTime = fmt.format(ardAlarmSuperBrain.getAlarmTime());
+                    ardAlarmSuperBrainMapper.updateViewTimeByAlarmType(alarmType, alarmTime, DateUtils.getTime());
+                    return ardAlarmSuperBrain;
                 }
             default:
                 return null;
@@ -737,9 +1032,17 @@
                             return;
                         }
                         double[] coordinate = new double[]{longitude, latitude};
-                        String nearbyCameraId = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
-                        if (StringUtils.isNotEmpty(nearbyCameraId)) {
-                            messagesEnqueued(nearbyCameraId, ardAlarmTube.getId(), "sys_tube_leak", ardAlarmTube.getCreateTime(), 1, 1, coordinate);
+                        String cameraId = getCameraByNear(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
+                        if (StringUtils.isNotEmpty(cameraId)) {
+                            GuideDataDto guideDataDto = new GuideDataDto()
+                                    .setAlarmId(cameraId)
+                                    .setAlarmId(ardAlarmTube.getId())
+                                    .setAlarmType("sys_tube_leak")
+                                    .setReceiveTime(ardAlarmTube.getCreateTime())
+                                    .setNum(1)
+                                    .setRecordSn(1)
+                                    .setTargetPosition(coordinate);
+                            messagesEnqueued(guideDataDto);
                         }
                         //endregion
                     }
@@ -758,20 +1061,28 @@
                     break;
                 case "radar":
                     //region 澶勭悊闆疯揪鎶ヨ
+                    String mergeTime = ConfigUtils.getConfigValue("radarMergeTime");
+                    Integer radarMergeTime = mergeTime == null || "".equals(mergeTime) ? 10 : Integer.valueOf(mergeTime);
                     RadarAlarmData radarAlarmData = JSONObject.parseObject(message, RadarAlarmData.class);
                     List<ArdAlarmRadar> ardAlarmRadars = radarAlarmData.getArdAlarmRadars();
-                    List<ArdAlarmRadarMove>ardAlarmRadarMoves=new ArrayList<>();
-                    List<ArdAlarmRadarFire>ardAlarmRadarFires=new ArrayList<>();
-                    List<ArdAlarmRadarPump>ardAlarmRadarPumps=new ArrayList<>();
                     for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
                         String uuid = IdUtils.simpleUUID();
+                        String radarId = radarAlarmData.getRadarId();
                         String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
-                        Double longitude = ardAlarmRadar.getLongitude();
-                        Double latitude = ardAlarmRadar.getLatitude();
-                        String targetId=ardAlarmRadar.getTargetId();
+                        ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
+                        if (well == null) {
+                            return;
+                        }
+                        Double guideP = well.getGuideP();
+                        Double guideT = well.getGuideT();
+                        Double guideZ = well.getGuideZ();
+                        Double longitude = well.getLongitude();
+                        Double latitude = well.getLatitude();
+                        String targetId = ardAlarmRadar.getTargetId();
+                        GuidePTZ guidePTZ = new GuidePTZ();
                         switch (ardAlarmRadar.getAlarmType()) {
                             case "杩愬姩鐩爣妫�娴�":
-                                ArdAlarmRadarMove ardAlarmRadarMove=new ArdAlarmRadarMove();
+                                ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
                                 ardAlarmRadarMove.setId(uuid);
                                 ardAlarmRadarMove.setTargetId(targetId);
                                 ardAlarmRadarMove.setAlarmTime(radarAlarmData.getAlarmTime());
@@ -780,13 +1091,57 @@
                                 ardAlarmRadarMove.setAlarmType("杩愬姩鐩爣妫�娴�");
                                 ardAlarmRadarMove.setLongitude(longitude);
                                 ardAlarmRadarMove.setLatitude(latitude);
-                                //鍏ュ簱
-                                ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
-                                ardAlarmRadarMoves.add(ardAlarmRadarMove);
+                                ardAlarmRadarMove.setUpdateTime(radarAlarmData.getAlarmTime());
+                                ardAlarmRadarMove.setRadarId(radarId);
 
+                                guidePTZ.setP(guideP);
+                                guidePTZ.setT(guideT);
+                                guidePTZ.setZ(guideZ);
+                                ardAlarmRadarMove.setGuidePTZ(guidePTZ);
+                                Date alarmTime = ardAlarmRadarMove.getAlarmTime();
+                                //鑾峰彇褰撳墠鍏磋叮鐐瑰綋鍓嶉浄杈剧殑涓婁竴鏉℃暟鎹�
+                                ArdAlarmRadarMove lastMoveData = ardAlarmRadarMoveMapper.selectArdAlarmRadarLastData(ardAlarmRadarMove.getName());
+                                if (lastMoveData == null) {
+                                    //鍏ュ簱
+                                    ardAlarmRadarMove.setGuideTime(alarmTime);
+                                    ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
+                                    radarMoveGuide(ardAlarmRadarMove);//寮曞
+                                } else {
+                                    //鍚﹀垯姣斿鏇存柊鏃堕棿
+                                    Date lastUpdateTime = lastMoveData.getUpdateTime();
+                                    Date lastGuideTime = lastMoveData.getGuideTime();
+                                    long secDatePoor = DateUtils.getSecDatePoor(alarmTime, lastUpdateTime);
+                                    if (secDatePoor <= radarMergeTime) {
+                                        //灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
+                                        ArdAlarmRadarMove updateData = new ArdAlarmRadarMove();
+                                        updateData.setId(lastMoveData.getId());
+                                        updateData.setUpdateTime(alarmTime);
+
+                                        //鍒ゆ柇寮曞鏃堕棿瓒呰繃5鍒嗛挓鍐嶆寮曞
+                                        long secDatePoorGuide = DateUtils.getSecDatePoor(alarmTime, lastGuideTime);
+                                        if (secDatePoorGuide >= 300) {
+                                            updateData.setGuideTime(alarmTime);
+                                            radarMoveGuide(ardAlarmRadarMove);//寮曞
+                                        }
+                                        ardAlarmRadarMoveMapper.updateArdAlarmRadarMove(updateData);
+                                    } else {
+                                        //瓒呰繃10绉掔殑鏁版嵁,鍏ュ簱
+                                        ardAlarmRadarMove.setGuideTime(alarmTime);
+                                        ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
+                                        radarMoveGuide(ardAlarmRadarMove);//寮曞
+                                    }
+                                }
+                                //鍏ョ紦瀛�
+                                //String key = "radar_alarm:" + DateUtils.getDate();
+                                //if (redisCache.hasKey(key)) {
+                                //    redisCache.setCacheList(key, ardAlarmRadarMove, -1, TimeUnit.HOURS);
+                                //} else {
+                                //    Integer expiryTimeInSeconds = DateUtils.getDayRemainingTime(ardAlarmRadarMove.getCreateTime());
+                                //    redisCache.setCacheList(key, ardAlarmRadarMove, expiryTimeInSeconds, TimeUnit.SECONDS);
+                                //}
                                 break;
                             case "鐑簮妫�娴�":
-                                ArdAlarmRadarFire ardAlarmRadarFire=new ArdAlarmRadarFire();
+                                ArdAlarmRadarFire ardAlarmRadarFire = new ArdAlarmRadarFire();
                                 ardAlarmRadarFire.setId(uuid);
                                 ardAlarmRadarFire.setTargetId(targetId);
                                 ardAlarmRadarFire.setAlarmTime(radarAlarmData.getAlarmTime());
@@ -795,34 +1150,98 @@
                                 ardAlarmRadarFire.setAlarmType("鐑簮妫�娴�");
                                 ardAlarmRadarFire.setLongitude(longitude);
                                 ardAlarmRadarFire.setLatitude(latitude);
-                                //鍏ュ簱
-                                ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
-                                ardAlarmRadarFires.add(ardAlarmRadarFire);
+                                guidePTZ.setP(guideP);
+                                guidePTZ.setT(guideT);
+                                guidePTZ.setZ(guideZ);
+                                ardAlarmRadarFire.setGuidePTZ(guidePTZ);
+                                ardAlarmRadarFire.setRadarId(radarId);
+                                ardAlarmRadarFire.setUpdateTime(radarAlarmData.getAlarmTime());
+                                //
+                                ArdAlarmRadarFire lastFireData = ardAlarmRadarFireMapper.selectArdAlarmRadarLastData(ardAlarmRadarFire.getName());
+                                alarmTime = ardAlarmRadarFire.getAlarmTime();
+                                if (lastFireData == null) {
+                                    //鍏ュ簱
+                                    ardAlarmRadarFire.setGuideTime(alarmTime);
+                                    ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
+                                    radarFireGuide(ardAlarmRadarFire);//寮曞
+                                } else {
+                                    //鍚﹀垯姣斿鏇存柊鏃堕棿
+                                    Date lastUpdateTime = lastFireData.getUpdateTime();
+                                    Date lastGuideTime = lastFireData.getGuideTime();
+                                    long secDatePoor = DateUtils.getSecDatePoor(alarmTime, lastUpdateTime);
+                                    if (secDatePoor <= radarMergeTime) {
+                                        //灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
+                                        ArdAlarmRadarFire updateData = new ArdAlarmRadarFire();
+                                        updateData.setId(lastFireData.getId());
+                                        updateData.setUpdateTime(alarmTime);
 
+                                        //鍒ゆ柇寮曞鏃堕棿瓒呰繃5鍒嗛挓鍐嶆寮曞
+                                        long secDatePoorGuide = DateUtils.getSecDatePoor(alarmTime, lastGuideTime);
+                                        if (secDatePoorGuide >= 300) {
+                                            updateData.setGuideTime(alarmTime);
+                                            radarFireGuide(ardAlarmRadarFire);//寮曞
+                                        }
+                                        ardAlarmRadarFireMapper.updateArdAlarmRadarFire(updateData);
+                                    } else {
+                                        //瓒呰繃10绉掔殑鏁版嵁,鍏ュ簱
+                                        ardAlarmRadarFire.setGuideTime(alarmTime);
+                                        ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
+                                        radarFireGuide(ardAlarmRadarFire);//寮曞
+                                    }
+                                }
                                 break;
                             case "闆疯揪鎶芥补鏈哄仠鏈�":
-                                ArdAlarmRadarPump ardAlarmRadarPump=new ArdAlarmRadarPump();
+                                ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
+                                ardAlarmRadarPump.setRadarId(radarId);
                                 ardAlarmRadarPump.setId(uuid);
                                 ardAlarmRadarPump.setTargetId(targetId);
                                 ardAlarmRadarPump.setAlarmTime(radarAlarmData.getAlarmTime());
                                 ardAlarmRadarPump.setCreateTime(new Date());
                                 ardAlarmRadarPump.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");
                                 ardAlarmRadarPump.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
-                                ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
-                                if (StringUtils.isNotNull(ardAlarmpointsWell)) {
-                                    ardAlarmRadarPump.setLongitude(ardAlarmpointsWell.getLongitude());
-                                    ardAlarmRadarPump.setLatitude(ardAlarmpointsWell.getLatitude());
+                                ardAlarmRadarPump.setUpdateTime(radarAlarmData.getAlarmTime());
+                                alarmTime = ardAlarmRadarPump.getAlarmTime();
+                                ardAlarmRadarPump.setLongitude(well.getLongitude());
+                                ardAlarmRadarPump.setLatitude(well.getLatitude());
+                                guidePTZ.setP(guideP);
+                                guidePTZ.setT(guideT);
+                                guidePTZ.setZ(guideZ);
+                                ardAlarmRadarPump.setGuidePTZ(guidePTZ);
+                                //
+                                ArdAlarmRadarPump lastPumpData = ardAlarmRadarPumpMapper.selectArdAlarmRadarLastData(ardAlarmRadarPump.getName());
+                                if (lastPumpData == null) {
+                                    //鍏ュ簱
+                                    ardAlarmRadarPump.setGuideTime(alarmTime);
+                                    ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
+                                    radarPumpGuide(ardAlarmRadarPump);//寮曞
+                                } else {
+                                    //鍚﹀垯姣斿鏇存柊鏃堕棿
+                                    Date lastUpdateTime = lastPumpData.getUpdateTime();
+                                    Date lastGuideTime = lastPumpData.getGuideTime();
+                                    long secDatePoor = DateUtils.getSecDatePoor(alarmTime, lastUpdateTime);
+                                    if (secDatePoor <= radarMergeTime) {
+                                        //灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
+                                        ArdAlarmRadarPump updateData = new ArdAlarmRadarPump();
+                                        updateData.setId(lastPumpData.getId());
+                                        updateData.setUpdateTime(alarmTime);
+                                        //鍒ゆ柇寮曞鏃堕棿瓒呰繃5鍒嗛挓鍐嶆寮曞
+                                        long secDatePoorGuide = DateUtils.getSecDatePoor(alarmTime, lastGuideTime);
+                                        if (secDatePoorGuide >= 300) {
+                                            radarPumpGuide(ardAlarmRadarPump);//寮曞
+                                            updateData.setGuideTime(alarmTime);
+                                        }
+                                        ardAlarmRadarPumpMapper.updateArdAlarmRadarPump(updateData);
+                                    } else {
+                                        //瓒呰繃10绉掔殑鏁版嵁,鍏ュ簱
+                                        ardAlarmRadarPump.setGuideTime(alarmTime);
+                                        ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
+                                        radarPumpGuide(ardAlarmRadarPump);//寮曞
+                                    }
                                 }
-                                //鍏ュ簱
-                                ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
-                                ardAlarmRadarPumps.add(ardAlarmRadarPump);
-
                                 break;
                         }
                     }
-                    radarMoveGuide(ardAlarmRadarMoves,radarAlarmData);
-                    radarFireGuide(ardAlarmRadarFires,radarAlarmData);
-                    radarPumpGuide(ardAlarmRadarPumps,radarAlarmData);
+                    //endregion
                     break;
                 case "external":
                     //region 澶勭悊澶栬仈鎶ヨ
@@ -831,10 +1250,10 @@
                     ardAlarmExternal.setCreateTime(new Date());//鎺ユ敹鏃堕棿
                     //澶栬仈闃插尯鍚嶇О灏辨槸鍏磋叮鐐癸紝鏌ュ叴瓒g偣鍧愭爣
                     String defenseName = ardAlarmExternal.getDefenseName();
-                    ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
-                    if (StringUtils.isNotNull(ardAlarmpointsWell)) {
-                        ardAlarmExternal.setLongitude(ardAlarmpointsWell.getLongitude());
-                        ardAlarmExternal.setLatitude(ardAlarmpointsWell.getLatitude());
+                    ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
+                    if (StringUtils.isNotNull(well)) {
+                        ardAlarmExternal.setLongitude(well.getLongitude());
+                        ardAlarmExternal.setLatitude(well.getLatitude());
                     }
                     int aae = ardAlarmExternalMapper.insertArdAlarmExternal(ardAlarmExternal);
                     if (aae > 0) {
@@ -843,10 +1262,23 @@
                         if (StringUtils.isNull(ardAlarmExternal.getLongitude()) || StringUtils.isNull(ardAlarmExternal.getLatitude())) {
                             return;
                         }
-                        double[] guideCoordinate = new double[]{ardAlarmExternal.getLongitude(), ardAlarmExternal.getLatitude()};//寮曞鍧愭爣
-                        String nearbyCameraId = getNearbyCamera(guideCoordinate);//鏈�杩戠浉鏈篒D
-                        if (StringUtils.isNotEmpty(nearbyCameraId)) {
-                            messagesEnqueued(nearbyCameraId, ardAlarmExternal.getId(), "sys_external", ardAlarmExternal.getCreateTime(), 1, 1, guideCoordinate);
+                        double[] coordinate = new double[]{ardAlarmExternal.getLongitude(), ardAlarmExternal.getLatitude()};//寮曞鍧愭爣
+                        GuidePTZ guidePTZ = new GuidePTZ()
+                                .setP(well.getGuideP())
+                                .setT(well.getGuideT())
+                                .setZ(well.getGuideZ());
+                        String cameraId = getCameraByNear(coordinate);//鏈�杩戠浉鏈篒D
+                        if (StringUtils.isNotEmpty(cameraId)) {
+                            GuideDataDto guideDataDto = new GuideDataDto()
+                                    .setAlarmId(cameraId)
+                                    .setAlarmId(ardAlarmExternal.getId())
+                                    .setAlarmType("sys_external")
+                                    .setReceiveTime(ardAlarmExternal.getCreateTime())
+                                    .setNum(1)
+                                    .setRecordSn(1)
+                                    .setTargetPosition(coordinate)
+                                    .setGuidePTZ(guidePTZ);
+                            messagesEnqueued(guideDataDto);
                         }
                         //endregion
                     }
@@ -874,10 +1306,18 @@
                         if (StringUtils.isNull(ardAlarmAccess.getLongitude()) || StringUtils.isNull(ardAlarmAccess.getLatitude())) {
                             return;
                         }
-                        double[] guideCoordinate = new double[]{ardAlarmAccess.getLongitude(), ardAlarmAccess.getLatitude()};//寮曞鍧愭爣
-                        String nearbyCameraId = getNearbyCamera(guideCoordinate);//鏈�杩戠浉鏈篒D
-                        if (StringUtils.isNotEmpty(nearbyCameraId)) {
-                            messagesEnqueued(nearbyCameraId, ardAlarmAccess.getId(), "sys_access_control", ardAlarmAccess.getCreateTime(), 1, 1, guideCoordinate);
+                        double[] coordinate = new double[]{ardAlarmAccess.getLongitude(), ardAlarmAccess.getLatitude()};//寮曞鍧愭爣
+                        String cameraId = getCameraByNear(coordinate);//鏈�杩戠浉鏈篒D
+                        if (StringUtils.isNotEmpty(cameraId)) {
+                            GuideDataDto guideDataDto = new GuideDataDto()
+                                    .setAlarmId(cameraId)
+                                    .setAlarmId(ardAlarmAccess.getId())
+                                    .setAlarmType("sys_external")
+                                    .setReceiveTime(ardAlarmAccess.getCreateTime())
+                                    .setNum(1)
+                                    .setRecordSn(1)
+                                    .setTargetPosition(coordinate);
+                            messagesEnqueued(guideDataDto);
                         }
                         //endregion
                     }
@@ -889,6 +1329,34 @@
                     int aaak = ardAlarmApponekeyMapper.insertArdAlarmApponekey(ardAlarmApponekey);
                     if (aaak > 0) {
                         log.debug("apponekey鍏ュ簱鎴愬姛锛�" + ardAlarmApponekey);
+                    }
+                    //endregion
+                    break;
+                case "digitization3":
+                    //region 涓夊巶鏁板瓧鍖栨姤璀�
+                    ArdAlarmDigitization3 ardAlarmDigitization3 = JSONObject.parseObject(message, ArdAlarmDigitization3.class);
+                    //鑾峰彇缁忕含搴�
+                    ArdAlarmpointsWell Well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmDigitization3.getWellNo());
+                    if (Well != null) {
+                        ardAlarmDigitization3.setLongitude(Well.getLongitude());
+                        ardAlarmDigitization3.setLatitude(Well.getLatitude());
+                        ardAlarmDigitization3.setAltitude(Well.getAltitude());
+                    }
+                    ardAlarmDigitization3.setCreateTime(new Date());
+                    int aad = ardAlarmDigitization3Mapper.insertArdAlarmDigitization3(ardAlarmDigitization3);
+                    if (aad > 0) {
+                        log.debug("digitization3鍏ュ簱鎴愬姛锛�" + ardAlarmDigitization3);
+                    }
+                    //endregion
+                    break;
+                case "superBrain":
+                    //region 瓒呰剳鎶ヨ
+                    ArdAlarmSuperBrain ardAlarmSuperBrain = JSONObject.parseObject(message, ArdAlarmSuperBrain.class);
+                    ardAlarmSuperBrain.setId(IdUtils.simpleUUID());
+                    ardAlarmSuperBrain.setCreateTime(new Date());
+                    int sbRes = ardAlarmSuperBrainMapper.insertArdAlarmSuperBrain(ardAlarmSuperBrain);
+                    if (sbRes > 0) {
+                        log.debug("superBrain鍏ュ簱鎴愬姛锛�" + ardAlarmSuperBrain);
                     }
                     //endregion
                     break;
@@ -908,8 +1376,10 @@
      * recordSn 褰曞儚瀛樺偍浣嶇疆 1-recordUrl1 2-recordUrl2
      * targetPosition 鎶ヨ鐐逛綅缃潗鏍�
      */
-    private void messagesEnqueued(String cameraId, String alarmId, String alarmType, Date receiveTime, Integer num, Integer recordSn, double[] targetPosition) {
+    private void messagesEnqueued(GuideDataDto guideDataDto) {
         try {
+            String cameraId = guideDataDto.getCameraId();
+            String alarmType = guideDataDto.getAlarmType();
             if (!IsEnableGuide(cameraId)) {
                 log.info("鐩告満:" + cameraId + "鏈紑鍚姤璀﹀紩瀵煎姛鑳�");
                 return;
@@ -919,38 +1389,45 @@
             //鐩告満ID
             guideTask.setCameraId(cameraId);
             //鎶ヨ绫诲瀷
-            String aType="";
-            switch (alarmType)
-            {
-                case "杩愬姩鐩爣妫�娴�": aType="sys_radar_move";break;
-                case "鐑簮妫�娴�": aType="sys_radar_fire";break;
-                case "闆疯揪鎶芥补鏈哄仠鏈�": aType="sys_radar_pump";break;
-                default: aType=alarmType;break;
+            switch (alarmType) {
+                case "杩愬姩鐩爣妫�娴�":
+                    alarmType = "sys_radar_move";
+                    break;
+                case "鐑簮妫�娴�":
+                    alarmType = "sys_radar_fire";
+                    break;
+                case "闆疯揪鎶芥补鏈哄仠鏈�":
+                    alarmType = "sys_radar_pump";
+                    break;
             }
-            guideTask.setAlarmType(aType);
+            guideTask.setAlarmType(alarmType);
             //閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
             String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
             Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
             guideTask.setChanNum(channel);
             //鎶ヨID
-            guideTask.setAlarmId(alarmId);
+            guideTask.setAlarmId(guideDataDto.getAlarmId());
             //鎺ユ敹鏃堕棿
-            guideTask.setReceiveTime(fmt.format(receiveTime));
+            guideTask.setReceiveTime(fmt.format(guideDataDto.getReceiveTime()));
             //鎶ヨ浼樺厛绾�(閫氳繃浼樺厛绾у瓧鍏�)
-            String priority = DictUtils.getDictValue("cameras_priority", aType);
+            String priority = DictUtils.getDictValue("cameras_priority", alarmType);
             if (StringUtils.isEmpty(priority)) {
                 log.debug("鏈尮閰嶅埌浼樺厛绾�,璇锋鏌ヤ紭鍏堢骇瀛楀吀閰嶇疆");
                 return;
             }
             guideTask.setPriority(Integer.valueOf(priority));
             //鎶ヨ娆℃暟
-            guideTask.setNum(num);
+            guideTask.setNum(guideDataDto.getNum());
             //褰曞儚瀛樺偍浣嶇疆
-            guideTask.setRecordSn(recordSn);
+            guideTask.setRecordSn(guideDataDto.getRecordSn());
             //鐩爣缁忕含搴�
-            guideTask.setTargetPosition(targetPosition);
+            guideTask.setTargetPosition(guideDataDto.getTargetPosition());
+            //鐩爣PTZ
+            if (guideDataDto.getGuidePTZ() != null) {
+                guideTask.setGuidePTZ(guideDataDto.getGuidePTZ());
+            }
             //娑堟伅鍏ラ槦
-            queueManager.addTaskToQueue(cameraId, guideTask);
+            queueHandler.addTaskToQueue(cameraId, guideTask);
             //鎵撳嵃闃熷垪
             GuidePriorityQueue.printPriorityQueue();
         } catch (Exception ex) {
@@ -977,7 +1454,7 @@
     /**
      * 鑾峰彇闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
      */
-    private String getNearbyCamera(double[] targetPosition) {
+    private String getCameraByNear(double[] targetPosition) {
         String minDistanceCameraId = "";
         try {
             //鑾峰彇鎵�鏈夊ぇ鍏夌數
@@ -1015,189 +1492,101 @@
         return minDistanceCameraId;
     }
 
-
-    /**
-     * 闆疯揪寮曞鍏ラ槦
-     */
-    private void radarGuideToQueue(String alarmId,String radarId, String name, String alarmType, Date createTime, double[] coordinate) {
-        int index = name.indexOf("(");
-        String alarmpointName = name.substring(0, index);
+    //鑾峰彇鐩告満寮曞鍏ラ槦
+    private void getCameraGuideToQueue(GuideDataDto guideDataDto) {
+        int index = guideDataDto.getName().indexOf("(");
+        String alarmpointName = guideDataDto.getName().substring(0, index);
         //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
-        String cameraIdWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
-        if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
-            log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraIdWithTower);
+        ArdCameras cameraWithTower = ardEquipRadarMapper.getCameraByRadar(guideDataDto.getRadarId());
+        if (StringUtils.isNotNull(cameraWithTower)) {
+            log.debug("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraWithTower.getId());
             //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
-            messagesEnqueued(cameraIdWithTower, alarmId, alarmType, createTime, 1, 1, coordinate);
+            guideDataDto.setCameraId(cameraWithTower.getId());
+            messagesEnqueued(guideDataDto);
+        } else {
+            log.debug("鏈幏鍙栧埌闆疯揪濉斾笂鐨勫厜鐢�,鏃犳硶寮曞");
         }
         //鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
         ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
         if (StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId())) {
             String cameraId = ardAlarmpointsWell.getCameraId();
-            if (cameraId.equals(cameraIdWithTower)) {
+            if (cameraId.equals(cameraWithTower.getId())) {
                 return;
             }
-            log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:" + cameraId);
+            log.debug("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:" + cameraId);
             //濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
-            messagesEnqueued(cameraId, alarmId, alarmType, createTime, 1, 2, coordinate);
+            guideDataDto.setCameraId(cameraId);
+            guideDataDto.setRecordSn(2);//鍏磋叮鐐瑰厜鐢靛紩瀵煎綍鍍忓瓨鍌ㄧ浜屼釜璺緞
+            messagesEnqueued(guideDataDto);
+        } else {
+            log.debug("鏈幏鍙栧埌鎶ヨ鐐瑰叧鑱旂殑鍏夌數,鏃犳硶寮曞");
         }
     }
 
-
-    private void radarMoveGuide(List<ArdAlarmRadarMove> ardAlarmRadarMoves,RadarAlarmData radarAlarmData)
-    {
-        //鎸夊叴瓒g偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
-        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())) {
-                    //鍧愭爣涓虹┖涓嶅紩瀵�
-                    continue;
-                }
-                double[] coordinate = new double[]{ardAlarmRadarMove.getLongitude(), ardAlarmRadarMove.getLatitude()};//鎶ヨ鍧愭爣
-                //浠巖edis涓彇鍑哄綋鍓嶆姤璀︾偣鐨�5鍒嗛挓鍐呮槸鍚︽湁寮曞
-                ArdAlarmRadarMove alarmRadarMove = redisCache.getCacheObject("global_move_alarm:" + ardAlarmRadarMove.getName());//浠巖edis涓彇鍑烘渶鏂板紩瀵肩殑鎶ヨ鏁版嵁
-                if (alarmRadarMove == null) {
-                    //5鍒嗛挓鍐卹edis涓病鏈夋暟鎹紝璇存槑5鍒嗛挓鍐呮病鏈夊紩瀵兼暟鎹�
-                    ardAlarmRadarMove.setGuideFlag(1);
-                    //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
-                    redisCache.setCacheObject("global_move_alarm:" + ardAlarmRadarMove.getName(), ardAlarmRadarMove, 5, TimeUnit.MINUTES);//寮曞鏁版嵁鍐欏叆redis
-                    unGuideCountMapMove.put(ardAlarmRadarMove.getName(), 0);
-                    //寮曞鍏ラ槦
-                    radarGuideToQueue(ardAlarmRadarMove.getId(), radarAlarmData.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);//鏇存柊
-
-                } else {
-                    //5鍒嗛挓鍐卹edis涓湁鏁版嵁锛岃鏄�5鍒嗛挓鍐呮湁寮曞鏁版嵁,鑾峰彇褰撳墠鎶ヨ鐐圭殑鏈紩瀵兼鏁�
-                    Integer count = unGuideCountMapMove.get(ardAlarmRadarMove.getName());
-                    if (count != null) {
-                        if (count > 2) {
-                            //鏈紩瀵兼鏁�3娆″悗杩涜寮曞
-                            ardAlarmRadarMove.setGuideFlag(1);
-                            //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
-                            redisCache.setCacheObject("global_move_alarm:" + ardAlarmRadarMove.getName(), ardAlarmRadarMove, 5, TimeUnit.MINUTES);
-                            count = 0;
-                            //寮曞鍏ラ槦
-
-                            radarGuideToQueue(ardAlarmRadarMove.getId(), radarAlarmData.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);
-                        } else {
-                            ardAlarmRadarMove.setGuideFlag(0);
-                            count++;
-                        }
-                    } else {
-                        ardAlarmRadarMove.setGuideFlag(0);
-                        count = 0;
-                    }
-                    unGuideCountMapMove.put(ardAlarmRadarMove.getName(), count);
-                }
-                //鏇存柊
-                ardAlarmRadarMoveMapper.updateArdAlarmRadarMove(ardAlarmRadarMove);
-            }
+    //闆疯揪绉诲姩寮曞
+    private void radarMoveGuide(ArdAlarmRadarMove ardAlarmRadarMove) {
+        log.debug("闆疯揪绉诲姩寮�濮嬪紩瀵�");
+        if (StringUtils.isNull(ardAlarmRadarMove.getLongitude()) || StringUtils.isNull(ardAlarmRadarMove.getLatitude())) {
+            log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
+            return;
         }
-        //endregion
+        double[] coordinate = new double[]{ardAlarmRadarMove.getLongitude(), ardAlarmRadarMove.getLatitude()};//鎶ヨ鍧愭爣
+        //寮曞鍏ラ槦
+        GuideDataDto guideDataDto = new GuideDataDto()
+                .setRadarId( ardAlarmRadarMove.getRadarId())
+                .setName(ardAlarmRadarMove.getName())
+                .setAlarmId(ardAlarmRadarMove.getId())
+                .setAlarmType(ardAlarmRadarMove.getAlarmType())
+                .setReceiveTime(ardAlarmRadarMove.getCreateTime())
+                .setNum(1)
+                .setRecordSn(1)
+                .setTargetPosition(coordinate)
+                .setGuidePTZ(ardAlarmRadarMove.getGuidePTZ());
+        getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
     }
-    private void radarFireGuide(List<ArdAlarmRadarFire> ardAlarmRadarFires,RadarAlarmData radarAlarmData)
-    {
-        //鎸夊叴瓒g偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
-        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())) {
-                    //鍧愭爣涓虹┖涓嶅紩瀵�
-                    continue;
-                }
-                double[] coordinate = new double[]{ardAlarmRadarFire.getLongitude(), ardAlarmRadarFire.getLatitude()};//鎶ヨ鍧愭爣
-                //浠巖edis涓彇鍑哄綋鍓嶆姤璀︾偣鐨�5鍒嗛挓鍐呮槸鍚︽湁寮曞
-                ArdAlarmRadarFire alarmRadarFire = redisCache.getCacheObject("global_fire_alarm:" + ardAlarmRadarFire.getName());//浠巖edis涓彇鍑烘渶鏂板紩瀵肩殑鎶ヨ鏁版嵁
-                if (alarmRadarFire == null) {
-                    //5鍒嗛挓鍐卹edis涓病鏈夋暟鎹紝璇存槑5鍒嗛挓鍐呮病鏈夊紩瀵兼暟鎹�
-                    ardAlarmRadarFire.setGuideFlag(1);
-                    //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
-                    redisCache.setCacheObject("global_fire_alarm:" + ardAlarmRadarFire.getName(), ardAlarmRadarFire, 5, TimeUnit.MINUTES);//寮曞鏁版嵁鍐欏叆redis
-                    unGuideCountMapFire.put(alarmRadarFire.getName(), 0);
-                    //寮曞鍏ラ槦
-                    radarGuideToQueue(ardAlarmRadarFire.getId(), radarAlarmData.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);
 
-                } else {
-                    //5鍒嗛挓鍐卹edis涓湁鏁版嵁锛岃鏄�5鍒嗛挓鍐呮湁寮曞鏁版嵁,鑾峰彇褰撳墠鎶ヨ鐐圭殑鏈紩瀵兼鏁�
-                    Integer count = unGuideCountMapFire.get(alarmRadarFire.getName());
-                    if (count != null) {
-                        if (count > 2) {
-                            //鏈紩瀵兼鏁�3娆″悗杩涜寮曞
-                            ardAlarmRadarFire.setGuideFlag(1);
-                            //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
-                            redisCache.setCacheObject("global_fire_alarm:" + ardAlarmRadarFire.getName(), ardAlarmRadarFire, 5, TimeUnit.MINUTES);
-                            count = 0;
-                            //寮曞鍏ラ槦
-                            radarGuideToQueue(ardAlarmRadarFire.getId(), radarAlarmData.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);
-                        } else {
-                            ardAlarmRadarFire.setGuideFlag(0);
-                            count++;
-                        }
-                    } else {
-                        ardAlarmRadarFire.setGuideFlag(0);
-                        count = 0;
-                    }
-                    unGuideCountMapFire.put(ardAlarmRadarFire.getName(), count);
-                }
-                //鏇存柊
-                ardAlarmRadarFireMapper.updateArdAlarmRadarFire(ardAlarmRadarFire);
-            }
+    //闆疯揪闃茬伀寮曞
+    private void radarFireGuide(ArdAlarmRadarFire ardAlarmRadarFire) {
+        log.debug("闆疯揪闃茬伀寮�濮嬪紩瀵�");
+        if (StringUtils.isNull(ardAlarmRadarFire.getLongitude()) || StringUtils.isNull(ardAlarmRadarFire.getLatitude())) {
+            log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
+            return;
         }
-        //endregion
+        double[] coordinate = new double[]{ardAlarmRadarFire.getLongitude(), ardAlarmRadarFire.getLatitude()};//鎶ヨ鍧愭爣
+        //寮曞鍏ラ槦
+        GuideDataDto guideDataDto = new GuideDataDto()
+                .setRadarId( ardAlarmRadarFire.getRadarId())
+                .setName(ardAlarmRadarFire.getName())
+                .setAlarmId(ardAlarmRadarFire.getId())
+                .setAlarmType(ardAlarmRadarFire.getAlarmType())
+                .setReceiveTime(ardAlarmRadarFire.getCreateTime())
+                .setNum(1)
+                .setRecordSn(1)
+                .setTargetPosition(coordinate)
+                .setGuidePTZ(ardAlarmRadarFire.getGuidePTZ());
+        getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
     }
-    private void radarPumpGuide(List<ArdAlarmRadarPump> ardAlarmRadarPumps,RadarAlarmData radarAlarmData)
-    {
-        //鎸夊叴瓒g偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
-        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())) {
-                    //鍧愭爣涓虹┖涓嶅紩瀵�
-                    continue;
-                }
-                double[] coordinate = new double[]{ardAlarmRadarPump.getLongitude(), ardAlarmRadarPump.getLatitude()};//鎶ヨ鍧愭爣
-                //浠巖edis涓彇鍑哄綋鍓嶆姤璀︾偣鐨�5鍒嗛挓鍐呮槸鍚︽湁寮曞
-                ArdAlarmRadarPump alarmRadarPump = redisCache.getCacheObject("global_pump_alarm:" + ardAlarmRadarPump.getName());//浠巖edis涓彇鍑烘渶鏂板紩瀵肩殑鎶ヨ鏁版嵁
-                if (alarmRadarPump == null) {
-                    //5鍒嗛挓鍐卹edis涓病鏈夋暟鎹紝璇存槑5鍒嗛挓鍐呮病鏈夊紩瀵兼暟鎹�
-                    ardAlarmRadarPump.setGuideFlag(1);
-                    //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
-                    redisCache.setCacheObject("global_pump_alarm:" + ardAlarmRadarPump.getName(), ardAlarmRadarPump, 5, TimeUnit.MINUTES);//寮曞鏁版嵁鍐欏叆redis
-                    unGuideCountMapPump.put(alarmRadarPump.getName(), 0);
-                    //寮曞鍏ラ槦
-                    radarGuideToQueue(ardAlarmRadarPump.getId(), radarAlarmData.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);
 
-                } else {
-                    //5鍒嗛挓鍐卹edis涓湁鏁版嵁锛岃鏄�5鍒嗛挓鍐呮湁寮曞鏁版嵁,鑾峰彇褰撳墠鎶ヨ鐐圭殑鏈紩瀵兼鏁�
-                    Integer count = unGuideCountMapPump.get(ardAlarmRadarPump.getName());
-                    if (count != null) {
-                        if (count > 2) {
-                            //鏈紩瀵兼鏁�3娆″悗杩涜寮曞
-                            ardAlarmRadarPump.setGuideFlag(1);
-                            //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
-                            redisCache.setCacheObject("global_pump_alarm:" + ardAlarmRadarPump.getName(), ardAlarmRadarPump, 5, TimeUnit.MINUTES);
-                            count = 0;
-                            //寮曞鍏ラ槦
-                            radarGuideToQueue(ardAlarmRadarPump.getId(), radarAlarmData.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);
-                        } else {
-                            ardAlarmRadarPump.setGuideFlag(0);
-                            count++;
-                        }
-                    } else {
-                        ardAlarmRadarPump.setGuideFlag(0);
-                        count = 0;
-                    }
-                    unGuideCountMapPump.put(ardAlarmRadarPump.getName(), count);
-                }
-                //鏇存柊
-                ardAlarmRadarPumpMapper.updateArdAlarmRadarPump(ardAlarmRadarPump);
-            }
+    //闆疯揪鎶芥补鏈哄仠鏈哄紩瀵�
+    private void radarPumpGuide(ArdAlarmRadarPump ardAlarmRadarPump) {
+        log.debug("闆疯揪鎶芥补鏈哄仠鏈哄紑濮嬪紩瀵�");
+        if (StringUtils.isNull(ardAlarmRadarPump.getLongitude()) || StringUtils.isNull(ardAlarmRadarPump.getLatitude())) {
+            //鍧愭爣涓虹┖涓嶅紩瀵�
+            log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
+            return;
         }
-        //endregion
+        double[] coordinate = new double[]{ardAlarmRadarPump.getLongitude(), ardAlarmRadarPump.getLatitude()};//鎶ヨ鍧愭爣
+        //寮曞鍏ラ槦
+        GuideDataDto guideDataDto = new GuideDataDto()
+                .setRadarId( ardAlarmRadarPump.getRadarId())
+                .setName(ardAlarmRadarPump.getName())
+                .setAlarmId(ardAlarmRadarPump.getId())
+                .setAlarmType(ardAlarmRadarPump.getAlarmType())
+                .setReceiveTime(ardAlarmRadarPump.getCreateTime())
+                .setNum(1)
+                .setRecordSn(1)
+                .setTargetPosition(coordinate)
+                .setGuidePTZ(ardAlarmRadarPump.getGuidePTZ());
+        getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
     }
 }

--
Gitblit v1.9.3