diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
index 4d867ce..69845e6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java
@@ -63,7 +63,7 @@
         /**
          * 机器人数据
          * */
-        List<Map<String, String>> robotMaps = robotService.robotList();
+        List<Map<String, Object>> robotMaps = robotService.robotList();
         /**
          * 方舱位置数据
          * */
@@ -73,14 +73,14 @@
          * */
         SatelliteSignalDTO signal = satelliteService.selectSatelliteSignal();
 
-        for (Map<String, String> robotMap : robotMaps) {
-            String robotId = robotMap.get("robotId");
-            double lng = Double.parseDouble(robotMap.get("lng"));
-            double lat = Double.parseDouble(robotMap.get("lat"));
-            double powerE = Double.parseDouble(robotMap.get("powerE"));
+        for (Map<String, Object> robotMap : robotMaps) {
+            int robotId = (int) robotMap.get("robotId");
+            double lng = (double) robotMap.get("lng");
+            double lat = (double) robotMap.get("lat");
+            float powerE = (float) robotMap.get("powerE");
             if (powerE < thresholdDTO.getRobotBattery()) {
                 //存库
-                save(creatAlarm(robotId, "1", "机器人电量低", powerE));
+                save(creatAlarm(String.valueOf(robotId), "1", "机器人电量低", powerE));
             }
             /**
              * 船舶数据
@@ -91,7 +91,7 @@
             for (ShipDTO ship : ships) {
                 double distance = EncodeData.distance(ship.getLng(), ship.getLat(), lng, lat);
                 if (distance < thresholdDTO.getShipDistance()) {
-                    save(creatAlarm(robotId, "2", "机器人与船舶距离太近", distance));
+                    save(creatAlarm(String.valueOf(robotId), "2", "机器人与船舶距离太近", distance));
                 }
             }
         }
@@ -102,26 +102,26 @@
                 save(creatAlarm("", "3", "台风风速超过预警值", speed));
             }
             //计算台风-机器人之间的距离
-            for (Map<String, String> robotMap : robotMaps) {
-                String robotId = robotMap.get("robotId");
-                double lng = Double.parseDouble(robotMap.get("lng"));
-                double lat = Double.parseDouble(robotMap.get("lat"));
+            for (Map<String, Object> robotMap : robotMaps) {
+                int robotId = (int) robotMap.get("robotId");
+                double lng = (double) robotMap.get("lng");
+                double lat = (double) robotMap.get("lat");
                 //计算台风与每一个机器人之间的距离
                 double distance = EncodeData.distance(typhoonDTO.getLng(), typhoonDTO.getLat(), lng, lat);
                 if (distance < thresholdDTO.getTyphoonDistance()) {
-                    save(creatAlarm(robotId, "4", "机器人与台风距离太近", distance));
+                    save(creatAlarm(String.valueOf(robotId), "4", "机器人与台风距离太近", distance));
                 }
             }
         }
 
-        for (Map<String, String> robotMap : robotMaps) {
-            String robotId = robotMap.get("robotId");
-            double lng = Double.parseDouble(robotMap.get("lng"));
-            double lat = Double.parseDouble(robotMap.get("lat"));
+        for (Map<String, Object> robotMap : robotMaps) {
+            int robotId = (int) robotMap.get("robotId");
+            double lng = (double) robotMap.get("lng");
+            double lat = (double) robotMap.get("lat");
             //计算机器人和方舱的距离-暂无数据
             double distance = EncodeData.distance(position.getLng(), position.getLat(), lng, lat);
             if (distance < thresholdDTO.getRobotDistance()) {
-                save(creatAlarm(robotId, "5", "机器人与方舱距离超过预警值", distance));
+                save(creatAlarm(String.valueOf(robotId), "5", "机器人与方舱距离超过预警值", distance));
             }
         }
 
@@ -142,7 +142,7 @@
 
         alarm.setAlarmTime(TimeUtil.getCurrentTime());
         //WebSocket发送报警信息给前端
-        webSocketService.sendMessage(JSON.toJSONString(alarm));
+//        webSocketService.sendMessage(JSON.toJSONString(alarm));
         return alarm;
     }