diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
index 57c0198..1d17d71 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
@@ -69,7 +69,7 @@
      * 报警数值
      */
     @TableField("ALARM_VALUE")
-    @ExcelProperty(value = "报警数值", order = 5)
+    @ExcelProperty(value = "告警值", order = 5)
     private Double alarmValue;
     /**
      * 报警阈值
@@ -80,19 +80,19 @@
      * 报警方位
      */
     @TableField("ALARM_DIRECTION")
-    @ExcelProperty(value = "报警方位", order = 8)
+    @ExcelProperty(value = "水平角", order = 8)
     private Double alarmDirection;
     /**
      * 报警俯仰角
      */
     @TableField("ALARM_PITCH")
-    @ExcelProperty(value = "报警俯仰角", order = 9)
+    @ExcelProperty(value = "俯仰角", order = 9)
     private Double alarmPitch;
     /**
      * 报警时间
      */
     @TableField("ALARM_TIME")
-    @ExcelProperty(value = "报警时间", order = 10)
+    @ExcelProperty(value = "告警时间", order = 10)
     private Date alarmTime;
     /**
      * 报警图片
@@ -128,7 +128,7 @@
      * 预置点号
      */
     @TableField("SERIAL_NUM")
-    @ExcelProperty(value = "预置点名称", order = 3)
+    @ExcelProperty(value = "巡航点位", order = 3)
     private Integer serialNum;
     /**
      * 时间
@@ -139,7 +139,7 @@
     private Date ts;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "监控点位名称", order = 1)
+    @ExcelProperty(value = "设备名称", order = 1)
     private String monitorName;
 
     @TableField(exist = false)
@@ -147,15 +147,15 @@
     private String stationName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "报警类型", order = 6)
+    @ExcelProperty(value = "告警类型", order = 6)
     private String alarmTypeName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "报警状态", order = 7)
+    @ExcelProperty(value = "告警状态", order = 7)
     private String alarmStatusName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "巡航路线名称", order = 2)
+    @ExcelProperty(value = "巡航路线", order = 2)
     private String lineName;
 
 

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
index 57c0198..1d17d71 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
@@ -69,7 +69,7 @@
      * 报警数值
      */
     @TableField("ALARM_VALUE")
-    @ExcelProperty(value = "报警数值", order = 5)
+    @ExcelProperty(value = "告警值", order = 5)
     private Double alarmValue;
     /**
      * 报警阈值
@@ -80,19 +80,19 @@
      * 报警方位
      */
     @TableField("ALARM_DIRECTION")
-    @ExcelProperty(value = "报警方位", order = 8)
+    @ExcelProperty(value = "水平角", order = 8)
     private Double alarmDirection;
     /**
      * 报警俯仰角
      */
     @TableField("ALARM_PITCH")
-    @ExcelProperty(value = "报警俯仰角", order = 9)
+    @ExcelProperty(value = "俯仰角", order = 9)
     private Double alarmPitch;
     /**
      * 报警时间
      */
     @TableField("ALARM_TIME")
-    @ExcelProperty(value = "报警时间", order = 10)
+    @ExcelProperty(value = "告警时间", order = 10)
     private Date alarmTime;
     /**
      * 报警图片
@@ -128,7 +128,7 @@
      * 预置点号
      */
     @TableField("SERIAL_NUM")
-    @ExcelProperty(value = "预置点名称", order = 3)
+    @ExcelProperty(value = "巡航点位", order = 3)
     private Integer serialNum;
     /**
      * 时间
@@ -139,7 +139,7 @@
     private Date ts;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "监控点位名称", order = 1)
+    @ExcelProperty(value = "设备名称", order = 1)
     private String monitorName;
 
     @TableField(exist = false)
@@ -147,15 +147,15 @@
     private String stationName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "报警类型", order = 6)
+    @ExcelProperty(value = "告警类型", order = 6)
     private String alarmTypeName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "报警状态", order = 7)
+    @ExcelProperty(value = "告警状态", order = 7)
     private String alarmStatusName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "巡航路线名称", order = 2)
+    @ExcelProperty(value = "巡航路线", order = 2)
     private String lineName;
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
index 61f39c9..68e08e9 100644
--- a/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
@@ -5,7 +5,7 @@
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 // tomcat启动无需配置
- @Configuration
+// @Configuration
 public class WebSocketConfig {
     /**
      * 注入ServerEndpointExporter，

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
index 57c0198..1d17d71 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
@@ -69,7 +69,7 @@
      * 报警数值
      */
     @TableField("ALARM_VALUE")
-    @ExcelProperty(value = "报警数值", order = 5)
+    @ExcelProperty(value = "告警值", order = 5)
     private Double alarmValue;
     /**
      * 报警阈值
@@ -80,19 +80,19 @@
      * 报警方位
      */
     @TableField("ALARM_DIRECTION")
