From 4974beff57772cc0602cb36e2c80694ca8d62094 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 31 一月 2024 15:39:50 +0800
Subject: [PATCH] app用户查询自身受约束的电子围栏提交

---
 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java |  528 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 324 insertions(+), 204 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 cbfef91..ba87d51 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
@@ -11,10 +11,7 @@
 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;
@@ -22,6 +19,8 @@
 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,7 +32,6 @@
 import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
 import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
 import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.core.domain.entity.SysConfig;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.ConfigUtils;
 import com.ruoyi.common.utils.DateUtils;
@@ -57,7 +55,6 @@
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 
@@ -69,9 +66,11 @@
  * @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
@@ -111,7 +110,7 @@
     @Resource
     private RedisCache redisCache;
     @Resource
-    private QueueManager queueManager;
+    private QueueHandler queueHandler;
     @Resource
     private ArdEquipRadarMapper ardEquipRadarMapper;
     //endregion
@@ -151,6 +150,8 @@
         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;
     }
@@ -323,6 +324,22 @@
                                     .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:
@@ -498,6 +515,22 @@
                                     .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:
@@ -690,6 +723,7 @@
         if (alarmData1012.size() > 0) {
             GlobalAlarmDataList.addAll(alarmData1012);
         }
+
         List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
         List<GlobalAlarmData> alarmData1014 = ardAlarmTubes.stream()
                 .map(ardAlarmTube -> {
@@ -708,6 +742,26 @@
         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;
     }
 
@@ -796,6 +850,12 @@
                 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;
     }
@@ -902,6 +962,14 @@
                     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;
         }
@@ -964,9 +1032,15 @@
                             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())
+                                    .setTargetPosition(coordinate);
+                            messagesEnqueued(guideDataDto);
                         }
                         //endregion
                     }
@@ -985,16 +1059,19 @@
                     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();
                     for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
                         String uuid = IdUtils.simpleUUID();
                         String radarId = radarAlarmData.getRadarId();
                         String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
-                        Double longitude = ardAlarmRadar.getLongitude();
-                        Double latitude = ardAlarmRadar.getLatitude();
+                        ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
+                        if (well == null) {
+                            return;
+                        }
+
+                        Double longitude = well.getLongitude();
+                        Double latitude = well.getLatitude();
                         String targetId = ardAlarmRadar.getTargetId();
                         switch (ardAlarmRadar.getAlarmType()) {
                             case "杩愬姩鐩爣妫�娴�":
@@ -1002,104 +1079,28 @@
                                 ardAlarmRadarMove.setId(uuid);
                                 ardAlarmRadarMove.setTargetId(targetId);
                                 ardAlarmRadarMove.setAlarmTime(radarAlarmData.getAlarmTime());
-                                ardAlarmRadarMove.setCreateTime(DateUtils.covertTime(new Date()));
+                                ardAlarmRadarMove.setCreateTime(new Date());
                                 ardAlarmRadarMove.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
                                 ardAlarmRadarMove.setAlarmType("杩愬姩鐩爣妫�娴�");
                                 ardAlarmRadarMove.setLongitude(longitude);
                                 ardAlarmRadarMove.setLatitude(latitude);
                                 ardAlarmRadarMove.setUpdateTime(radarAlarmData.getAlarmTime());
                                 ardAlarmRadarMove.setRadarId(radarId);
-                                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);
-                                //}
+                                ardAlarmRadarMoveHandler(ardAlarmRadarMove);
                                 break;
                             case "鐑簮妫�娴�":
                                 ArdAlarmRadarFire ardAlarmRadarFire = new ArdAlarmRadarFire();
                                 ardAlarmRadarFire.setId(uuid);
                                 ardAlarmRadarFire.setTargetId(targetId);
                                 ardAlarmRadarFire.setAlarmTime(radarAlarmData.getAlarmTime());
-                                ardAlarmRadarFire.setCreateTime(DateUtils.covertTime(new Date()));
+                                ardAlarmRadarFire.setCreateTime(new Date());
                                 ardAlarmRadarFire.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
                                 ardAlarmRadarFire.setAlarmType("鐑簮妫�娴�");
                                 ardAlarmRadarFire.setLongitude(longitude);
                                 ardAlarmRadarFire.setLatitude(latitude);
                                 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);//寮曞
-                                    }
-                                }
+                                ardAlarmRadarFireHandler(ardAlarmRadarFire);
                                 break;
                             case "闆疯揪鎶芥补鏈哄仠鏈�":
                                 ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
