diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
index 6f6ac5f..4966ae7 100644
--- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
@@ -80,8 +80,6 @@
         //判断事件类型 0正常 1低报 2高报
         String alarmSituation = payloadData.get("gas_sensor_state").toString();
         String devcode = receiveData.get("IMEI").toString();
-        //第一条上来，消除报警
-        clearAlarmData(devcode);
         //构建数据
         ButaneData butaneData = ButaneData.builder()
                 .devcode(devcode)
@@ -90,26 +88,30 @@
         populateTime(receiveData, butaneData, alarmRecord);
         switch (alarmSituation) {
             case "0":
-                butaneData.setDescn("状态正常");
-                butaneData.setStatus("0");
+//                butaneData.setDescn("状态正常");
+//                butaneData.setStatus("0");
                 break;
             default:
+                //第一条上来，消除报警
+                clearAlarmData(devcode);
                 //产生新的报警，消除报警
                 butaneData.setDescn("可燃气体探测器报警");
                 butaneData.setStatus("1");
-                alarmRecord.setDbid(null);
-                alarmRecord.setDeviceCode(devcode);
-                alarmRecord.setDeviceId(alarmRecordsMapper.getDevcode(devcode));
-                alarmRecordsMapper.insert(alarmRecord);
+                synchronized (alarmRecord){
+                    alarmRecord.setDbid(null);
+                    alarmRecord.setDeviceCode(devcode);
+                    alarmRecord.setDeviceId(alarmRecordsMapper.getDevcode(devcode));
+                    alarmRecordsMapper.insert(alarmRecord);
+                }
+                butaneDataMapper.insert(butaneData);
         }
-        butaneDataMapper.insert(butaneData);
         return true;
     }
 
     public Boolean dealNormalData(Map<String, Object> receiveData) {
         String devcode = receiveData.get("IMEI").toString();
         //第一条上来，消除报警
-        clearAlarmData(devcode);
+//        clearAlarmData(devcode);
         ButaneData butaneData = ButaneData.builder()
                 .devcode(devcode)
                 .dbid(snowflake.nextId())

diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
index 6f6ac5f..4966ae7 100644
--- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
@@ -80,8 +80,6 @@
         //判断事件类型 0正常 1低报 2高报
         String alarmSituation = payloadData.get("gas_sensor_state").toString();
         String devcode = receiveData.get("IMEI").toString();
-        //第一条上来，消除报警
-        clearAlarmData(devcode);
         //构建数据
         ButaneData butaneData = ButaneData.builder()
                 .devcode(devcode)
@@ -90,26 +88,30 @@
         populateTime(receiveData, butaneData, alarmRecord);
         switch (alarmSituation) {
             case "0":
-                butaneData.setDescn("状态正常");
-                butaneData.setStatus("0");
+//                butaneData.setDescn("状态正常");
+//                butaneData.setStatus("0");
                 break;
             default:
+                //第一条上来，消除报警
+                clearAlarmData(devcode);
                 //产生新的报警，消除报警
                 butaneData.setDescn("可燃气体探测器报警");
                 butaneData.setStatus("1");
-                alarmRecord.setDbid(null);
-                alarmRecord.setDeviceCode(devcode);
-                alarmRecord.setDeviceId(alarmRecordsMapper.getDevcode(devcode));
-                alarmRecordsMapper.insert(alarmRecord);
+                synchronized (alarmRecord){
+                    alarmRecord.setDbid(null);
+                    alarmRecord.setDeviceCode(devcode);
+                    alarmRecord.setDeviceId(alarmRecordsMapper.getDevcode(devcode));
+                    alarmRecordsMapper.insert(alarmRecord);
+                }
+                butaneDataMapper.insert(butaneData);
         }
-        butaneDataMapper.insert(butaneData);
         return true;
     }
 
     public Boolean dealNormalData(Map<String, Object> receiveData) {
         String devcode = receiveData.get("IMEI").toString();
         //第一条上来，消除报警
-        clearAlarmData(devcode);
+//        clearAlarmData(devcode);
         ButaneData butaneData = ButaneData.builder()
                 .devcode(devcode)
                 .dbid(snowflake.nextId())
diff --git a/target/classes/com/casic/service/impl/DeviceServiceImpl.class b/target/classes/com/casic/service/impl/DeviceServiceImpl.class
index 2d27006..6e7738a 100644
--- a/target/classes/com/casic/service/impl/DeviceServiceImpl.class
+++ b/target/classes/com/casic/service/impl/DeviceServiceImpl.class
Binary files differ