-    @ExcelProperty(value = "报警方位", order = 8)
+    @ExcelProperty(value = "水平角", order = 8)
     private Double alarmDirection;
     /**
      * 报警俯仰角
      */
     @TableField("ALARM_PITCH")
-    @ExcelProperty(value = "报警俯仰角", order = 9)
+    @ExcelProperty(value = "俯仰角", order = 9)
     private Double alarmPitch;
     /**
      * 报警时间
      */
     @TableField("ALARM_TIME")
-    @ExcelProperty(value = "报警时间", order = 10)
+    @ExcelProperty(value = "告警时间", order = 10)
     private Date alarmTime;
     /**
      * 报警图片
@@ -128,7 +128,7 @@
      * 预置点号
      */
     @TableField("SERIAL_NUM")
-    @ExcelProperty(value = "预置点名称", order = 3)
+    @ExcelProperty(value = "巡航点位", order = 3)
     private Integer serialNum;
     /**
      * 时间
@@ -139,7 +139,7 @@
     private Date ts;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "监控点位名称", order = 1)
+    @ExcelProperty(value = "设备名称", order = 1)
     private String monitorName;
 
     @TableField(exist = false)
@@ -147,15 +147,15 @@
     private String stationName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "报警类型", order = 6)
+    @ExcelProperty(value = "告警类型", order = 6)
     private String alarmTypeName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "报警状态", order = 7)
+    @ExcelProperty(value = "告警状态", order = 7)
     private String alarmStatusName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "巡航路线名称", order = 2)
+    @ExcelProperty(value = "巡航路线", order = 2)
     private String lineName;
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
index 61f39c9..68e08e9 100644
--- a/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
@@ -5,7 +5,7 @@
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 // tomcat启动无需配置
- @Configuration
+// @Configuration
 public class WebSocketConfig {
     /**
      * 注入ServerEndpointExporter，
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index 2e2f60c..972119f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -125,7 +125,7 @@
                 if (isOpen == 1) {
                     if (map.get(this.deviceIp) != null) {
                         map.put(this.deviceIp, map.get(this.deviceIp) + 1);
-                        if (map.get(this.deviceIp) % 50L == 0) {
+                        if (map.get(this.deviceIp) % 300L == 0) {
                             //若在线，更新设备离线
 
                             if (monipoiInfoService.updateStatus(this.deviceIp, StatusEnum.STATUS_OFFLINE)) {
@@ -161,21 +161,21 @@
         public void run() {
             System.out.println("Thread-" + deviceIp + " -> start... " + new Date());
             // 登录，登录失败就一直尝试登录
-            while (true) {
-                boolean register = registerAndStartSerial();
-                if (register) {
-                    break;
-                }
-            }
-            // 登录成功后，按每秒一次查询甲烷数据
-            while (true) {
-                try {
-                    sendGasCommand();
-                    Thread.sleep(collectInterval);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
+//            while (true) {
+//                boolean register = registerAndStartSerial();
+//                if (register) {
+//                    break;
+//                }
+//            }
+//            // 登录成功后，按每秒一次查询甲烷数据
+//            while (true) {
+//                try {
+//                    sendGasCommand();
+//                    Thread.sleep(collectInterval);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
         }
     }
 

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
index 57c0198..1d17d71 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
@@ -69,7 +69,7 @@
      * 报警数值
      */
     @TableField("ALARM_VALUE")
-    @ExcelProperty(value = "报警数值", order = 5)
+    @ExcelProperty(value = "告警值", order = 5)
     private Double alarmValue;
     /**
      * 报警阈值
@@ -80,19 +80,19 @@
      * 报警方位
      */
     @TableField("ALARM_DIRECTION")
-    @ExcelProperty(value = "报警方位", order = 8)
+    @ExcelProperty(value = "水平角", order = 8)
     private Double alarmDirection;
     /**
      * 报警俯仰角
      */
     @TableField("ALARM_PITCH")
-    @ExcelProperty(value = "报警俯仰角", order = 9)
+    @ExcelProperty(value = "俯仰角", order = 9)
     private Double alarmPitch;
     /**
      * 报警时间
      */
     @TableField("ALARM_TIME")
-    @ExcelProperty(value = "报警时间", order = 10)
+    @ExcelProperty(value = "告警时间", order = 10)
     private Date alarmTime;
     /**
      * 报警图片
@@ -128,7 +128,7 @@
      * 预置点号
      */
     @TableField("SERIAL_NUM")