@@ -1107,48 +1108,13 @@
                                 ardAlarmRadarPump.setId(uuid);
                                 ardAlarmRadarPump.setTargetId(targetId);
                                 ardAlarmRadarPump.setAlarmTime(radarAlarmData.getAlarmTime());
-                                ardAlarmRadarPump.setCreateTime(DateUtils.covertTime(new Date()));
+                                ardAlarmRadarPump.setCreateTime(new Date());
                                 ardAlarmRadarPump.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");
                                 ardAlarmRadarPump.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
                                 ardAlarmRadarPump.setUpdateTime(radarAlarmData.getAlarmTime());
-                                alarmTime = ardAlarmRadarPump.getAlarmTime();
-                                ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
-                                if (StringUtils.isNotNull(ardAlarmpointsWell)) {
-                                    ardAlarmRadarPump.setLongitude(ardAlarmpointsWell.getLongitude());
-                                    ardAlarmRadarPump.setLatitude(ardAlarmpointsWell.getLatitude());
-                                }
-                                //
-                                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);//寮曞
-                                    }
-                                }
+                                ardAlarmRadarPump.setLongitude(well.getLongitude());
+                                ardAlarmRadarPump.setLatitude(well.getLatitude());
+                                ardAlarmRadarPumpHandler(ardAlarmRadarPump);
                                 break;
                         }
                     }
@@ -1161,10 +1127,11 @@
                     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) {
@@ -1173,10 +1140,17 @@
                         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()};//寮曞鍧愭爣
+                        String cameraId = getCameraByNear(coordinate);//鏈�杩戠浉鏈篒D
+                        if (StringUtils.isNotEmpty(cameraId)) {
+                            GuideDataDto guideDataDto = new GuideDataDto()
+                                    .setAlarmId(cameraId)
+                                    .setAlarmId(ardAlarmExternal.getId())
+                                    .setAlarmType("sys_external")
+                                    .setReceiveTime(ardAlarmExternal.getCreateTime())
+                                    .setTargetPosition(coordinate)
+                                    .setWellId(well.getId());
+                            messagesEnqueued(guideDataDto);
                         }
                         //endregion
                     }
@@ -1204,10 +1178,16 @@
                         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())
+                                    .setTargetPosition(coordinate);
+                            messagesEnqueued(guideDataDto);
                         }
                         //endregion
                     }
