diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java
index 2d94f987c..829c474cb 100644
--- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java
@@ -97,23 +97,23 @@ public class MechanicalEquipmentPositionDataServiceImpl extends ServiceImpl<Mech
                 .orderByDesc(MechanicalEquipmentPositionData::getUploadTime)
                 .last("limit 1")
         );
+
+        dev.setHeartbeatTime(new Date());
+        mechanicalEquipmentPositionDevMapper.update(dev, new LambdaQueryWrapper<MechanicalEquipmentPositionDev>()
+                .eq(MechanicalEquipmentPositionDev::getDevSn, mechanicalEquipmentPositionData.getDevSn()));
         if (lastData != null) {
             boolean lastFixed = (Objects.equals(lastData.getWorkStatus(), 2) || Objects.equals(lastData.getWorkStatus(), 3)) || Objects.equals(lastData.getWorkStatus(), 4);
             boolean fixed = (Objects.equals(mechanicalEquipmentPositionData.getWorkStatus(), 2) || Objects.equals(mechanicalEquipmentPositionData.getWorkStatus(), 3)) || Objects.equals(mechanicalEquipmentPositionData.getWorkStatus(), 4);
             if (lastFixed && fixed) {
                 log.info("设备上次静止、离线、怠速状态，无需新增，devSn:{}", mechanicalEquipmentPositionData.getDevSn());
-                throw new OpenAlertException("设备上次静止、离线、怠速状态，无需新增，devSn" + mechanicalEquipmentPositionData.getDevSn());
+                return;
             }
         }
 
         if (Objects.equals(mechanicalEquipmentPositionData.getLongitude(), 0D) && Objects.equals(mechanicalEquipmentPositionData.getLatitude(), 0D)) {
             log.info("设备坐标0,0不插入，devSn:{}", mechanicalEquipmentPositionData.getDevSn());
-            throw new OpenAlertException("设备坐标0,0不插入，devSn" + mechanicalEquipmentPositionData.getDevSn());
+            return;
         }
-
-        dev.setHeartbeatTime(new Date());
-        mechanicalEquipmentPositionDevMapper.update(dev, new LambdaQueryWrapper<MechanicalEquipmentPositionDev>()
-                .eq(MechanicalEquipmentPositionDev::getDevSn, mechanicalEquipmentPositionData.getDevSn()));
         mechanicalEquipmentPositionData.setDevSn(dev.getDevSn());
         mechanicalEquipmentPositionData.setProjectSn(dev.getProjectSn());
         mechanicalEquipmentPositionData.setId(null);
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java
index 84ec012a3..f1e22c8e6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java
@@ -98,13 +98,13 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
                 .orderByDesc(SafetyHatData::getUploadTime)
                 .last("limit 1")
         );
-        if (Objects.equals(safetyHatData.getLongitude(), 0D) && Objects.equals(safetyHatData.getLatitude(), 0D)) {
-            log.info("设备坐标0,0不插入，devSn:{}", safetyHatData.getDevSn());
-            throw new OpenAlertException("设备坐标0,0不插入，devSn" + safetyHatData.getDevSn());
-        }
         dev.setHeartbeatTime(new Date());
         safetyHatDevMapper.update(dev, new LambdaQueryWrapper<SafetyHatDev>()
                 .eq(SafetyHatDev::getDevSn, safetyHatData.getDevSn()));
+        if (Objects.equals(safetyHatData.getLongitude(), 0D) && Objects.equals(safetyHatData.getLatitude(), 0D)) {
+            log.info("设备坐标0,0不插入，devSn:{}", safetyHatData.getDevSn());
+            return;
+        }
         safetyHatData.setDevSn(dev.getDevSn());
         safetyHatData.setProjectSn(dev.getProjectSn());
         safetyHatData.setId(null);