From 03bdf8738729b6055b0c5594628b261a3ebaaced Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 16:50:20 +0800
Subject: [PATCH] 设备健康

---
 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java |   73 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 36 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 253e48c..87540fa 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
@@ -115,10 +115,6 @@
     @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<>();
 
     /**
      * @鎻忚堪 鏌ヨ鎵�鏈夋姤璀︾殑褰撳墠鏁伴噺
@@ -1367,8 +1363,43 @@
             log.debug("鏈幏鍙栧埌鎶ヨ鐐瑰叧鑱旂殑鍏夌數");
         }
     }
-
     //闆疯揪绉诲姩寮曞
+    private void radarMoveGuide(ArdAlarmRadarMove ardAlarmRadarMove) {
+        if (StringUtils.isNull(ardAlarmRadarMove.getLongitude()) || StringUtils.isNull(ardAlarmRadarMove.getLatitude())) {
+            log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
+            return;
+        }
+        double[] coordinate = new double[]{ardAlarmRadarMove.getLongitude(), ardAlarmRadarMove.getLatitude()};//鎶ヨ鍧愭爣
+        //寮曞鍏ラ槦
+        radarGuideToQueue(ardAlarmRadarMove.getId(), ardAlarmRadarMove.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);//鏇存柊
+    }
+    //闆疯揪闃茬伀寮曞
+    private void radarFireGuide(ArdAlarmRadarFire ardAlarmRadarFire) {
+        if (StringUtils.isNull(ardAlarmRadarFire.getLongitude()) || StringUtils.isNull(ardAlarmRadarFire.getLatitude())) {
+            log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
+            return;
+        }
+        double[] coordinate = new double[]{ardAlarmRadarFire.getLongitude(), ardAlarmRadarFire.getLatitude()};//鎶ヨ鍧愭爣
+        //寮曞鍏ラ槦
+        radarGuideToQueue(ardAlarmRadarFire.getId(), ardAlarmRadarFire.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);//鏇存柊
+    }
+    //闆疯揪鎶芥补鏈哄仠鏈哄紩瀵�
+    private void radarPumpGuide(ArdAlarmRadarPump ardAlarmRadarPump) {
+        if (StringUtils.isNull(ardAlarmRadarPump.getLongitude()) || StringUtils.isNull(ardAlarmRadarPump.getLatitude())) {
+            //鍧愭爣涓虹┖涓嶅紩瀵�
+            log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
+            return;
+        }
+        double[] coordinate = new double[]{ardAlarmRadarPump.getLongitude(), ardAlarmRadarPump.getLatitude()};//鎶ヨ鍧愭爣
+        //寮曞鍏ラ槦
+        radarGuideToQueue(ardAlarmRadarPump.getId(), ardAlarmRadarPump.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);//鏇存柊
+    }
+
+
+    //姣忎釜鐐逛綅鏈紩瀵兼鏁�
+    private Map<String, Integer> unGuideCountMapMove = new HashMap<>();
+    private Map<String, Integer> unGuideCountMapFire = new HashMap<>();
+    private Map<String, Integer> unGuideCountMapPump = new HashMap<>();
     private void radarMoveGuide(List<ArdAlarmRadarMove> ardAlarmRadarMoves, RadarAlarmData radarAlarmData) {
         //鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
         ardAlarmRadarMoves = ardAlarmRadarMoves.stream()
@@ -1421,17 +1452,6 @@
         }
         //endregion
     }
-    private void radarMoveGuide(ArdAlarmRadarMove ardAlarmRadarMove) {
-        if (StringUtils.isNull(ardAlarmRadarMove.getLongitude()) || StringUtils.isNull(ardAlarmRadarMove.getLatitude())) {
-            log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
-            return;
-        }
-        double[] coordinate = new double[]{ardAlarmRadarMove.getLongitude(), ardAlarmRadarMove.getLatitude()};//鎶ヨ鍧愭爣
-        //寮曞鍏ラ槦
-        radarGuideToQueue(ardAlarmRadarMove.getId(), ardAlarmRadarMove.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);//鏇存柊
-    }
-
-    //闆疯揪闃茬伀寮曞
     private void radarFireGuide(List<ArdAlarmRadarFire> ardAlarmRadarFires, RadarAlarmData radarAlarmData) {
         //鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
         ardAlarmRadarFires = ardAlarmRadarFires.stream()
@@ -1483,16 +1503,6 @@
         }
         //endregion
     }
-    private void radarFireGuide(ArdAlarmRadarFire ardAlarmRadarFire) {
-        if (StringUtils.isNull(ardAlarmRadarFire.getLongitude()) || StringUtils.isNull(ardAlarmRadarFire.getLatitude())) {
-            log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
-            return;
-        }
-        double[] coordinate = new double[]{ardAlarmRadarFire.getLongitude(), ardAlarmRadarFire.getLatitude()};//鎶ヨ鍧愭爣
-        //寮曞鍏ラ槦
-        radarGuideToQueue(ardAlarmRadarFire.getId(), ardAlarmRadarFire.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);//鏇存柊
-    }
-    //闆疯揪鎶芥补鏈哄仠鏈哄紩瀵�
     private void radarPumpGuide(List<ArdAlarmRadarPump> ardAlarmRadarPumps, RadarAlarmData radarAlarmData) {
         //鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
         ardAlarmRadarPumps = ardAlarmRadarPumps.stream()
@@ -1544,14 +1554,5 @@
         }
         //endregion
     }
-    private void radarPumpGuide(ArdAlarmRadarPump ardAlarmRadarPump) {
-        if (StringUtils.isNull(ardAlarmRadarPump.getLongitude()) || StringUtils.isNull(ardAlarmRadarPump.getLatitude())) {
-            //鍧愭爣涓虹┖涓嶅紩瀵�
-            log.debug("鍧愭爣涓虹┖涓嶅紩瀵�");
-            return;
-        }
-        double[] coordinate = new double[]{ardAlarmRadarPump.getLongitude(), ardAlarmRadarPump.getLatitude()};//鎶ヨ鍧愭爣
-        //寮曞鍏ラ槦
-        radarGuideToQueue(ardAlarmRadarPump.getId(), ardAlarmRadarPump.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);//鏇存柊
-    }
+
 }

--
Gitblit v1.9.3