@@ -1239,6 +1219,17 @@
                     }
                     //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;
             }
         } catch (Exception ex) {
             log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
@@ -1255,56 +1246,42 @@
      * 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();
             if (!IsEnableGuide(cameraId)) {
-                log.info("鐩告満:" + cameraId + "鏈紑鍚姤璀﹀紩瀵煎姛鑳�");
+                log.debug("鐩告満:" + cameraId + "鏈紑鍚姤璀﹀紩瀵煎姛鑳�");
                 return;
             }
-            SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
             GuideTask guideTask = new GuideTask();
-            //鐩告満ID
-            guideTask.setCameraId(cameraId);
-            //鎶ヨ绫诲瀷
-            String aType = "";
+            guideTask.setCameraId(cameraId);//鐩告満ID
+            String alarmType = guideDataDto.getAlarmType();
             switch (alarmType) {
                 case "杩愬姩鐩爣妫�娴�":
-                    aType = "sys_radar_move";
+                    alarmType = "sys_radar_move";
                     break;
                 case "鐑簮妫�娴�":
-                    aType = "sys_radar_fire";
+                    alarmType = "sys_radar_fire";
                     break;
                 case "闆疯揪鎶芥补鏈哄仠鏈�":
-                    aType = "sys_radar_pump";
-                    break;
-                default:
-                    aType = alarmType;
+                    alarmType = "sys_radar_pump";
                     break;
             }
-            guideTask.setAlarmType(aType);
-            //閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
-            String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
-            Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
-            guideTask.setChanNum(channel);
-            //鎶ヨID
-            guideTask.setAlarmId(alarmId);
-            //鎺ユ敹鏃堕棿
-            guideTask.setReceiveTime(fmt.format(receiveTime));
+            guideTask.setAlarmType(alarmType);//鎶ヨ绫诲瀷
+            Integer chanNo = ArdTool.getChannelBydayNightTime(redisCache.getCacheObject("sys_config:dayNightTime"));
+            guideTask.setChanNo(chanNo);//閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
+            guideTask.setAlarmId(guideDataDto.getAlarmId()); //鎶ヨID
+            guideTask.setReceiveTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS_MS, 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.setRecordSn(recordSn);
-            //鐩爣缁忕含搴�
-            guideTask.setTargetPosition(targetPosition);
+            guideTask.setTargetPosition(guideDataDto.getTargetPosition());//寮曞浜旾D
             //娑堟伅鍏ラ槦
-            queueManager.addTaskToQueue(cameraId, guideTask);
+            queueHandler.addTaskToQueue(cameraId, guideTask);
             //鎵撳嵃闃熷垪
             GuidePriorityQueue.printPriorityQueue();
         } catch (Exception ex) {
@@ -1331,7 +1308,7 @@
     /**
      * 鑾峰彇闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
      */
-    private String getNearbyCamera(double[] targetPosition) {
+    private String getCameraByNear(double[] targetPosition) {
         String minDistanceCameraId = "";
         try {
             //鑾峰彇鎵�鏈夊ぇ鍏夌數
@@ -1369,34 +1346,25 @@
         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) {
         //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
-        String cameraIdWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
-        if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
-            log.debug("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + 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)) {
-                return;
-            }
-            log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:" + cameraId);
-            //濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
-            messagesEnqueued(cameraId, alarmId, alarmType, createTime, 1, 2, coordinate);
-        } else {
-            log.debug("鏈幏鍙栧埌鎶ヨ鐐瑰叧鑱旂殑鍏夌數,鏃犳硶寮曞");
-        }
     }
-    //闆疯揪绉诲姩寮曞
+
+    /**
+     * 闆疯揪绉诲姩寮曞
+     * 鍒樿嫃涔�
+     * 2023/12/14 15:04:24
+     */
     private void radarMoveGuide(ArdAlarmRadarMove ardAlarmRadarMove) {
         log.debug("闆疯揪绉诲姩寮�濮嬪紩瀵�");
         if (StringUtils.isNull(ardAlarmRadarMove.getLongitude()) || StringUtils.isNull(ardAlarmRadarMove.getLatitude())) {
@@ -1405,9 +1373,21 @@
         }
         double[] coordinate = new double[]{ardAlarmRadarMove.getLongitude(), ardAlarmRadarMove.getLatitude()};//鎶ヨ鍧愭爣
         //寮曞鍏ラ槦
-        radarGuideToQueue(ardAlarmRadarMove.getId(), ardAlarmRadarMove.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);//鏇存柊
+        GuideDataDto guideDataDto = new GuideDataDto()
+                .setRadarId(ardAlarmRadarMove.getRadarId())
+                .setName(ardAlarmRadarMove.getName())
+                .setAlarmId(ardAlarmRadarMove.getId())
+                .setAlarmType(ardAlarmRadarMove.getAlarmType())
+                .setReceiveTime(ardAlarmRadarMove.getCreateTime())
+                .setTargetPosition(coordinate);
+        getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
     }
-    //闆疯揪闃茬伀寮曞
+
+    /**
+     * 闆疯揪闃茬伀寮曞
+     * 鍒樿嫃涔�
+     * 2023/12/14 15:04:32
+     */
     private void radarFireGuide(ArdAlarmRadarFire ardAlarmRadarFire) {
         log.debug("闆疯揪闃茬伀寮�濮嬪紩瀵�");
         if (StringUtils.isNull(ardAlarmRadarFire.getLongitude()) || StringUtils.isNull(ardAlarmRadarFire.getLatitude())) {
@@ -1416,9 +1396,21 @@
         }
         double[] coordinate = new double[]{ardAlarmRadarFire.getLongitude(), ardAlarmRadarFire.getLatitude()};//鎶ヨ鍧愭爣
         //寮曞鍏ラ槦
-        radarGuideToQueue(ardAlarmRadarFire.getId(), ardAlarmRadarFire.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);//鏇存柊
+        GuideDataDto guideDataDto = new GuideDataDto()
+                .setRadarId(ardAlarmRadarFire.getRadarId())
+                .setName(ardAlarmRadarFire.getName())
+                .setAlarmId(ardAlarmRadarFire.getId())
+                .setAlarmType(ardAlarmRadarFire.getAlarmType())
+                .setReceiveTime(ardAlarmRadarFire.getCreateTime())
+                .setTargetPosition(coordinate);
+        getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
     }
-    //闆疯揪鎶芥补鏈哄仠鏈哄紩瀵�
+
+    /**
+     * 闆疯揪鎶芥补鏈哄仠鏈哄紩瀵�
+     * 鍒樿嫃涔�
+     * 2023/12/14 15:04:40
+     */
     private void radarPumpGuide(ArdAlarmRadarPump ardAlarmRadarPump) {
         log.debug("闆疯揪鎶芥补鏈哄仠鏈哄紑濮嬪紩瀵�");
         if (StringUtils.isNull(ardAlarmRadarPump.getLongitude()) || StringUtils.isNull(ardAlarmRadarPump.getLatitude())) {
@@ -1428,7 +1420,135 @@
         }
         double[] coordinate = new double[]{ardAlarmRadarPump.getLongitude(), ardAlarmRadarPump.getLatitude()};//鎶ヨ鍧愭爣
         //寮曞鍏ラ槦
-        radarGuideToQueue(ardAlarmRadarPump.getId(), ardAlarmRadarPump.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);//鏇存柊
+        GuideDataDto guideDataDto = new GuideDataDto()
+                .setRadarId(ardAlarmRadarPump.getRadarId())
+                .setName(ardAlarmRadarPump.getName())
+                .setAlarmId(ardAlarmRadarPump.getId())
+                .setAlarmType(ardAlarmRadarPump.getAlarmType())
+                .setReceiveTime(ardAlarmRadarPump.getCreateTime())
+                .setTargetPosition(coordinate);
+        getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
     }
 
+    /**
+     * 闆疯揪鐩爣绉诲姩鎶ヨ澶勭悊
+     * 鍒樿嫃涔�
+     * 2023/12/14 15:03:32
+     */
+    private void ardAlarmRadarMoveHandler(ArdAlarmRadarMove ardAlarmRadarMove) {
+        String mergeTime = ConfigUtils.getConfigValue("radarMergeTime");
+        Integer radarMergeTime = mergeTime == null || "".equals(mergeTime) ? 10 : Integer.valueOf(mergeTime);
+        ArdAlarmRadarMove lastMoveData = ardAlarmRadarMoveMapper.selectArdAlarmRadarLastData(ardAlarmRadarMove.getName());
+        if (lastMoveData == null) {
+            //鍏ュ簱
+            ardAlarmRadarMove.setGuideTime(ardAlarmRadarMove.getAlarmTime());
+            ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
+            radarMoveGuide(ardAlarmRadarMove);//寮曞
+        } else {
+            //鍚﹀垯姣斿鏇存柊鏃堕棿
+            Date lastUpdateTime = lastMoveData.getUpdateTime();
+            Date lastGuideTime = lastMoveData.getGuideTime();
+            long secDatePoor = DateUtils.getSecDatePoor(ardAlarmRadarMove.getAlarmTime(), lastUpdateTime);
+            if (secDatePoor <= radarMergeTime) {
+                //灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
+                ArdAlarmRadarMove updateData = new ArdAlarmRadarMove();
+                updateData.setId(lastMoveData.getId());
+                updateData.setUpdateTime(ardAlarmRadarMove.getAlarmTime());
+
+                //鍒ゆ柇寮曞鏃堕棿瓒呰繃5鍒嗛挓鍐嶆寮曞
+                long secDatePoorGuide = DateUtils.getSecDatePoor(ardAlarmRadarMove.getAlarmTime(), lastGuideTime);
+                if (secDatePoorGuide >= 300) {
+                    updateData.setGuideTime(ardAlarmRadarMove.getAlarmTime());
+                    radarMoveGuide(ardAlarmRadarMove);//寮曞
+                }
+                ardAlarmRadarMoveMapper.updateArdAlarmRadarMove(updateData);
+            } else {
+                //瓒呰繃10绉掔殑鏁版嵁,鍏ュ簱
+                ardAlarmRadarMove.setGuideTime(ardAlarmRadarMove.getAlarmTime());
+                ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
+                radarMoveGuide(ardAlarmRadarMove);//寮曞
+            }
+        }
+    }
+
+    /**
+     * 闆疯揪绾㈠闃茬伀鎶ヨ澶勭悊
+     * 鍒樿嫃涔�
+     * 2023/12/14 15:03:23
+     */
+    private void ardAlarmRadarFireHandler(ArdAlarmRadarFire ardAlarmRadarFire) {
+        String mergeTime = ConfigUtils.getConfigValue("radarMergeTime");
+        Integer radarMergeTime = mergeTime == null || "".equals(mergeTime) ? 10 : Integer.valueOf(mergeTime);
+        ArdAlarmRadarFire lastFireData = ardAlarmRadarFireMapper.selectArdAlarmRadarLastData(ardAlarmRadarFire.getName());
+        if (lastFireData == null) {
+            //鍏ュ簱
+            ardAlarmRadarFire.setGuideTime(ardAlarmRadarFire.getAlarmTime());
+            ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
+            radarFireGuide(ardAlarmRadarFire);//寮曞
+        } else {
+            //鍚﹀垯姣斿鏇存柊鏃堕棿
+            Date lastUpdateTime = lastFireData.getUpdateTime();
+            Date lastGuideTime = lastFireData.getGuideTime();
+            long secDatePoor = DateUtils.getSecDatePoor(ardAlarmRadarFire.getAlarmTime(), lastUpdateTime);
+            if (secDatePoor <= radarMergeTime) {
+                //灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
+                ArdAlarmRadarFire updateData = new ArdAlarmRadarFire();
+                updateData.setId(lastFireData.getId());
+                updateData.setUpdateTime(ardAlarmRadarFire.getAlarmTime());
+
+                //鍒ゆ柇寮曞鏃堕棿瓒呰繃5鍒嗛挓鍐嶆寮曞
+                long secDatePoorGuide = DateUtils.getSecDatePoor(ardAlarmRadarFire.getAlarmTime(), lastGuideTime);
+                if (secDatePoorGuide >= 300) {
+                    updateData.setGuideTime(ardAlarmRadarFire.getAlarmTime());
+                    radarFireGuide(ardAlarmRadarFire);//寮曞
+                }
+                ardAlarmRadarFireMapper.updateArdAlarmRadarFire(updateData);
+            } else {
+                //瓒呰繃10绉掔殑鏁版嵁,鍏ュ簱
+                ardAlarmRadarFire.setGuideTime(ardAlarmRadarFire.getAlarmTime());
+                ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
+                radarFireGuide(ardAlarmRadarFire);//寮曞
+            }
+        }
+    }
+
+    /**
+     * 闆疯揪鎶芥补鏈哄仠鏈烘姤璀﹀鐞�
+     * 鍒樿嫃涔�
+     * 2023/12/14 15:03:06
+     */
+    private void ardAlarmRadarPumpHandler(ArdAlarmRadarPump ardAlarmRadarPump) {
+        String mergeTime = ConfigUtils.getConfigValue("radarMergeTime");
+        Integer radarMergeTime = mergeTime == null || "".equals(mergeTime) ? 10 : Integer.valueOf(mergeTime);
+        ArdAlarmRadarPump lastPumpData = ardAlarmRadarPumpMapper.selectArdAlarmRadarLastData(ardAlarmRadarPump.getName());
+        if (lastPumpData == null) {
+            //鍏ュ簱
+            ardAlarmRadarPump.setGuideTime(ardAlarmRadarPump.getAlarmTime());
+            ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
+            radarPumpGuide(ardAlarmRadarPump);//寮曞
+        } else {
+            //鍚﹀垯姣斿鏇存柊鏃堕棿
+            Date lastUpdateTime = lastPumpData.getUpdateTime();
+            Date lastGuideTime = lastPumpData.getGuideTime();
+            long secDatePoor = DateUtils.getSecDatePoor(ardAlarmRadarPump.getAlarmTime(), lastUpdateTime);
+            if (secDatePoor <= radarMergeTime) {
+                //灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
+                ArdAlarmRadarPump updateData = new ArdAlarmRadarPump();
+                updateData.setId(lastPumpData.getId());
+                updateData.setUpdateTime(ardAlarmRadarPump.getAlarmTime());
+                //鍒ゆ柇寮曞鏃堕棿瓒呰繃5鍒嗛挓鍐嶆寮曞
+                long secDatePoorGuide = DateUtils.getSecDatePoor(ardAlarmRadarPump.getAlarmTime(), lastGuideTime);
+                if (secDatePoorGuide >= 300) {
+                    radarPumpGuide(ardAlarmRadarPump);//寮曞
+                    updateData.setGuideTime(ardAlarmRadarPump.getAlarmTime());
+                }
+                ardAlarmRadarPumpMapper.updateArdAlarmRadarPump(updateData);
+            } else {
+                //瓒呰繃10绉掔殑鏁版嵁,鍏ュ簱
+                ardAlarmRadarPump.setGuideTime(ardAlarmRadarPump.getAlarmTime());
+                ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
+                radarPumpGuide(ardAlarmRadarPump);//寮曞
+            }
+        }
+    }
 }

--
Gitblit v1.9.3