From 2fa66c208202f420a5f001cf0d67e5aa1bf94578 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 07 九月 2023 16:53:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java |  800 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 597 insertions(+), 203 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 6d761a0..b6c55f2 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
@@ -14,13 +14,17 @@
 import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
 import com.ruoyi.alarm.global.domain.GuideTask;
 import com.ruoyi.alarm.global.service.IGlobalAlarmService;
-import com.ruoyi.alarm.radar.domain.ArdAlarmRadar;
-import com.ruoyi.alarm.radar.domain.RadarAlarmData;
+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.tube.domain.ArdAlarmTube;
 import com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper;
+import com.ruoyi.alarm.wall.domain.ArdAlarmWall;
+import com.ruoyi.alarm.wall.mapper.ArdAlarmWallMapper;
 import com.ruoyi.alarmpoints.tube.domain.ArdTubes;
 import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
 import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
@@ -30,20 +34,19 @@
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.constant.CamPriority;
 import com.ruoyi.device.external.domain.ArdEquipExternal;
 import com.ruoyi.device.external.mapper.ArdEquipExternalMapper;
+import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
+import com.ruoyi.utils.gis.GisUtil;
 import com.ruoyi.utils.tools.ArdTool;
-import com.ruoyi.utils.tools.GisTool;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.utils.tube.GeoPoint;
 import com.ruoyi.utils.tube.TubeTools;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -51,8 +54,9 @@
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+
 
 /**
  * @Description: 鍏ㄥ眬鎶ヨ涓氬姟
@@ -66,6 +70,8 @@
 public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
     //region 渚濊禆娉ㄥ叆
     @Resource
+    private ArdAlarmWallMapper ardAlarmWallMapper;
+    @Resource
     private ArdAlarmApponekeyMapper ardAlarmApponekeyMapper;
     @Resource
     private ArdEquipExternalMapper ardEquipExternalMapper;
@@ -73,8 +79,14 @@
     private ArdAlarmAccessMapper ardAlarmAccessMapper;
     @Resource
     private ArdAlarmExternalMapper ardAlarmExternalMapper;
+    //@Resource
+    //private ArdAlarmRadarMapper ardAlarmRadarMapper;
     @Resource
-    private ArdAlarmRadarMapper ardAlarmRadarMapper;
+    private ArdAlarmRadarMoveMapper ardAlarmRadarMoveMapper;
+    @Resource
+    private ArdAlarmRadarFireMapper ardAlarmRadarFireMapper;
+    @Resource
+    private ArdAlarmRadarPumpMapper ardAlarmRadarPumpMapper;
     @Resource
     private ArdAlarmStealelecMapper ardAlarmStealelecMapper;
     @Resource
@@ -95,8 +107,13 @@
     private RedisCache redisCache;
     @Resource
     private QueueManager queueManager;
+    @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<>();
     /**
      * @鎻忚堪 鏌ヨ鎵�鏈夋姤璀︾殑褰撳墠鏁伴噺
      * @鍙傛暟 []
@@ -114,11 +131,11 @@
         countMap.put("1001", count1001);
         int count1002 = ardAlarmCameraMapper.selectCountByAlarmTime(refreshTime);
         countMap.put("1002", count1002);
-        int count1003 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "杩愬姩鐩爣妫�娴�");
+        int count1003 = ardAlarmRadarMoveMapper.selectCountByAlarmTime(refreshTime);
         countMap.put("1003", count1003);
-        int count1004 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "鐑簮妫�娴�");
+        int count1004 = ardAlarmRadarFireMapper.selectCountByAlarmTime(refreshTime);
         countMap.put("1004", count1004);
-        int count1007 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "闆疯揪鎶芥补鏈哄仠鏈�");
+        int count1007 = ardAlarmRadarPumpMapper.selectCountByAlarmTime(refreshTime);
         countMap.put("1007", count1007);
         int count1005 = ardAlarmExternalMapper.selectCountByAlarmTime(refreshTime, "闃插尯鎶ヨ");
         countMap.put("1005", count1005);
@@ -126,6 +143,8 @@
         countMap.put("1006", count1006);
         int count1009 = ardAlarmApponekeyMapper.selectCountByAlarmTime(refreshTime);
         countMap.put("1009", count1009);
+        int count1010 = ardAlarmWallMapper.selectCountByAlarmTime(refreshTime);
+        countMap.put("1010", count1010);
         int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
         countMap.put("1014", count1014);
         map.put("20000", countMap);
@@ -174,31 +193,31 @@
                             return globalAlarmData;
                         }).collect(Collectors.toList());
             case 1003:
-                List<ArdAlarmRadar> ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "杩愬姩鐩爣妫�娴�");
-                return ardAlarmRadars.stream()
-                        .map(ardAlarmRadar -> {
+                List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmRadarMoves.stream()
+                        .map(ardAlarmRadarMove -> {
                             GlobalAlarmData globalAlarmData = new GlobalAlarmData()
-                                    .setId(ardAlarmRadar.getId())
-                                    .setName(ardAlarmRadar.getName())
-                                    .setAlarmTime(ardAlarmRadar.getAlarmTime())
-                                    .setLongitude(ardAlarmRadar.getLongitude())
-                                    .setLatitude(ardAlarmRadar.getLatitude())
-                                    .setCount(ardAlarmRadar.getCount())
-                                    .setTotal(ardAlarmRadar.getTotal());
+                                    .setId(ardAlarmRadarMove.getId())
+                                    .setName(ardAlarmRadarMove.getName())
+                                    .setAlarmTime(ardAlarmRadarMove.getAlarmTime())
+                                    .setLongitude(ardAlarmRadarMove.getLongitude())
+                                    .setLatitude(ardAlarmRadarMove.getLatitude())
+                                    .setCount(ardAlarmRadarMove.getCount())
+                                    .setTotal(ardAlarmRadarMove.getTotal());
                             return globalAlarmData;
                         }).collect(Collectors.toList());
             case 1004:
-                ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "鐑簮妫�娴�");
-                return ardAlarmRadars.stream()
-                        .map(ardAlarmRadar -> {
+                List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmRadarFires.stream()
+                        .map(ardAlarmRadarFire -> {
                             GlobalAlarmData globalAlarmData = new GlobalAlarmData()
-                                    .setId(ardAlarmRadar.getId())
-                                    .setName(ardAlarmRadar.getName())
-                                    .setAlarmTime(ardAlarmRadar.getAlarmTime())
-                                    .setLongitude(ardAlarmRadar.getLongitude())
-                                    .setLatitude(ardAlarmRadar.getLatitude())
-                                    .setCount(ardAlarmRadar.getCount())
-                                    .setTotal(ardAlarmRadar.getTotal());
+                                    .setId(ardAlarmRadarFire.getId())
+                                    .setName(ardAlarmRadarFire.getName())
+                                    .setAlarmTime(ardAlarmRadarFire.getAlarmTime())
+                                    .setLongitude(ardAlarmRadarFire.getLongitude())
+                                    .setLatitude(ardAlarmRadarFire.getLatitude())
+                                    .setCount(ardAlarmRadarFire.getCount())
+                                    .setTotal(ardAlarmRadarFire.getTotal());
                             return globalAlarmData;
                         }).collect(Collectors.toList());
             case 1005:
@@ -230,17 +249,17 @@
                             return globalAlarmData;
                         }).collect(Collectors.toList());
             case 1007:
-                ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "闆疯揪鎶芥补鏈哄仠鏈�");
-                return ardAlarmRadars.stream()
-                        .map(ardAlarmRadar -> {
+                List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
+                return ardAlarmRadarPumps.stream()
+                        .map(ardAlarmRadarPump -> {
                             GlobalAlarmData globalAlarmData = new GlobalAlarmData()
-                                    .setId(ardAlarmRadar.getId())
-                                    .setName(ardAlarmRadar.getName())
-                                    .setAlarmTime(ardAlarmRadar.getAlarmTime())
-                                    .setLongitude(ardAlarmRadar.getLongitude())
-                                    .setLatitude(ardAlarmRadar.getLatitude())
-                                    .setCount(ardAlarmRadar.getCount())
-                                    .setTotal(ardAlarmRadar.getTotal());
+                                    .setId(ardAlarmRadarPump.getId())
+                                    .setName(ardAlarmRadarPump.getName())
+                                    .setAlarmTime(ardAlarmRadarPump.getAlarmTime())
+                                    .setLongitude(ardAlarmRadarPump.getLongitude())
+                                    .setLatitude(ardAlarmRadarPump.getLatitude())
+                                    .setCount(ardAlarmRadarPump.getCount())
+                                    .setTotal(ardAlarmRadarPump.getTotal());
                             return globalAlarmData;
                         }).collect(Collectors.toList());
             case 1009:
@@ -255,6 +274,20 @@
                                     .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:
@@ -276,6 +309,194 @@
                 return null;
         }
     }
+
+    @Override
+    public List<GlobalAlarmData> selectAlarmLogsAll() {
+        List<GlobalAlarmData> GlobalAlarmDataList = new ArrayList<>();
+        String refreshTime = configService.selectConfigByKey("refreshTime");
+        List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1001 = 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())
+                            .setAlarmType("1001");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1001.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1001);
+        }
+
+        List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1002= 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())
+                            .setAlarmType("1002");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1002.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1002);
+        }
+
+        List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1003= 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())
+                            .setAlarmType("1003");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1003.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1003);
+        }
+
+        List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1004=  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())
+                            .setAlarmType("1004");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1004.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1004);
+        }
+
+        List<ArdAlarmExternal> ardAlarmExternals = ardAlarmExternalMapper.selectListAllByCommand(refreshTime, "闃插尯鎶ヨ");
+        List<GlobalAlarmData> alarmData1005=  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())
+                            .setAlarmType("1005");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1005.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1005);
+        }
+
+        List<ArdAlarmAccess> ardAlarmAccesses = ardAlarmAccessMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1006= 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())
+                            .setAlarmType("1006");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1006.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1006);
+        }
+
+        List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1007= 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())
+                            .setAlarmType("1007");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1007.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1007);
+        }
+
+        List<ArdAlarmApponekey> ardAlarmApponekeys = ardAlarmApponekeyMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1009= 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())
+                            .setAlarmType("1009");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1009.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1009);
+        }
+
+        List<ArdAlarmWall> ardAlarmWalls = ardAlarmWallMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1010= ardAlarmWalls.stream()
+                .map(ardAlarmWall -> {
+                    GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+                            .setId(ardAlarmWall.getId())
+                            .setName(ardAlarmWall.getWallName())
+                            .setAlarmTime(ardAlarmWall.getCreateTime())
+                            .setLongitude(ardAlarmWall.getLongitude())
+                            .setLatitude(ardAlarmWall.getLatitude())
+                            .setCount(ardAlarmWall.getCount())
+                            .setTotal(ardAlarmWall.getTotal())
+                            .setAlarmType("1010");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1010.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1010);
+        }
+
+        List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
+        List<GlobalAlarmData> alarmData1014= 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())
+                            .setAlarmType("1014");
+                    return globalAlarmData;
+                }).collect(Collectors.toList());
+        if(alarmData1014.size()>0) {
+            GlobalAlarmDataList.addAll(alarmData1014);
+        }
+        return GlobalAlarmDataList;
+}
 
     /**
      * @鎻忚堪 鍘嗗彶鎶ヨ鏌ヨ
@@ -304,26 +525,26 @@
                 aac.setPageSize(pageSize);
                 return ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
             case 1003:
-                ArdAlarmRadar aar = new ArdAlarmRadar();
-                aar.setParams(params);
-                aar.setPageNum(pageNum);
-                aar.setPageSize(pageSize);
-                aar.setAlarmType("杩愬姩鐩爣妫�娴�");
-                return ardAlarmRadarMapper.selectArdAlarmRadarList(aar);
+                ArdAlarmRadarMove aarm = new ArdAlarmRadarMove();
+                aarm.setParams(params);
+                aarm.setPageNum(pageNum);
+                aarm.setPageSize(pageSize);
+                aarm.setAlarmType("杩愬姩鐩爣妫�娴�");
+                return ardAlarmRadarMoveMapper.selectArdAlarmRadarMoveList(aarm);
             case 1004:
-                ArdAlarmRadar aarr = new ArdAlarmRadar();
-                aarr.setParams(params);
-                aarr.setPageNum(pageNum);
-                aarr.setPageSize(pageSize);
-                aarr.setAlarmType("鐑簮妫�娴�");
-                return ardAlarmRadarMapper.selectArdAlarmRadarList(aarr);
+                ArdAlarmRadarFire aarf = new ArdAlarmRadarFire();
+                aarf.setParams(params);
+                aarf.setPageNum(pageNum);
+                aarf.setPageSize(pageSize);
+                aarf.setAlarmType("鐑簮妫�娴�");
+                return ardAlarmRadarFireMapper.selectArdAlarmRadarFireList(aarf);
             case 1007:
-                ArdAlarmRadar aarrr = new ArdAlarmRadar();
-                aarrr.setParams(params);
-                aarrr.setPageNum(pageNum);
-                aarrr.setPageSize(pageSize);
-                aarrr.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
-                return ardAlarmRadarMapper.selectArdAlarmRadarList(aarrr);
+                ArdAlarmRadarPump aarp = new ArdAlarmRadarPump();
+                aarp.setParams(params);
+                aarp.setPageNum(pageNum);
+                aarp.setPageSize(pageSize);
+                aarp.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
+                return ardAlarmRadarPumpMapper.selectArdAlarmRadarPumpList(aarp);
             case 1005:
                 ArdAlarmExternal aae = new ArdAlarmExternal();
                 aae.setParams(params);
@@ -344,6 +565,12 @@
                 aaak.setPageNum(pageNum);
                 aaak.setPageSize(pageSize);
                 return ardAlarmApponekeyMapper.selectArdAlarmApponekeyList(aaak);
+            case 1010:
+                ArdAlarmWall aaw = new ArdAlarmWall();
+                aaw.setParams(params);
+                aaw.setPageNum(pageNum);
+                aaw.setPageSize(pageSize);
+                return ardAlarmWallMapper.selectArdAlarmWallList(aaw);
             case 1014:
                 ArdAlarmTube aat = new ArdAlarmTube();
                 aat.setParams(params);
@@ -365,6 +592,7 @@
     @Override
     public Object updateAlarmViewTime(GlobalAlarmCondition condition) {
         SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat fmtms = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
         switch (condition.getCommand()) {
             case 1001:
                 ArdAlarmStealelec ardAlarmStealelec = ardAlarmStealelecMapper.selectByPrimaryKey(condition.getId());
@@ -383,15 +611,28 @@
                     return ardAlarmCamera;
                 }
             case 1003:
+                ArdAlarmRadarMove ardAlarmRadarMove = ardAlarmRadarMoveMapper.selectArdAlarmRadarMoveById(condition.getId());
+                if (StringUtils.isNotNull(ardAlarmRadarMove)) {
+                    String name = ardAlarmRadarMove.getName();
+                    String alarmTime = fmt.format(ardAlarmRadarMove.getAlarmTime());
+                    ardAlarmRadarMoveMapper.updateViewTimeByCondition(name, alarmTime, DateUtils.getTime());
+                    return ardAlarmRadarMove;
+                }
             case 1004:
+                ArdAlarmRadarFire ardAlarmRadarFire = ardAlarmRadarFireMapper.selectArdAlarmRadarFireById(condition.getId());
+                if (StringUtils.isNotNull(ardAlarmRadarFire)) {
+                    String name = ardAlarmRadarFire.getName();
+                    String alarmTime = fmt.format(ardAlarmRadarFire.getAlarmTime());
+                    ardAlarmRadarFireMapper.updateViewTimeByCondition(name, alarmTime, DateUtils.getTime());
+                    return ardAlarmRadarFire;
+                }
             case 1007:
-                ArdAlarmRadar ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarById(condition.getId());
-                if (StringUtils.isNotNull(ardAlarmRadar)) {
-                    String name = ardAlarmRadar.getName();
-                    String alarmType = ardAlarmRadar.getAlarmType();
-                    String alarmTime = fmt.format(ardAlarmRadar.getAlarmTime());
-                    ardAlarmRadarMapper.updateViewTimeByCondition(name, alarmType, alarmTime, DateUtils.getTime());
-                    return ardAlarmRadar;
+                ArdAlarmRadarPump ardAlarmRadarPump = ardAlarmRadarPumpMapper.selectArdAlarmRadarPumpById(condition.getId());
+                if (StringUtils.isNotNull(ardAlarmRadarPump)) {
+                    String name = ardAlarmRadarPump.getName();
+                    String alarmTime = fmt.format(ardAlarmRadarPump.getAlarmTime());
+                    ardAlarmRadarPumpMapper.updateViewTimeByCondition(name, alarmTime, DateUtils.getTime());
+                    return ardAlarmRadarPump;
                 }
             case 1005:
                 ArdAlarmExternal ardAlarmExternal = ardAlarmExternalMapper.selectArdAlarmExternalById(condition.getId());
@@ -417,6 +658,14 @@
                     String alarmTime = fmt.format(ardAlarmApponekey.getCreateTime());
                     ardAlarmApponekeyMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
                     return ardAlarmApponekey;
+                }
+            case 1010:
+                ArdAlarmWall ardAlarmWall = ardAlarmWallMapper.selectArdAlarmWallById(condition.getId());
+                if (StringUtils.isNotNull(ardAlarmWall)) {
+                    String userId = ardAlarmWall.getUserId();
+                    String alarmTime = fmtms.format(ardAlarmWall.getAlarmTime());
+                    ardAlarmWallMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
+                    return ardAlarmWall;
                 }
             case 1014:
                 ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
@@ -500,6 +749,7 @@
                     //region 澶勭悊閫氱敤鍏夌數鎶ヨ
                     ArdAlarmCamera ardAlarmCamera = JSONObject.parseObject(message, ArdAlarmCamera.class);
                     ardAlarmCamera.setId(IdUtils.simpleUUID());
+                    ardAlarmCamera.setCreateTime(new Date());
                     int aac = ardAlarmCameraMapper.insertArdAlarmCamera(ardAlarmCamera);
                     if (aac > 0) {
                         log.debug("camera鍏ュ簱鎴愬姛锛�" + ardAlarmCamera);
@@ -508,105 +758,71 @@
                     break;
                 case "radar":
                     //region 澶勭悊闆疯揪鎶ヨ
-                    // 寮�濮嬫椂闂�
-                    long stime = System.currentTimeMillis();
                     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();
-                        ardAlarmRadar.setId(uuid);//鎶ヨID
-                        ardAlarmRadar.setAlarmTime(radarAlarmData.getAlarmTime());//鎶ヨ鏃堕棿
                         String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
-                        ardAlarmRadar.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");//鎶ヨ鐐瑰悕绉�
-                        ardAlarmRadar.setCreateTime(new Date());//鎺ユ敹鏃堕棿
-
-                        String alarmType = "";
+                        Double longitude = ardAlarmRadar.getLongitude();
+                        Double latitude = ardAlarmRadar.getLatitude();
+                        String targetId=ardAlarmRadar.getTargetId();
                         switch (ardAlarmRadar.getAlarmType()) {
                             case "杩愬姩鐩爣妫�娴�":
-                                alarmType = "sys_radar_move";
+                                ArdAlarmRadarMove ardAlarmRadarMove=new ArdAlarmRadarMove();
+                                ardAlarmRadarMove.setId(uuid);
+                                ardAlarmRadarMove.setTargetId(targetId);
+                                ardAlarmRadarMove.setAlarmTime(radarAlarmData.getAlarmTime());
+                                ardAlarmRadarMove.setCreateTime(new Date());
+                                ardAlarmRadarMove.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
+                                ardAlarmRadarMove.setAlarmType("杩愬姩鐩爣妫�娴�");
+                                ardAlarmRadarMove.setLongitude(longitude);
+                                ardAlarmRadarMove.setLatitude(latitude);
+                                //鍏ュ簱
+                                ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
+                                ardAlarmRadarMoves.add(ardAlarmRadarMove);
+
                                 break;
                             case "鐑簮妫�娴�":
-                                alarmType = "sys_radar_fire";
+                                ArdAlarmRadarFire ardAlarmRadarFire=new ArdAlarmRadarFire();
+                                ardAlarmRadarFire.setId(uuid);
+                                ardAlarmRadarFire.setTargetId(targetId);
+                                ardAlarmRadarFire.setAlarmTime(radarAlarmData.getAlarmTime());
+                                ardAlarmRadarFire.setCreateTime(new Date());
+                                ardAlarmRadarFire.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
+                                ardAlarmRadarFire.setAlarmType("鐑簮妫�娴�");
+                                ardAlarmRadarFire.setLongitude(longitude);
+                                ardAlarmRadarFire.setLatitude(latitude);
+                                //鍏ュ簱
+                                ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
+                                ardAlarmRadarFires.add(ardAlarmRadarFire);
+
                                 break;
                             case "闆疯揪鎶芥补鏈哄仠鏈�":
-                                alarmType = "sys_radar_pumpshutdown";
+                                ArdAlarmRadarPump ardAlarmRadarPump=new ArdAlarmRadarPump();
+                                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)) {
-                                    ardAlarmRadar.setLongitude(ardAlarmpointsWell.getLongitude());
-                                    ardAlarmRadar.setLatitude(ardAlarmpointsWell.getLatitude());
+                                    ardAlarmRadarPump.setLongitude(ardAlarmpointsWell.getLongitude());
+                                    ardAlarmRadarPump.setLatitude(ardAlarmpointsWell.getLatitude());
                                 }
+                                //鍏ュ簱
+                                ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
+                                ardAlarmRadarPumps.add(ardAlarmRadarPump);
+
                                 break;
                         }
-                        if (StringUtils.isNull(ardAlarmRadar.getLongitude()) || StringUtils.isNull(ardAlarmRadar.getLatitude())) {
-                            continue;
-                        }
-                        double[] coordinate = new double[]{ardAlarmRadar.getLongitude(), ardAlarmRadar.getLatitude()};//鎶ヨ鍧愭爣
-
-                        //鍒ゆ柇褰撳墠鎶ヨ鐐�5鍒嗛挓鍐呮槸鍚﹀凡寮曞
-                        ardAlarmRadar.setGuideFlag(1);
-                       // ArdAlarmRadar AlarmRadar = ardAlarmRadarMapper.getArdAlarmRadarWithGuide(ardAlarmRadar);
-                        ArdAlarmRadar AlarmRadar = redisCache.getCacheObject("global_alarm:guideNew");//浠巖edis涓彇鍑烘渶鏂板紩瀵肩殑鎶ヨ鏁版嵁
-                        if (StringUtils.isNull(AlarmRadar)) {
-                            //5鍒嗛挓鍐呮湭寮曞鐩存帴鍏ュ簱
-                            ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
-                            redisCache.setCacheObject("global_alarm:guideNew",ardAlarmRadar);//寮曞鏁版嵁鍐欏叆redis
-                            //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
-                            String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
-                            if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
-                                log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraIdWithTower);
-                                //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
-                                messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getCreateTime(), 1, 1, coordinate);
-                            }
-                            //鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
-                            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, uuid, alarmType, ardAlarmRadar.getCreateTime(), 1, 2, coordinate);
-                            }
-                        } else {
-                            //5鍒嗛挓鍐呮湁寮曞
-                            ardAlarmRadar.setGuideFlag(0);
-                            int count = ardAlarmRadarMapper.getArdAlarmRadarWithNotGuide(ardAlarmRadar, AlarmRadar.getCreateTime());
-                            //鏈紩瀵艰秴杩�3娆★紝鐩存帴鍏ュ簱鍏ラ槦
-                            if (count >= 3) {
-                                ardAlarmRadar.setGuideFlag(1);
-                                ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
-                                redisCache.setCacheObject("global_alarm:guideNew",ardAlarmRadar);//寮曞鏁版嵁鍐欏叆redis
-                                //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
-                                String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
-                                if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
-                                    log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraIdWithTower);
-                                    //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
-                                    messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getCreateTime(), count, 1, coordinate);
-                                }
-                                //鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
-                                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, uuid, alarmType, ardAlarmRadar.getCreateTime(), count, 2, coordinate);
-                                }
-                            } else {
-                                //鏈紩瀵兼湭瓒呰繃3娆★紝鐩存帴鍏ュ簱
-                                ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
-                            }
-                        }
-                        // 缁撴潫鏃堕棿
-                        long etime = System.currentTimeMillis();
-                        // 璁$畻鎵ц鏃堕棿
-                        log.info("鏌ヨAPI鎵ц鏃堕暱锛�"+(etime-stime)+"姣");
                     }
-
-                    //endregion
+                    radarMoveGuide(ardAlarmRadarMoves,radarAlarmData);
+                    radarFireGuide(ardAlarmRadarFires,radarAlarmData);
+                    radarPumpGuide(ardAlarmRadarPumps,radarAlarmData);
                     break;
                 case "external":
                     //region 澶勭悊澶栬仈鎶ヨ
@@ -698,13 +914,20 @@
                 log.info("鐩告満:" + cameraId + "鏈紑鍚姤璀﹀紩瀵煎姛鑳�");
                 return;
             }
-
             SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
             GuideTask guideTask = new GuideTask();
             //鐩告満ID
             guideTask.setCameraId(cameraId);
             //鎶ヨ绫诲瀷
-            guideTask.setAlarmType(alarmType);
+            String aType="";
+            switch (alarmType)
+            {
+                case "杩愬姩鐩爣妫�娴�": aType="sys_radar_move";break;
+                case "鐑簮妫�娴�": aType="sys_radar_fire";break;
+                case "闆疯揪鎶芥补鏈哄仠鏈�": aType="sys_radar_pump";break;
+                default: aType=alarmType;break;
+            }
+            guideTask.setAlarmType(aType);
             //閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
             String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
             Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
@@ -714,8 +937,12 @@
             //鎺ユ敹鏃堕棿
             guideTask.setReceiveTime(fmt.format(receiveTime));
             //鎶ヨ浼樺厛绾�(閫氳繃浼樺厛绾у瓧鍏�)
-            Integer priority = CamPriority.priorityMap.get(alarmType);
-            guideTask.setPriority(priority);
+            String priority = DictUtils.getDictValue("cameras_priority", aType);
+            if (StringUtils.isEmpty(priority)) {
+                log.debug("鏈尮閰嶅埌浼樺厛绾�,璇锋鏌ヤ紭鍏堢骇瀛楀吀閰嶇疆");
+                return;
+            }
+            guideTask.setPriority(Integer.valueOf(priority));
             //鎶ヨ娆℃暟
             guideTask.setNum(num);
             //褰曞儚瀛樺偍浣嶇疆
@@ -739,7 +966,7 @@
     private Boolean IsEnableGuide(String cameraId) {
         boolean enabled = false;
         ArdCameras ardCameras = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
-        if(ardCameras!=null) {
+        if (ardCameras != null) {
             if (ardCameras.getCamAlarmGuideEnable().equals(1)) {
                 enabled = true;
             }
@@ -752,66 +979,233 @@
      */
     private String getNearbyCamera(double[] targetPosition) {
         String minDistanceCameraId = "";
-        //鑾峰彇鎵�鏈夊ぇ鍏夌數
-        List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
-        //缁熻鎵�鏈夊ぇ鍏夌數鍙鑼冨洿鍐呬笌鎶ヨ鐐圭殑璺濈
-        Map<String, Double> distanceMap = new HashMap<>();
-        Map<String, Integer> guideMap = new HashMap<>();
-        for (ArdCameras camera : ardCamerasList) {
-            double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
-            double distance = GisTool.getDistance(targetPosition, camPosition);
-            if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
-                distanceMap.put(camera.getId(), distance);
-                if (StringUtils.isNull(camera.getCamAlarmGuideEnable())) {
-                    camera.setCamAlarmGuideEnable(0);
+        try {
+            //鑾峰彇鎵�鏈夊ぇ鍏夌數
+            List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
+            //缁熻鎵�鏈夊ぇ鍏夌數鍙鑼冨洿鍐呬笌鎶ヨ鐐圭殑璺濈
+            Map<String, Double> distanceMap = new HashMap<>();
+            Map<String, Integer> guideMap = new HashMap<>();
+            for (ArdCameras camera : ardCamerasList) {
+                if (camera.getCamMaxVisibleDistance() == null) {
+                    continue;
                 }
-                guideMap.put(camera.getId(), camera.getCamAlarmGuideEnable());
+                double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
+                double distance = GisUtil.getDistance(targetPosition, camPosition);
+                if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
+                    distanceMap.put(camera.getId(), distance);
+                    if (StringUtils.isNull(camera.getCamAlarmGuideEnable())) {
+                        camera.setCamAlarmGuideEnable(0);
+                    }
+                    guideMap.put(camera.getId(), camera.getCamAlarmGuideEnable());
+                }
             }
-        }
-        if (distanceMap.size() > 0) {
-            log.debug("灏濊瘯鏌ユ壘鏈�杩戝厜鐢�");
-            //鑾峰彇璺濈瀛楀吀涓渶杩戠殑涓�涓浉鏈篒D
-            minDistanceCameraId = ArdTool.getKeyByMinValue(distanceMap);
-            log.debug("鏌ユ壘鍒版渶杩戝厜鐢�:" + minDistanceCameraId);
-            if (guideMap.get(minDistanceCameraId).equals(0)) {
-                log.debug("璇ュ厜鐢垫湭寮�鍚姤璀﹀紩瀵�");
-                return " ";
+            if (distanceMap.size() > 0) {
+                log.debug("灏濊瘯鏌ユ壘鏈�杩戝厜鐢�");
+                //鑾峰彇璺濈瀛楀吀涓渶杩戠殑涓�涓浉鏈篒D
+                minDistanceCameraId = ArdTool.getKeyByMinValue(distanceMap);
+                log.debug("鏌ユ壘鍒版渶杩戝厜鐢�:" + minDistanceCameraId);
+                if (guideMap.get(minDistanceCameraId).equals(0)) {
+                    log.debug("璇ュ厜鐢垫湭寮�鍚姤璀﹀紩瀵�");
+                    return " ";
+                }
             }
+        } catch (Exception ex) {
+            log.error("鑾峰彇闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢靛紓甯�:" + ex.getMessage());
         }
         return minDistanceCameraId;
     }
 
-    public static void main(String[] args) {
-        Comparator<Obj> PriorityDescCom = Comparator.comparingInt(Obj::getPriority).reversed();
-        Comparator<Obj> NumDescCom = Comparator.comparingInt(Obj::getNum).reversed();
-        Comparator<Obj> receiveTimeAscCom = Comparator.comparing(Obj::getAlarmTime);
-        Comparator<Obj> comparator = PriorityDescCom.thenComparing(NumDescCom).thenComparing(receiveTimeAscCom);
 
-        PriorityBlockingQueue<Obj> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
-
-        priorityQueue.add(new Obj(999, 1, "2023-07-01 16:00:01"));
-        priorityQueue.add(new Obj(999, 2, "2023-07-01 16:00:01"));
-        priorityQueue.add(new Obj(999, 3, "2023-07-01 16:00:01"));
-
-        List<Obj> elements = new ArrayList<>(priorityQueue);
-        elements.sort(priorityQueue.comparator());  // 浣跨敤闃熷垪鐨勬瘮杈冨櫒杩涜鎺掑簭
-        for (Obj task : elements) {
-            log.info("姝e湪鎺掗槦銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum() + "銆恆larmTime銆�" + task.getAlarmTime());
+    /**
+     * 闆疯揪寮曞鍏ラ槦
+     */
+    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);
+        //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
+        String cameraIdWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
+        if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
+            log.debug("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraIdWithTower);
+            //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
+            messagesEnqueued(cameraIdWithTower, alarmId, alarmType, createTime, 1, 1, coordinate);
         }
-        log.info("===================================================================");
-        priorityQueue.add(new Obj(999, 5, "2023-07-01 16:00:01"));
-        PriorityBlockingQueue queue = new PriorityBlockingQueue<>(priorityQueue);
-        while (queue.size() > 0) {
-            Obj task = (Obj) queue.poll();
-            log.info("姝e湪鎺掗槦銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum() + "銆恆larmTime銆�" + task.getAlarmTime());
+        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("鏈幏鍙栧埌鎶ヨ鐐瑰叧鑱旂殑鍏夌數");
         }
     }
 
-    @Data
-    @AllArgsConstructor
-    static class Obj {
-        Integer priority;
-        Integer num;
-        String alarmTime;
+
+    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);
+            }
+        }
+        //endregion
+    }
+    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);
+            }
+        }
+        //endregion
+    }
+    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);
+            }
+        }
+        //endregion
     }
 }

--
Gitblit v1.9.3