-    @ExcelProperty(value = "预置点名称", order = 3)
+    @ExcelProperty(value = "巡航点位", order = 3)
     private Integer serialNum;
     /**
      * 时间
@@ -139,7 +139,7 @@
     private Date ts;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "监控点位名称", order = 1)
+    @ExcelProperty(value = "设备名称", order = 1)
     private String monitorName;
 
     @TableField(exist = false)
@@ -147,15 +147,15 @@
     private String stationName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "报警类型", order = 6)
+    @ExcelProperty(value = "告警类型", order = 6)
     private String alarmTypeName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "报警状态", order = 7)
+    @ExcelProperty(value = "告警状态", order = 7)
     private String alarmStatusName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "巡航路线名称", order = 2)
+    @ExcelProperty(value = "巡航路线", order = 2)
     private String lineName;
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
index 61f39c9..68e08e9 100644
--- a/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
@@ -5,7 +5,7 @@
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 // tomcat启动无需配置
- @Configuration
+// @Configuration
 public class WebSocketConfig {
     /**
      * 注入ServerEndpointExporter，
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index 2e2f60c..972119f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -125,7 +125,7 @@
                 if (isOpen == 1) {
                     if (map.get(this.deviceIp) != null) {
                         map.put(this.deviceIp, map.get(this.deviceIp) + 1);
-                        if (map.get(this.deviceIp) % 50L == 0) {
+                        if (map.get(this.deviceIp) % 300L == 0) {
                             //若在线，更新设备离线
 
                             if (monipoiInfoService.updateStatus(this.deviceIp, StatusEnum.STATUS_OFFLINE)) {
@@ -161,21 +161,21 @@
         public void run() {
             System.out.println("Thread-" + deviceIp + " -> start... " + new Date());
             // 登录，登录失败就一直尝试登录
-            while (true) {
-                boolean register = registerAndStartSerial();
-                if (register) {
-                    break;
-                }
-            }
-            // 登录成功后，按每秒一次查询甲烷数据
-            while (true) {
-                try {
-                    sendGasCommand();
-                    Thread.sleep(collectInterval);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
+//            while (true) {
+//                boolean register = registerAndStartSerial();
+//                if (register) {
+//                    break;
+//                }
+//            }
+//            // 登录成功后，按每秒一次查询甲烷数据
+//            while (true) {
+//                try {
+//                    sendGasCommand();
+//                    Thread.sleep(collectInterval);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
         }
     }
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
index c43ab68..9a6b1da 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
@@ -56,7 +56,7 @@
     private Long stationId;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "场站名称", order = 0)
+    @ExcelProperty(value = "所在场站", order = 0)
     private String stationName;
     /**
      * 精确位置信息
@@ -82,55 +82,55 @@
      * 设备IP
      */
     @TableField("DEVICE_IP")
-    @ExcelProperty(value = "设备IP", order = 2)
+    @ExcelProperty(value = "云台登录地址", order = 2)
     private String deviceIp;
     /**
      * 设备端口号
      */
     @TableField("DEVICE_PORT")
-    @ExcelProperty(value = "设备端口", order = 3)
+    @ExcelProperty(value = "云台登录端口", order = 3)
     private String devicePort;
     /**
      * 设备登录用户
      */
     @TableField("DEVICE_USER")
-    @ExcelProperty(value = "设备登录用户", order = 4)
+    @ExcelProperty(value = "云台登录账号", order = 4)
     private String deviceUser;
     /**
      * 设备登录密码
      */
     @TableField("DEVICE_PASSWORD")
-    @ExcelProperty(value = "设备登录密码", order = 5)
+    @ExcelProperty(value = "云台登录密码", order = 5)
     private String devicePassword;
     /**
      * NVR IP
      */
     @TableField("NVR_IP")
-    @ExcelProperty(value = "NVR IP", order = 6)
+    @ExcelProperty(value = "NVR登录地址", order = 6)
     private String nvrIp;
     /**
      * NVR端口
      */
     @TableField("NVR_PORT")
-    @ExcelProperty(value = "NVR 端口", order = 7)
+    @ExcelProperty(value = "NVR登陆端口", order = 7)
     private String nvrPort;
     /**
      * NVR通道
      */
     @TableField("NVR_CHANNEL")
-    @ExcelProperty(value = "NVR 通道", order = 8)
+    @ExcelProperty(value = "NVR通道号", order = 8)
     private String nvrChannel;
     /**
      * NVR账户
      */
     @TableField("NVR_USER")
-    @ExcelProperty(value = "NVR 用户名", order = 9)
+    @ExcelProperty(value = "NVR登录账号", order = 9)
     private String nvrUser;
     /**
      * NVR密码
      */
     @TableField("NVR_PASSWORD")
-    @ExcelProperty(value = "NVR 密码", order = 10)
+    @ExcelProperty(value = "NVR登录密码", order = 10)
     private String nvrPassword;
     /**
      * 开关IP