diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
new file mode 100644
index 0000000..5810303
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.system.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class GasDectorDataDto {
+    private Long id;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private String imsi;
+    /**
+     * --事件类型 0正常 1低报 2高报
+     */
+    @ExcelProperty("事件类型")
+    private String gasSensorState;
+    @ExcelProperty("燃气浓度")
+    private Double gasSampleValue;
+    private String sinr;
+    private String rsrp;
+    private String pci;
+    private String heartbeatTime;
+    private String cellId;
+    @ExcelProperty("电池电压")
+    private String batteryVoltage;
+    @ExcelProperty("电池电量")
+    private String batteryValue;
+    private String iccid;
+    @ExcelProperty("采集时间")
+    private Date uptime;
+    @ExcelProperty("记录时间")
+    private Date logtime;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+}

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
new file mode 100644
index 0000000..5810303
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.system.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class GasDectorDataDto {
+    private Long id;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private String imsi;
+    /**
+     * --事件类型 0正常 1低报 2高报
+     */
+    @ExcelProperty("事件类型")
+    private String gasSensorState;
+    @ExcelProperty("燃气浓度")
+    private Double gasSampleValue;
+    private String sinr;
+    private String rsrp;
+    private String pci;
+    private String heartbeatTime;
+    private String cellId;
+    @ExcelProperty("电池电压")
+    private String batteryVoltage;
+    @ExcelProperty("电池电量")
+    private String batteryValue;
+    private String iccid;
+    @ExcelProperty("采集时间")
+    private Date uptime;
+    @ExcelProperty("记录时间")
+    private Date logtime;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
new file mode 100644
index 0000000..158c4a8
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.system.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class PantiltDataDto {
+    private Long id;
+    @ExcelProperty("点位编号")
+    private String positionCode;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("方位角")
+    private Double dircetion;
+    @ExcelProperty("俯仰角")
+    private Double pitch;
+    @ExcelProperty("浓度值")
+    private Double concentration;
+    @ExcelProperty("采集时间")
+    private Date uptime;
+    @ExcelProperty("记录时间")
+    private Date logtime;
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+}

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
new file mode 100644
index 0000000..5810303
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.system.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class GasDectorDataDto {
+    private Long id;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private String imsi;
+    /**
+     * --事件类型 0正常 1低报 2高报
+     */
+    @ExcelProperty("事件类型")
+    private String gasSensorState;
+    @ExcelProperty("燃气浓度")
+    private Double gasSampleValue;
+    private String sinr;
+    private String rsrp;
+    private String pci;
+    private String heartbeatTime;
+    private String cellId;
+    @ExcelProperty("电池电压")
+    private String batteryVoltage;
+    @ExcelProperty("电池电量")
+    private String batteryValue;
+    private String iccid;
+    @ExcelProperty("采集时间")
+    private Date uptime;
+    @ExcelProperty("记录时间")
+    private Date logtime;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
new file mode 100644
index 0000000..158c4a8
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.system.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class PantiltDataDto {
+    private Long id;
+    @ExcelProperty("点位编号")
+    private String positionCode;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("方位角")
+    private Double dircetion;
+    @ExcelProperty("俯仰角")
+    private Double pitch;
+    @ExcelProperty("浓度值")
+    private Double concentration;
+    @ExcelProperty("采集时间")
+    private Date uptime;
+    @ExcelProperty("记录时间")
+    private Date logtime;
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+}
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
deleted file mode 100644
index 4dc3b0b..0000000
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-server:
-  port: 11309
-###################  spring配置  ###################
-spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://111.198.10.15:11209/smartwell
-    username: postgres
-    password: Casic203
-  session:
-    store-type: redis
-  redis:
-    host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
-    redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
-  jms:
-    pub-sub-domain: true
-  #  session:
-  #   store-type: redis
-  redis-config:
-    host: 127.0.0.1
-    port: 6379
-    password:
-  activemq:
-    user:
-    password:
-    broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
-  kaptcha-open: false #是否开启登录时验证码 (true/false)
-  #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
-  db:
-    init:
-      enable: false
-  file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
-  spring-session-open: false #开启spring session
-smartcity:
-  config:
-    export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
-    #export-path: D:\export\
-    image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
-    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
-    download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
-  device:
-    redis:
-      invalid-time: 86400
-      host: 127.0.0.1
-      port: 6379
-      password: ew5T4K3#203lwh
-      config-prefix: 'Casic:'
-  getui:
-    appId: H9jSTE2bAt8QWq2K2GNOB3
-    appKey: bhPeCutJVdAyOasevQFtN9
-    masterSecret: lChudND74A89WRiHLkedb5
-logging:
-  level.root: info
-  level.com.casic: info
-  file:
-    path: logs/
-    name: missiles.log
\ No newline at end of file

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
new file mode 100644
index 0000000..5810303
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.system.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class GasDectorDataDto {
+    private Long id;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private String imsi;
+    /**
+     * --事件类型 0正常 1低报 2高报
+     */
+    @ExcelProperty("事件类型")
+    private String gasSensorState;
+    @ExcelProperty("燃气浓度")
+    private Double gasSampleValue;
+    private String sinr;
+    private String rsrp;
+    private String pci;
+    private String heartbeatTime;
+    private String cellId;
+    @ExcelProperty("电池电压")
+    private String batteryVoltage;
+    @ExcelProperty("电池电量")
+    private String batteryValue;
+    private String iccid;
+    @ExcelProperty("采集时间")
+    private Date uptime;
+    @ExcelProperty("记录时间")
+    private Date logtime;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
new file mode 100644
index 0000000..158c4a8
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.system.model;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class PantiltDataDto {
+    private Long id;
+    @ExcelProperty("点位编号")
+    private String positionCode;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("方位角")
+    private Double dircetion;
+    @ExcelProperty("俯仰角")
+    private Double pitch;
+    @ExcelProperty("浓度值")
+    private Double concentration;
+    @ExcelProperty("采集时间")
+    private Date uptime;
+    @ExcelProperty("记录时间")
+    private Date logtime;
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+}
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
deleted file mode 100644
index 4dc3b0b..0000000
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-server:
-  port: 11309
-###################  spring配置  ###################
-spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://111.198.10.15:11209/smartwell
-    username: postgres
-    password: Casic203
-  session:
-    store-type: redis
-  redis:
-    host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
-    redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
-  jms:
-    pub-sub-domain: true
-  #  session:
-  #   store-type: redis
-  redis-config:
-    host: 127.0.0.1
-    port: 6379
-    password:
-  activemq:
-    user:
-    password:
-    broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
-  kaptcha-open: false #是否开启登录时验证码 (true/false)
-  #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
-  db:
-    init:
-      enable: false
-  file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
-  spring-session-open: false #开启spring session
-smartcity:
-  config:
-    export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
-    #export-path: D:\export\
-    image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
-    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
-    download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
-  device:
-    redis:
-      invalid-time: 86400
-      host: 127.0.0.1
-      port: 6379
-      password: ew5T4K3#203lwh
-      config-prefix: 'Casic:'
-  getui:
-    appId: H9jSTE2bAt8QWq2K2GNOB3
-    appKey: bhPeCutJVdAyOasevQFtN9
-    masterSecret: lChudND74A89WRiHLkedb5
-logging:
-  level.root: info
-  level.com.casic: info
-  file:
-    path: logs/
-    name: missiles.log
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/download/apk/$RHWMEDF.yml b/casic-web/src/main/resources/config/download/apk/$RHWMEDF.yml
new file mode 100644
index 0000000..6275316
--- /dev/null
+++ b/casic-web/src/main/resources/config/download/apk/$RHWMEDF.yml
@@ -0,0 +1,62 @@
+server:
+  port: 11307
+###################  spring配置  ###################
+spring:
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://localhost:11332/smartwell
+    username: postgres
+    password: casic203
+  session:
+    store-type: redis
+  redis:
+    host: 111.198.10.15
+    port: 11412
+    password: ew5T4K3#203lwh
+    redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+  jms:
+    pub-sub-domain: true
+  #  session:
+  #   store-type: redis
+  redis-config:
+    host: 127.0.0.1
+    port: 6379
+    password:
+  activemq:
+    user:
+    password:
+    broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+  kaptcha-open: false #是否开启登录时验证码 (true/false)
+  #kaptcha-open: false #是否开启登录时验证码 (true/false)
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+  db:
+    init:
+      enable: false
+  file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+  spring-session-open: false #开启spring session
+smartcity:
+  config:
+    export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+    #export-path: D:\export\
+    image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+    download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+  device:
+    redis:
+      invalid-time: 86400
+      host: 127.0.0.1
+      port: 6379
+      password: ew5T4K3#203lwh
+      config-prefix: 'Casic:'
+  getui:
+    appId: H9jSTE2bAt8QWq2K2GNOB3
+    appKey: bhPeCutJVdAyOasevQFtN9
+    masterSecret: lChudND74A89WRiHLkedb5
+logging:
+  level.root: info
+  level.com.casic: info
+  file:
+    path: logs/
+    name: missiles.log
\ No newline at end of file