diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7595023..284bb01 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 
@@ -24,7 +25,7 @@
 
     Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request);
 
-    List<BusLedger> list(BusLedgerDTO request, DataScope dataScope);
+    List<WellMapDTO> list(BusLedgerDTO request);
 
     Map<String,List<Map<String, Object>>> watchDataByWell(DeviceMonitorRequestDTO requestDTO);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7595023..284bb01 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 
@@ -24,7 +25,7 @@
 
     Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request);
 
-    List<BusLedger> list(BusLedgerDTO request, DataScope dataScope);
+    List<WellMapDTO> list(BusLedgerDTO request);
 
     Map<String,List<Map<String, Object>>> watchDataByWell(DeviceMonitorRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 2757a1f..13a8e74 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,20 +10,23 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DeviceDataEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.device.dao.BusDeviceMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.*;
 import com.casic.missiles.modular.device.service.*;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,6 +55,7 @@
     private final IBaseDeviceTypeService deviceTypeService;
     private final AbstractPermissionContext permissionContext;
     private final CommonServer commonServer;
+    private final IBaseExportService iBaseExportService;
 
     @Transactional
     @Override
@@ -82,7 +85,7 @@
         busDeviceList.forEach(busDevice -> {
             busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject()));
             busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid()));
-            busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线");
+            busDevice.setOnlineState("0".equals(busDevice.getOnlineState()) ? "离线" : "在线");
             if (ObjectUtil.isNotEmpty(busDevice.getDeptid()))
                 busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid()));
         });
@@ -96,10 +99,11 @@
 
     @Override
     public List<Map<String, Object>> monitorData(MonitorDataRequestDTO request) {
+
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.baseMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
@@ -111,6 +115,59 @@
         return resultMap;
     }
 
+    //todO:增加设备后需更新
+    @Override
+    public void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        try {
+            switch (requestDTO.getTypeName()) {
+                case "燃气智能监测终端":
+                    List<DataGasExcelDTO> gasDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectList = this.monitorData(requestDTO);
+                    objectList.forEach(object -> {
+                        gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"),
+                                CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"),
+                                CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime")));
+                    });
+                    iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "管网哨兵":
+                    List<DataTubeExcelDTO> tubeDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectTubeList = this.monitorData(requestDTO);
+                    objectTubeList.forEach(object -> {
+                        tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"),
+                                CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"),
+                                CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME")));
+                    });
+                    iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "智能警示桩":
+                    List<DataPipeOtherExcelDTO> dtoPipeOtherList = new ArrayList<>();
+                    List<Map<String, Object>> pipeOtherObjectList = this.monitorData(requestDTO);
+                    pipeOtherObjectList.forEach(object -> {
+                        dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"),
+                                CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"),
+                                CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"),
+                                "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"),
+                                CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否",
+                                CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS")));
+                    });
+                    iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                default:
+                    break;
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @Override
     public List<Map<String, Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO) {
         List<Map<String, Object>> mapList = this.baseMapper.alarmRecords(requestDTO);
@@ -156,13 +213,15 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
-            resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
-                    "cell,uptime",
-                    queryColumns[0],
-                    queryColumns[1],
-                    deviceDataEnum.getOrderColumn(),
-                    request);
+            if (deviceDataEnum.getTableColumns().contains("cell")) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
+                        "cell,uptime",
+                        queryColumns[0],
+                        queryColumns[1],
+                        deviceDataEnum.getOrderColumn(),
+                        request);
+            }
         }
         return resultMap;
     }
@@ -245,7 +304,7 @@
                 });
                 //若安装位号不为空，检查是否存在
                 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) {
-                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(),deviceImportDTO.getDeptid());
+                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid());
                     if (null == ledgerIds || ledgerIds.size() < 1) {
                         list.add("第" + index[0] + "行，安装位号不存在！");
                         return;
@@ -265,7 +324,7 @@
             List<BusDeviceLedger> busDeviceLedgers = new ArrayList<>();
 
             busDeviceList.forEach(device -> {
-                for(Long ledgerId:device.getLedgerIds()){
+                for (Long ledgerId : device.getLedgerIds()) {
                     busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject()));
                 }
             });
@@ -279,7 +338,6 @@
     }
 
 
-
     @Override
     public List<OffLineAnalysis> offLineAnalysis(CommonRequestDTO requestDTO) {
         QueryWrapper<OffLineAnalysis> queryWrapper = new QueryWrapper<>();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7595023..284bb01 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 
@@ -24,7 +25,7 @@
 
     Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request);
 
-    List<BusLedger> list(BusLedgerDTO request, DataScope dataScope);
+    List<WellMapDTO> list(BusLedgerDTO request);
 
     Map<String,List<Map<String, Object>>> watchDataByWell(DeviceMonitorRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 2757a1f..13a8e74 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,20 +10,23 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DeviceDataEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.device.dao.BusDeviceMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.*;
 import com.casic.missiles.modular.device.service.*;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,6 +55,7 @@
     private final IBaseDeviceTypeService deviceTypeService;
     private final AbstractPermissionContext permissionContext;
     private final CommonServer commonServer;
+    private final IBaseExportService iBaseExportService;
 
     @Transactional
     @Override
@@ -82,7 +85,7 @@
         busDeviceList.forEach(busDevice -> {
             busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject()));
             busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid()));
-            busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线");
+            busDevice.setOnlineState("0".equals(busDevice.getOnlineState()) ? "离线" : "在线");
             if (ObjectUtil.isNotEmpty(busDevice.getDeptid()))
                 busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid()));
         });
@@ -96,10 +99,11 @@
 
     @Override
     public List<Map<String, Object>> monitorData(MonitorDataRequestDTO request) {
+
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.baseMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
@@ -111,6 +115,59 @@
         return resultMap;
     }
 
+    //todO:增加设备后需更新
+    @Override
+    public void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        try {
+            switch (requestDTO.getTypeName()) {
+                case "燃气智能监测终端":
+                    List<DataGasExcelDTO> gasDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectList = this.monitorData(requestDTO);
+                    objectList.forEach(object -> {
+                        gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"),
+                                CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"),
+                                CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime")));
+                    });
+                    iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "管网哨兵":
+                    List<DataTubeExcelDTO> tubeDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectTubeList = this.monitorData(requestDTO);
+                    objectTubeList.forEach(object -> {
+                        tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"),
+                                CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"),
+                                CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME")));
+                    });
+                    iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "智能警示桩":
+                    List<DataPipeOtherExcelDTO> dtoPipeOtherList = new ArrayList<>();
+                    List<Map<String, Object>> pipeOtherObjectList = this.monitorData(requestDTO);
+                    pipeOtherObjectList.forEach(object -> {
+                        dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"),
+                                CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"),
+                                CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"),
+                                "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"),
+                                CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否",
+                                CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS")));
+                    });
+                    iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                default:
+                    break;
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @Override
     public List<Map<String, Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO) {
         List<Map<String, Object>> mapList = this.baseMapper.alarmRecords(requestDTO);
@@ -156,13 +213,15 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
-            resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
-                    "cell,uptime",
-                    queryColumns[0],
-                    queryColumns[1],
-                    deviceDataEnum.getOrderColumn(),
-                    request);
+            if (deviceDataEnum.getTableColumns().contains("cell")) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
+                        "cell,uptime",
+                        queryColumns[0],
+                        queryColumns[1],
+                        deviceDataEnum.getOrderColumn(),
+                        request);
+            }
         }
         return resultMap;
     }
@@ -245,7 +304,7 @@
                 });
                 //若安装位号不为空，检查是否存在
                 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) {
-                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(),deviceImportDTO.getDeptid());
+                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid());
                     if (null == ledgerIds || ledgerIds.size() < 1) {
                         list.add("第" + index[0] + "行，安装位号不存在！");
                         return;
@@ -265,7 +324,7 @@
             List<BusDeviceLedger> busDeviceLedgers = new ArrayList<>();
 
             busDeviceList.forEach(device -> {
-                for(Long ledgerId:device.getLedgerIds()){
+                for (Long ledgerId : device.getLedgerIds()) {
                     busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject()));
                 }
             });
@@ -279,7 +338,6 @@
     }
 
 
-
     @Override
     public List<OffLineAnalysis> offLineAnalysis(CommonRequestDTO requestDTO) {
         QueryWrapper<OffLineAnalysis> queryWrapper = new QueryWrapper<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index 8663651..0287f0c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -101,7 +101,7 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.busDeviceMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7595023..284bb01 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 
@@ -24,7 +25,7 @@
 
     Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request);
 
-    List<BusLedger> list(BusLedgerDTO request, DataScope dataScope);
+    List<WellMapDTO> list(BusLedgerDTO request);
 
     Map<String,List<Map<String, Object>>> watchDataByWell(DeviceMonitorRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 2757a1f..13a8e74 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,20 +10,23 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DeviceDataEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.device.dao.BusDeviceMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.*;
 import com.casic.missiles.modular.device.service.*;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,6 +55,7 @@
     private final IBaseDeviceTypeService deviceTypeService;
     private final AbstractPermissionContext permissionContext;
     private final CommonServer commonServer;
+    private final IBaseExportService iBaseExportService;
 
     @Transactional
     @Override
@@ -82,7 +85,7 @@
         busDeviceList.forEach(busDevice -> {
             busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject()));
             busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid()));
-            busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线");
+            busDevice.setOnlineState("0".equals(busDevice.getOnlineState()) ? "离线" : "在线");
             if (ObjectUtil.isNotEmpty(busDevice.getDeptid()))
                 busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid()));
         });
@@ -96,10 +99,11 @@
 
     @Override
     public List<Map<String, Object>> monitorData(MonitorDataRequestDTO request) {
+
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.baseMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
@@ -111,6 +115,59 @@
         return resultMap;
     }
 
+    //todO:增加设备后需更新
+    @Override
+    public void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        try {
+            switch (requestDTO.getTypeName()) {
+                case "燃气智能监测终端":
+                    List<DataGasExcelDTO> gasDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectList = this.monitorData(requestDTO);
+                    objectList.forEach(object -> {
+                        gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"),
+                                CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"),
+                                CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime")));
+                    });
+                    iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "管网哨兵":
+                    List<DataTubeExcelDTO> tubeDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectTubeList = this.monitorData(requestDTO);
+                    objectTubeList.forEach(object -> {
+                        tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"),
+                                CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"),
+                                CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME")));
+                    });
+                    iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "智能警示桩":
+                    List<DataPipeOtherExcelDTO> dtoPipeOtherList = new ArrayList<>();
+                    List<Map<String, Object>> pipeOtherObjectList = this.monitorData(requestDTO);
+                    pipeOtherObjectList.forEach(object -> {
+                        dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"),
+                                CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"),
+                                CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"),
+                                "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"),
+                                CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否",
+                                CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS")));
+                    });
+                    iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                default:
+                    break;
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @Override
     public List<Map<String, Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO) {
         List<Map<String, Object>> mapList = this.baseMapper.alarmRecords(requestDTO);
@@ -156,13 +213,15 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
-            resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
-                    "cell,uptime",
-                    queryColumns[0],
-                    queryColumns[1],
-                    deviceDataEnum.getOrderColumn(),
-                    request);
+            if (deviceDataEnum.getTableColumns().contains("cell")) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
+                        "cell,uptime",
+                        queryColumns[0],
+                        queryColumns[1],
+                        deviceDataEnum.getOrderColumn(),
+                        request);
+            }
         }
         return resultMap;
     }
@@ -245,7 +304,7 @@
                 });
                 //若安装位号不为空，检查是否存在
                 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) {
-                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(),deviceImportDTO.getDeptid());
+                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid());
                     if (null == ledgerIds || ledgerIds.size() < 1) {
                         list.add("第" + index[0] + "行，安装位号不存在！");
                         return;
@@ -265,7 +324,7 @@
             List<BusDeviceLedger> busDeviceLedgers = new ArrayList<>();
 
             busDeviceList.forEach(device -> {
-                for(Long ledgerId:device.getLedgerIds()){
+                for (Long ledgerId : device.getLedgerIds()) {
                     busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject()));
                 }
             });
@@ -279,7 +338,6 @@
     }
 
 
-
     @Override
     public List<OffLineAnalysis> offLineAnalysis(CommonRequestDTO requestDTO) {
         QueryWrapper<OffLineAnalysis> queryWrapper = new QueryWrapper<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index 8663651..0287f0c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -101,7 +101,7 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.busDeviceMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index bf968ef..604cac0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -6,10 +6,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DeviceDataEnum;
 import com.casic.missiles.modular.device.dao.BusWellMonitorMapper;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusLedgerService;
@@ -58,9 +55,7 @@
 
 
     @Override
-    public List<BusLedger> list(BusLedgerDTO request, DataScope dataScope) {
-        // 地图不分页接口不再查字典值了
-        // 直接返回
+    public List<WellMapDTO> list(BusLedgerDTO request) {
         return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request);
     }
 
@@ -72,9 +67,22 @@
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         for (String deviceType : deviceTypeList) {
             DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(deviceType);
-            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
-                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
-                    busLedger.getLedgerCode()));
+//            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
+//                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
+//                    busLedger.getLedgerCode()));
+
+            if (null != deviceDataEnum) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap.put(deviceType, this.baseMapper.monitorData(deviceDataEnum.getTableName(),
+                        deviceDataEnum.getTableColumns(),
+                        queryColumns[0],
+                        queryColumns[1],
+                        queryColumns[2],
+                        queryColumns[3],
+                        deviceDataEnum.getOrderColumn(),
+                        request,
+                        busLedger.getLedgerCode()));
+            }
         }
         return resultMap;
     }
@@ -91,13 +99,13 @@
     public List<LifeCycleRecordDTO> lifecycleRecord(DeviceMonitorRequestDTO request) {
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         String wellCode = null != busLedger ? busLedger.getLedgerCode() : "";
-        List<Map<String,Object>>  alarmTypeMaps =  this.baseMapper.alarmType();
-        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode,request);
-        for(LifeCycleRecordDTO cycleRecordDTO:lifeCycleRecordDTOList){
+        List<Map<String, Object>> alarmTypeMaps = this.baseMapper.alarmType();
+        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode, request);
+        for (LifeCycleRecordDTO cycleRecordDTO : lifeCycleRecordDTOList) {
             cycleRecordDTO.setProcessDuration(TimeConverter(cycleRecordDTO.getProcessDuration()));
-            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
-            alarmTypeMaps.forEach(map->{
-                if(map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId()+"")){
+            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm()) ? "是" : "否");
+            alarmTypeMaps.forEach(map -> {
+                if (map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId() + "")) {
                     cycleRecordDTO.setAlarmTypeName(map.get("ALARM_TYPE").toString());
                 }
             });

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7595023..284bb01 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 
@@ -24,7 +25,7 @@
 
     Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request);
 
-    List<BusLedger> list(BusLedgerDTO request, DataScope dataScope);
+    List<WellMapDTO> list(BusLedgerDTO request);
 
     Map<String,List<Map<String, Object>>> watchDataByWell(DeviceMonitorRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 2757a1f..13a8e74 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,20 +10,23 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DeviceDataEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.device.dao.BusDeviceMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.*;
 import com.casic.missiles.modular.device.service.*;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,6 +55,7 @@
     private final IBaseDeviceTypeService deviceTypeService;
     private final AbstractPermissionContext permissionContext;
     private final CommonServer commonServer;
+    private final IBaseExportService iBaseExportService;
 
     @Transactional
     @Override
@@ -82,7 +85,7 @@
         busDeviceList.forEach(busDevice -> {
             busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject()));
             busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid()));
-            busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线");
+            busDevice.setOnlineState("0".equals(busDevice.getOnlineState()) ? "离线" : "在线");
             if (ObjectUtil.isNotEmpty(busDevice.getDeptid()))
                 busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid()));
         });
@@ -96,10 +99,11 @@
 
     @Override
     public List<Map<String, Object>> monitorData(MonitorDataRequestDTO request) {
+
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.baseMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
@@ -111,6 +115,59 @@
         return resultMap;
     }
 
+    //todO:增加设备后需更新
+    @Override
+    public void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        try {
+            switch (requestDTO.getTypeName()) {
+                case "燃气智能监测终端":
+                    List<DataGasExcelDTO> gasDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectList = this.monitorData(requestDTO);
+                    objectList.forEach(object -> {
+                        gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"),
+                                CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"),
+                                CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime")));
+                    });
+                    iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "管网哨兵":
+                    List<DataTubeExcelDTO> tubeDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectTubeList = this.monitorData(requestDTO);
+                    objectTubeList.forEach(object -> {
+                        tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"),
+                                CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"),
+                                CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME")));
+                    });
+                    iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "智能警示桩":
+                    List<DataPipeOtherExcelDTO> dtoPipeOtherList = new ArrayList<>();
+                    List<Map<String, Object>> pipeOtherObjectList = this.monitorData(requestDTO);
+                    pipeOtherObjectList.forEach(object -> {
+                        dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"),
+                                CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"),
+                                CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"),
+                                "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"),
+                                CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否",
+                                CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS")));
+                    });
+                    iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                default:
+                    break;
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @Override
     public List<Map<String, Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO) {
         List<Map<String, Object>> mapList = this.baseMapper.alarmRecords(requestDTO);
@@ -156,13 +213,15 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
-            resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
-                    "cell,uptime",
-                    queryColumns[0],
-                    queryColumns[1],
-                    deviceDataEnum.getOrderColumn(),
-                    request);
+            if (deviceDataEnum.getTableColumns().contains("cell")) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
+                        "cell,uptime",
+                        queryColumns[0],
+                        queryColumns[1],
+                        deviceDataEnum.getOrderColumn(),
+                        request);
+            }
         }
         return resultMap;
     }
@@ -245,7 +304,7 @@
                 });
                 //若安装位号不为空，检查是否存在
                 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) {
-                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(),deviceImportDTO.getDeptid());
+                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid());
                     if (null == ledgerIds || ledgerIds.size() < 1) {
                         list.add("第" + index[0] + "行，安装位号不存在！");
                         return;
@@ -265,7 +324,7 @@
             List<BusDeviceLedger> busDeviceLedgers = new ArrayList<>();
 
             busDeviceList.forEach(device -> {
-                for(Long ledgerId:device.getLedgerIds()){
+                for (Long ledgerId : device.getLedgerIds()) {
                     busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject()));
                 }
             });
@@ -279,7 +338,6 @@
     }
 
 
-
     @Override
     public List<OffLineAnalysis> offLineAnalysis(CommonRequestDTO requestDTO) {
         QueryWrapper<OffLineAnalysis> queryWrapper = new QueryWrapper<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index 8663651..0287f0c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -101,7 +101,7 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.busDeviceMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index bf968ef..604cac0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -6,10 +6,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DeviceDataEnum;
 import com.casic.missiles.modular.device.dao.BusWellMonitorMapper;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusLedgerService;
@@ -58,9 +55,7 @@
 
 
     @Override
-    public List<BusLedger> list(BusLedgerDTO request, DataScope dataScope) {
-        // 地图不分页接口不再查字典值了
-        // 直接返回
+    public List<WellMapDTO> list(BusLedgerDTO request) {
         return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request);
     }
 
@@ -72,9 +67,22 @@
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         for (String deviceType : deviceTypeList) {
             DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(deviceType);
-            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
-                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
-                    busLedger.getLedgerCode()));
+//            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
+//                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
+//                    busLedger.getLedgerCode()));
+
+            if (null != deviceDataEnum) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap.put(deviceType, this.baseMapper.monitorData(deviceDataEnum.getTableName(),
+                        deviceDataEnum.getTableColumns(),
+                        queryColumns[0],
+                        queryColumns[1],
+                        queryColumns[2],
+                        queryColumns[3],
+                        deviceDataEnum.getOrderColumn(),
+                        request,
+                        busLedger.getLedgerCode()));
+            }
         }
         return resultMap;
     }
@@ -91,13 +99,13 @@
     public List<LifeCycleRecordDTO> lifecycleRecord(DeviceMonitorRequestDTO request) {
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         String wellCode = null != busLedger ? busLedger.getLedgerCode() : "";
-        List<Map<String,Object>>  alarmTypeMaps =  this.baseMapper.alarmType();
-        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode,request);
-        for(LifeCycleRecordDTO cycleRecordDTO:lifeCycleRecordDTOList){
+        List<Map<String, Object>> alarmTypeMaps = this.baseMapper.alarmType();
+        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode, request);
+        for (LifeCycleRecordDTO cycleRecordDTO : lifeCycleRecordDTOList) {
             cycleRecordDTO.setProcessDuration(TimeConverter(cycleRecordDTO.getProcessDuration()));
-            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
-            alarmTypeMaps.forEach(map->{
-                if(map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId()+"")){
+            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm()) ? "是" : "否");
+            alarmTypeMaps.forEach(map -> {
+                if (map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId() + "")) {
                     cycleRecordDTO.setAlarmTypeName(map.get("ALARM_TYPE").toString());
                 }
             });
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
index 59df040..ff47413 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
@@ -4,10 +4,10 @@
 
 public enum DeviceDataEnum {
 
-    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
-    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
-    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
-    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
+    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime,well_code", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
+    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime,well_code", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
+    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime,well_number", "DEVCODE,TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,GAS_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LEFT_LENGTH,RIGHT_LENGTH,LOGTIME,UPTIME ", "logtime"),
+    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime,LEDGER_CODE", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
 
     public static DeviceDataEnum typeOf(String type) {
         DeviceDataEnum deviceDataEnum = null;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7595023..284bb01 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 
@@ -24,7 +25,7 @@
 
     Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request);
 
-    List<BusLedger> list(BusLedgerDTO request, DataScope dataScope);
+    List<WellMapDTO> list(BusLedgerDTO request);
 
     Map<String,List<Map<String, Object>>> watchDataByWell(DeviceMonitorRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 2757a1f..13a8e74 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,20 +10,23 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DeviceDataEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.device.dao.BusDeviceMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.*;
 import com.casic.missiles.modular.device.service.*;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,6 +55,7 @@
     private final IBaseDeviceTypeService deviceTypeService;
     private final AbstractPermissionContext permissionContext;
     private final CommonServer commonServer;
+    private final IBaseExportService iBaseExportService;
 
     @Transactional
     @Override
@@ -82,7 +85,7 @@
         busDeviceList.forEach(busDevice -> {
             busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject()));
             busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid()));
-            busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线");
+            busDevice.setOnlineState("0".equals(busDevice.getOnlineState()) ? "离线" : "在线");
             if (ObjectUtil.isNotEmpty(busDevice.getDeptid()))
                 busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid()));
         });
@@ -96,10 +99,11 @@
 
     @Override
     public List<Map<String, Object>> monitorData(MonitorDataRequestDTO request) {
+
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.baseMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
@@ -111,6 +115,59 @@
         return resultMap;
     }
 
+    //todO:增加设备后需更新
+    @Override
+    public void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        try {
+            switch (requestDTO.getTypeName()) {
+                case "燃气智能监测终端":
+                    List<DataGasExcelDTO> gasDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectList = this.monitorData(requestDTO);
+                    objectList.forEach(object -> {
+                        gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"),
+                                CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"),
+                                CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime")));
+                    });
+                    iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "管网哨兵":
+                    List<DataTubeExcelDTO> tubeDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectTubeList = this.monitorData(requestDTO);
+                    objectTubeList.forEach(object -> {
+                        tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"),
+                                CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"),
+                                CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME")));
+                    });
+                    iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "智能警示桩":
+                    List<DataPipeOtherExcelDTO> dtoPipeOtherList = new ArrayList<>();
+                    List<Map<String, Object>> pipeOtherObjectList = this.monitorData(requestDTO);
+                    pipeOtherObjectList.forEach(object -> {
+                        dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"),
+                                CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"),
+                                CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"),
+                                "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"),
+                                CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否",
+                                CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS")));
+                    });
+                    iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                default:
+                    break;
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @Override
     public List<Map<String, Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO) {
         List<Map<String, Object>> mapList = this.baseMapper.alarmRecords(requestDTO);
@@ -156,13 +213,15 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
-            resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
-                    "cell,uptime",
-                    queryColumns[0],
-                    queryColumns[1],
-                    deviceDataEnum.getOrderColumn(),
-                    request);
+            if (deviceDataEnum.getTableColumns().contains("cell")) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
+                        "cell,uptime",
+                        queryColumns[0],
+                        queryColumns[1],
+                        deviceDataEnum.getOrderColumn(),
+                        request);
+            }
         }
         return resultMap;
     }
@@ -245,7 +304,7 @@
                 });
                 //若安装位号不为空，检查是否存在
                 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) {
-                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(),deviceImportDTO.getDeptid());
+                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid());
                     if (null == ledgerIds || ledgerIds.size() < 1) {
                         list.add("第" + index[0] + "行，安装位号不存在！");
                         return;
@@ -265,7 +324,7 @@
             List<BusDeviceLedger> busDeviceLedgers = new ArrayList<>();
 
             busDeviceList.forEach(device -> {
-                for(Long ledgerId:device.getLedgerIds()){
+                for (Long ledgerId : device.getLedgerIds()) {
                     busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject()));
                 }
             });
@@ -279,7 +338,6 @@
     }
 
 
-
     @Override
     public List<OffLineAnalysis> offLineAnalysis(CommonRequestDTO requestDTO) {
         QueryWrapper<OffLineAnalysis> queryWrapper = new QueryWrapper<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index 8663651..0287f0c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -101,7 +101,7 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.busDeviceMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index bf968ef..604cac0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -6,10 +6,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DeviceDataEnum;
 import com.casic.missiles.modular.device.dao.BusWellMonitorMapper;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusLedgerService;
@@ -58,9 +55,7 @@
 
 
     @Override
-    public List<BusLedger> list(BusLedgerDTO request, DataScope dataScope) {
-        // 地图不分页接口不再查字典值了
-        // 直接返回
+    public List<WellMapDTO> list(BusLedgerDTO request) {
         return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request);
     }
 
@@ -72,9 +67,22 @@
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         for (String deviceType : deviceTypeList) {
             DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(deviceType);
-            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
-                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
-                    busLedger.getLedgerCode()));
+//            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
+//                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
+//                    busLedger.getLedgerCode()));
+
+            if (null != deviceDataEnum) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap.put(deviceType, this.baseMapper.monitorData(deviceDataEnum.getTableName(),
+                        deviceDataEnum.getTableColumns(),
+                        queryColumns[0],
+                        queryColumns[1],
+                        queryColumns[2],
+                        queryColumns[3],
+                        deviceDataEnum.getOrderColumn(),
+                        request,
+                        busLedger.getLedgerCode()));
+            }
         }
         return resultMap;
     }
@@ -91,13 +99,13 @@
     public List<LifeCycleRecordDTO> lifecycleRecord(DeviceMonitorRequestDTO request) {
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         String wellCode = null != busLedger ? busLedger.getLedgerCode() : "";
-        List<Map<String,Object>>  alarmTypeMaps =  this.baseMapper.alarmType();
-        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode,request);
-        for(LifeCycleRecordDTO cycleRecordDTO:lifeCycleRecordDTOList){
+        List<Map<String, Object>> alarmTypeMaps = this.baseMapper.alarmType();
+        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode, request);
+        for (LifeCycleRecordDTO cycleRecordDTO : lifeCycleRecordDTOList) {
             cycleRecordDTO.setProcessDuration(TimeConverter(cycleRecordDTO.getProcessDuration()));
-            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
-            alarmTypeMaps.forEach(map->{
-                if(map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId()+"")){
+            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm()) ? "是" : "否");
+            alarmTypeMaps.forEach(map -> {
+                if (map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId() + "")) {
                     cycleRecordDTO.setAlarmTypeName(map.get("ALARM_TYPE").toString());
                 }
             });
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
index 59df040..ff47413 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
@@ -4,10 +4,10 @@
 
 public enum DeviceDataEnum {
 
-    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
-    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
-    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
-    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
+    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime,well_code", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
+    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime,well_code", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
+    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime,well_number", "DEVCODE,TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,GAS_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LEFT_LENGTH,RIGHT_LENGTH,LOGTIME,UPTIME ", "logtime"),
+    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime,LEDGER_CODE", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
 
     public static DeviceDataEnum typeOf(String type) {
         DeviceDataEnum deviceDataEnum = null;
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java
new file mode 100644
index 0000000..eace234
--- /dev/null
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java
@@ -0,0 +1,82 @@
+package com.casic.missiles.enums;
+
+
+public enum DeviceTypeExportEnum {
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    TubeOther("管网哨兵", 3,"data_tube_other"),
+    Methane("燃气智能监测终端", 9,"data_gas"),
+    MonitorPipeOther("智能警示桩", 5,"data_monitor_pipe_other"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 4,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad"),
+    PANTILT("激光甲烷云台", 17,"data_pantilt"),
+    PRESSURE("压力监测终端", 18,"data_pressure"),
+    GasDector("点型可燃气体探测器", 19,"data_gas_dector");
+
+    // 成员变量
+    private String name;
+    private int index;
+    private String tableName;
+
+
+    // 构造方法
+    private DeviceTypeExportEnum(String name, int index, String tableName) {
+        this.name = name;
+        this.index = index;
+        this.tableName = tableName;
+
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public static DeviceTypeExportEnum getByIndex(String index) {
+        try {
+            for (DeviceTypeExportEnum deviceTypeEnum : values()) {
+                if (deviceTypeEnum.index == Integer.parseInt(index)) {
+                    return deviceTypeEnum;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+
+    //覆盖方法
+    @Override
+    public String toString() {
+        return this.name;
+    }
+}
\ No newline at end of file

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7595023..284bb01 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 
@@ -24,7 +25,7 @@
 
     Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request);
 
-    List<BusLedger> list(BusLedgerDTO request, DataScope dataScope);
+    List<WellMapDTO> list(BusLedgerDTO request);
 
     Map<String,List<Map<String, Object>>> watchDataByWell(DeviceMonitorRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 2757a1f..13a8e74 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,20 +10,23 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DeviceDataEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.device.dao.BusDeviceMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.*;
 import com.casic.missiles.modular.device.service.*;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,6 +55,7 @@
     private final IBaseDeviceTypeService deviceTypeService;
     private final AbstractPermissionContext permissionContext;
     private final CommonServer commonServer;
+    private final IBaseExportService iBaseExportService;
 
     @Transactional
     @Override
@@ -82,7 +85,7 @@
         busDeviceList.forEach(busDevice -> {
             busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject()));
             busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid()));
-            busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线");
+            busDevice.setOnlineState("0".equals(busDevice.getOnlineState()) ? "离线" : "在线");
             if (ObjectUtil.isNotEmpty(busDevice.getDeptid()))
                 busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid()));
         });
@@ -96,10 +99,11 @@
 
     @Override
     public List<Map<String, Object>> monitorData(MonitorDataRequestDTO request) {
+
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.baseMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
@@ -111,6 +115,59 @@
         return resultMap;
     }
 
+    //todO:增加设备后需更新
+    @Override
+    public void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        try {
+            switch (requestDTO.getTypeName()) {
+                case "燃气智能监测终端":
+                    List<DataGasExcelDTO> gasDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectList = this.monitorData(requestDTO);
+                    objectList.forEach(object -> {
+                        gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"),
+                                CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"),
+                                CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime")));
+                    });
+                    iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "管网哨兵":
+                    List<DataTubeExcelDTO> tubeDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectTubeList = this.monitorData(requestDTO);
+                    objectTubeList.forEach(object -> {
+                        tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"),
+                                CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"),
+                                CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME")));
+                    });
+                    iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "智能警示桩":
+                    List<DataPipeOtherExcelDTO> dtoPipeOtherList = new ArrayList<>();
+                    List<Map<String, Object>> pipeOtherObjectList = this.monitorData(requestDTO);
+                    pipeOtherObjectList.forEach(object -> {
+                        dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"),
+                                CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"),
+                                CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"),
+                                "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"),
+                                CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否",
+                                CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS")));
+                    });
+                    iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                default:
+                    break;
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @Override
     public List<Map<String, Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO) {
         List<Map<String, Object>> mapList = this.baseMapper.alarmRecords(requestDTO);
@@ -156,13 +213,15 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
-            resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
-                    "cell,uptime",
-                    queryColumns[0],
-                    queryColumns[1],
-                    deviceDataEnum.getOrderColumn(),
-                    request);
+            if (deviceDataEnum.getTableColumns().contains("cell")) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
+                        "cell,uptime",
+                        queryColumns[0],
+                        queryColumns[1],
+                        deviceDataEnum.getOrderColumn(),
+                        request);
+            }
         }
         return resultMap;
     }
@@ -245,7 +304,7 @@
                 });
                 //若安装位号不为空，检查是否存在
                 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) {
-                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(),deviceImportDTO.getDeptid());
+                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid());
                     if (null == ledgerIds || ledgerIds.size() < 1) {
                         list.add("第" + index[0] + "行，安装位号不存在！");
                         return;
@@ -265,7 +324,7 @@
             List<BusDeviceLedger> busDeviceLedgers = new ArrayList<>();
 
             busDeviceList.forEach(device -> {
-                for(Long ledgerId:device.getLedgerIds()){
+                for (Long ledgerId : device.getLedgerIds()) {
                     busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject()));
                 }
             });
@@ -279,7 +338,6 @@
     }
 
 
-
     @Override
     public List<OffLineAnalysis> offLineAnalysis(CommonRequestDTO requestDTO) {
         QueryWrapper<OffLineAnalysis> queryWrapper = new QueryWrapper<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index 8663651..0287f0c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -101,7 +101,7 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.busDeviceMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index bf968ef..604cac0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -6,10 +6,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DeviceDataEnum;
 import com.casic.missiles.modular.device.dao.BusWellMonitorMapper;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusLedgerService;
@@ -58,9 +55,7 @@
 
 
     @Override
-    public List<BusLedger> list(BusLedgerDTO request, DataScope dataScope) {
-        // 地图不分页接口不再查字典值了
-        // 直接返回
+    public List<WellMapDTO> list(BusLedgerDTO request) {
         return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request);
     }
 
@@ -72,9 +67,22 @@
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         for (String deviceType : deviceTypeList) {
             DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(deviceType);
-            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
-                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
-                    busLedger.getLedgerCode()));
+//            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
+//                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
+//                    busLedger.getLedgerCode()));
+
+            if (null != deviceDataEnum) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap.put(deviceType, this.baseMapper.monitorData(deviceDataEnum.getTableName(),
+                        deviceDataEnum.getTableColumns(),
+                        queryColumns[0],
+                        queryColumns[1],
+                        queryColumns[2],
+                        queryColumns[3],
+                        deviceDataEnum.getOrderColumn(),
+                        request,
+                        busLedger.getLedgerCode()));
+            }
         }
         return resultMap;
     }
@@ -91,13 +99,13 @@
     public List<LifeCycleRecordDTO> lifecycleRecord(DeviceMonitorRequestDTO request) {
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         String wellCode = null != busLedger ? busLedger.getLedgerCode() : "";
-        List<Map<String,Object>>  alarmTypeMaps =  this.baseMapper.alarmType();
-        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode,request);
-        for(LifeCycleRecordDTO cycleRecordDTO:lifeCycleRecordDTOList){
+        List<Map<String, Object>> alarmTypeMaps = this.baseMapper.alarmType();
+        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode, request);
+        for (LifeCycleRecordDTO cycleRecordDTO : lifeCycleRecordDTOList) {
             cycleRecordDTO.setProcessDuration(TimeConverter(cycleRecordDTO.getProcessDuration()));
-            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
-            alarmTypeMaps.forEach(map->{
-                if(map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId()+"")){
+            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm()) ? "是" : "否");
+            alarmTypeMaps.forEach(map -> {
+                if (map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId() + "")) {
                     cycleRecordDTO.setAlarmTypeName(map.get("ALARM_TYPE").toString());
                 }
             });
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
index 59df040..ff47413 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
@@ -4,10 +4,10 @@
 
 public enum DeviceDataEnum {
 
-    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
-    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
-    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
-    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
+    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime,well_code", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
+    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime,well_code", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
+    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime,well_number", "DEVCODE,TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,GAS_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LEFT_LENGTH,RIGHT_LENGTH,LOGTIME,UPTIME ", "logtime"),
+    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime,LEDGER_CODE", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
 
     public static DeviceDataEnum typeOf(String type) {
         DeviceDataEnum deviceDataEnum = null;
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java
new file mode 100644
index 0000000..eace234
--- /dev/null
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java
@@ -0,0 +1,82 @@
+package com.casic.missiles.enums;
+
+
+public enum DeviceTypeExportEnum {
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    TubeOther("管网哨兵", 3,"data_tube_other"),
+    Methane("燃气智能监测终端", 9,"data_gas"),
+    MonitorPipeOther("智能警示桩", 5,"data_monitor_pipe_other"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 4,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad"),
+    PANTILT("激光甲烷云台", 17,"data_pantilt"),
+    PRESSURE("压力监测终端", 18,"data_pressure"),
+    GasDector("点型可燃气体探测器", 19,"data_gas_dector");
+
+    // 成员变量
+    private String name;
+    private int index;
+    private String tableName;
+
+
+    // 构造方法
+    private DeviceTypeExportEnum(String name, int index, String tableName) {
+        this.name = name;
+        this.index = index;
+        this.tableName = tableName;
+
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public static DeviceTypeExportEnum getByIndex(String index) {
+        try {
+            for (DeviceTypeExportEnum deviceTypeEnum : values()) {
+                if (deviceTypeEnum.index == Integer.parseInt(index)) {
+                    return deviceTypeEnum;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+
+    //覆盖方法
+    @Override
+    public String toString() {
+        return this.name;
+    }
+}
\ No newline at end of file
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
index fe5bb18..33d3de1 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -11,6 +11,7 @@
     ALARM_DEVICE_EXPORT("alarmHistoryRecordData", "alarmHistoryRecordData", "设备正在报警记录"),
     ALARM_DEVICE_HISTORY_EXPORT("alarmHistoryRecordData", "alarmHistoryRecordData", "设备历史报警记录"),
     DEVICE_EXPORT("deviceInfo", "deviceInfo", "设备信息"),
+    DEVICE_DATA_EXPORT("deviceData", "deviceData", "设备上传数据信息"),
     DEVICE_OFF_EXPORT("deviceOffInfo", "deviceOffInfo", "设备离线信息"),
     LIFE_CYCLE_RECORD_EXPORT("lifeCycleRecord", "lifeCycleRecord", "全生命周期记录"),
     REPAIR_LOG_EXPORT("repairLog", "repairLog", "厂商运维记录"),

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7595023..284bb01 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 
@@ -24,7 +25,7 @@
 
     Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request);
 
-    List<BusLedger> list(BusLedgerDTO request, DataScope dataScope);
+    List<WellMapDTO> list(BusLedgerDTO request);
 
     Map<String,List<Map<String, Object>>> watchDataByWell(DeviceMonitorRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 2757a1f..13a8e74 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,20 +10,23 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DeviceDataEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.device.dao.BusDeviceMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.*;
 import com.casic.missiles.modular.device.service.*;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,6 +55,7 @@
     private final IBaseDeviceTypeService deviceTypeService;
     private final AbstractPermissionContext permissionContext;
     private final CommonServer commonServer;
+    private final IBaseExportService iBaseExportService;
 
     @Transactional
     @Override
@@ -82,7 +85,7 @@
         busDeviceList.forEach(busDevice -> {
             busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject()));
             busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid()));
-            busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线");
+            busDevice.setOnlineState("0".equals(busDevice.getOnlineState()) ? "离线" : "在线");
             if (ObjectUtil.isNotEmpty(busDevice.getDeptid()))
                 busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid()));
         });
@@ -96,10 +99,11 @@
 
     @Override
     public List<Map<String, Object>> monitorData(MonitorDataRequestDTO request) {
+
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.baseMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
@@ -111,6 +115,59 @@
         return resultMap;
     }
 
+    //todO:增加设备后需更新
+    @Override
+    public void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        try {
+            switch (requestDTO.getTypeName()) {
+                case "燃气智能监测终端":
+                    List<DataGasExcelDTO> gasDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectList = this.monitorData(requestDTO);
+                    objectList.forEach(object -> {
+                        gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"),
+                                CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"),
+                                CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime")));
+                    });
+                    iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "管网哨兵":
+                    List<DataTubeExcelDTO> tubeDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectTubeList = this.monitorData(requestDTO);
+                    objectTubeList.forEach(object -> {
+                        tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"),
+                                CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"),
+                                CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME")));
+                    });
+                    iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "智能警示桩":
+                    List<DataPipeOtherExcelDTO> dtoPipeOtherList = new ArrayList<>();
+                    List<Map<String, Object>> pipeOtherObjectList = this.monitorData(requestDTO);
+                    pipeOtherObjectList.forEach(object -> {
+                        dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"),
+                                CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"),
+                                CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"),
+                                "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"),
+                                CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否",
+                                CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS")));
+                    });
+                    iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                default:
+                    break;
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @Override
     public List<Map<String, Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO) {
         List<Map<String, Object>> mapList = this.baseMapper.alarmRecords(requestDTO);
@@ -156,13 +213,15 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
-            resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
-                    "cell,uptime",
-                    queryColumns[0],
-                    queryColumns[1],
-                    deviceDataEnum.getOrderColumn(),
-                    request);
+            if (deviceDataEnum.getTableColumns().contains("cell")) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
+                        "cell,uptime",
+                        queryColumns[0],
+                        queryColumns[1],
+                        deviceDataEnum.getOrderColumn(),
+                        request);
+            }
         }
         return resultMap;
     }
@@ -245,7 +304,7 @@
                 });
                 //若安装位号不为空，检查是否存在
                 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) {
-                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(),deviceImportDTO.getDeptid());
+                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid());
                     if (null == ledgerIds || ledgerIds.size() < 1) {
                         list.add("第" + index[0] + "行，安装位号不存在！");
                         return;
@@ -265,7 +324,7 @@
             List<BusDeviceLedger> busDeviceLedgers = new ArrayList<>();
 
             busDeviceList.forEach(device -> {
-                for(Long ledgerId:device.getLedgerIds()){
+                for (Long ledgerId : device.getLedgerIds()) {
                     busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject()));
                 }
             });
@@ -279,7 +338,6 @@
     }
 
 
-
     @Override
     public List<OffLineAnalysis> offLineAnalysis(CommonRequestDTO requestDTO) {
         QueryWrapper<OffLineAnalysis> queryWrapper = new QueryWrapper<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index 8663651..0287f0c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -101,7 +101,7 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.busDeviceMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index bf968ef..604cac0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -6,10 +6,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DeviceDataEnum;
 import com.casic.missiles.modular.device.dao.BusWellMonitorMapper;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusLedgerService;
@@ -58,9 +55,7 @@
 
 
     @Override
-    public List<BusLedger> list(BusLedgerDTO request, DataScope dataScope) {
-        // 地图不分页接口不再查字典值了
-        // 直接返回
+    public List<WellMapDTO> list(BusLedgerDTO request) {
         return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request);
     }
 
@@ -72,9 +67,22 @@
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         for (String deviceType : deviceTypeList) {
             DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(deviceType);
-            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
-                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
-                    busLedger.getLedgerCode()));
+//            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
+//                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
+//                    busLedger.getLedgerCode()));
+
+            if (null != deviceDataEnum) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap.put(deviceType, this.baseMapper.monitorData(deviceDataEnum.getTableName(),
+                        deviceDataEnum.getTableColumns(),
+                        queryColumns[0],
+                        queryColumns[1],
+                        queryColumns[2],
+                        queryColumns[3],
+                        deviceDataEnum.getOrderColumn(),
+                        request,
+                        busLedger.getLedgerCode()));
+            }
         }
         return resultMap;
     }
@@ -91,13 +99,13 @@
     public List<LifeCycleRecordDTO> lifecycleRecord(DeviceMonitorRequestDTO request) {
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         String wellCode = null != busLedger ? busLedger.getLedgerCode() : "";
-        List<Map<String,Object>>  alarmTypeMaps =  this.baseMapper.alarmType();
-        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode,request);
-        for(LifeCycleRecordDTO cycleRecordDTO:lifeCycleRecordDTOList){
+        List<Map<String, Object>> alarmTypeMaps = this.baseMapper.alarmType();
+        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode, request);
+        for (LifeCycleRecordDTO cycleRecordDTO : lifeCycleRecordDTOList) {
             cycleRecordDTO.setProcessDuration(TimeConverter(cycleRecordDTO.getProcessDuration()));
-            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
-            alarmTypeMaps.forEach(map->{
-                if(map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId()+"")){
+            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm()) ? "是" : "否");
+            alarmTypeMaps.forEach(map -> {
+                if (map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId() + "")) {
                     cycleRecordDTO.setAlarmTypeName(map.get("ALARM_TYPE").toString());
                 }
             });
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
index 59df040..ff47413 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
@@ -4,10 +4,10 @@
 
 public enum DeviceDataEnum {
 
-    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
-    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
-    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
-    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
+    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime,well_code", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
+    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime,well_code", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
+    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime,well_number", "DEVCODE,TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,GAS_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LEFT_LENGTH,RIGHT_LENGTH,LOGTIME,UPTIME ", "logtime"),
+    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime,LEDGER_CODE", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
 
     public static DeviceDataEnum typeOf(String type) {
         DeviceDataEnum deviceDataEnum = null;
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java
new file mode 100644
index 0000000..eace234
--- /dev/null
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java
@@ -0,0 +1,82 @@
+package com.casic.missiles.enums;
+
+
+public enum DeviceTypeExportEnum {
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    TubeOther("管网哨兵", 3,"data_tube_other"),
+    Methane("燃气智能监测终端", 9,"data_gas"),
+    MonitorPipeOther("智能警示桩", 5,"data_monitor_pipe_other"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 4,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad"),
+    PANTILT("激光甲烷云台", 17,"data_pantilt"),
+    PRESSURE("压力监测终端", 18,"data_pressure"),
+    GasDector("点型可燃气体探测器", 19,"data_gas_dector");
+
+    // 成员变量
+    private String name;
+    private int index;
+    private String tableName;
+
+
+    // 构造方法
+    private DeviceTypeExportEnum(String name, int index, String tableName) {
+        this.name = name;
+        this.index = index;
+        this.tableName = tableName;
+
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public static DeviceTypeExportEnum getByIndex(String index) {
+        try {
+            for (DeviceTypeExportEnum deviceTypeEnum : values()) {
+                if (deviceTypeEnum.index == Integer.parseInt(index)) {
+                    return deviceTypeEnum;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+
+    //覆盖方法
+    @Override
+    public String toString() {
+        return this.name;
+    }
+}
\ No newline at end of file
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
index fe5bb18..33d3de1 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -11,6 +11,7 @@
     ALARM_DEVICE_EXPORT("alarmHistoryRecordData", "alarmHistoryRecordData", "设备正在报警记录"),
     ALARM_DEVICE_HISTORY_EXPORT("alarmHistoryRecordData", "alarmHistoryRecordData", "设备历史报警记录"),
     DEVICE_EXPORT("deviceInfo", "deviceInfo", "设备信息"),
+    DEVICE_DATA_EXPORT("deviceData", "deviceData", "设备上传数据信息"),
     DEVICE_OFF_EXPORT("deviceOffInfo", "deviceOffInfo", "设备离线信息"),
     LIFE_CYCLE_RECORD_EXPORT("lifeCycleRecord", "lifeCycleRecord", "全生命周期记录"),
     REPAIR_LOG_EXPORT("repairLog", "repairLog", "厂商运维记录"),
diff --git a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
index 9c5cc24..57f41c3 100644
--- a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
+++ b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
@@ -1,6 +1,9 @@
 package com.casic.missiles.util;
 
+import cn.hutool.core.util.ObjectUtil;
+
 import java.text.SimpleDateFormat;
+import java.util.Map;
 
 public class CommonUtil {
     public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -9,13 +12,20 @@
         return str.matches("-?\\d+(\\.\\d+)?");
     }
 
-    public  static  String DateFormat(String dataString) {
+    public static String DateFormat(String dataString) {
 
         String strymd = dataString.substring(0, 8);
         String str1 = strymd.substring(0, 4) + "-" + strymd.substring(4, 6) + "-" + strymd.substring(6, 8) + " ";
         String strhms = dataString.substring(8);
-        String str2 =strhms.substring(0,2)+":"+strhms.substring(2,4)+":"+strhms.substring(4,6);
-        dataString =str1+str2;
+        String str2 = strhms.substring(0, 2) + ":" + strhms.substring(2, 4) + ":" + strhms.substring(4, 6);
+        dataString = str1 + str2;
         return dataString;
     }
+
+
+    public static String getString(Map<String, Object> objMap, String name) {
+
+        return ObjectUtil.isNotNull(objMap.get(name)) ? objMap.get(name).toString() : "";
+
+    }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index 994a319..24ca9ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -61,7 +61,6 @@
     @ResponseBody
     public ReturnDTO<MessageLog> note() {
         Page<MessageLog> page = PageFactory.defaultPage();
-
         Page<MessageLog> messageLogPage = iMessageLogService.notePage(page);
         return ReturnUtil.success(super.packForBT(messageLogPage));
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 6e25903..5b0032f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -81,6 +81,7 @@
         GROUP BY ledgerCode)
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
+        order by ap.alarmSum desc
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
index c7b3033..ce3a490 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -31,5 +31,6 @@
             WHERE
             bv.DEPTID IN (${deptIds}))
         </if>
+      order by TS desc
     </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
index 821069a..05d57e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmPositionResponseDTO.java
@@ -2,10 +2,12 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ColumnWidth(30)
 @ExcelIgnoreUnannotated
 public class AlarmPositionResponseDTO {
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index d96cfb8..ab6ad49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -42,7 +42,10 @@
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, AlarmPositionRequestDTO request) {
-        //Todo:加入报警类型
+        if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) {
+            request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59"));
+            request.setTimeType("");
+        }
         List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
index 065319e..5131216 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java
@@ -107,6 +107,14 @@
         return ReturnUtil.success(iBusDeviceService.monitorData(requestDTO));
     }
 
+    @ApiOperation("数据查询导出")
+    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
+    public void dataExport(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        iBusDeviceService.exportExcel(requestDTO, response);
+
+    }
+
     @ApiOperation("报警记录")
     @PostMapping("/alarmRecords")
     @ResponseBody
@@ -180,7 +188,7 @@
 
     @ApiOperation("导出列表")
     @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-    public void batchExport(BusDeviceDTO request, HttpServletResponse response) throws IOException {
+    public void batchExport(BusDeviceDTO request, HttpServletResponse response) {
 
         Page<BusDevice> page = PageFactory.defaultPage();
         page.setSize(Integer.MAX_VALUE);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index d9744be..265d030 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -2,10 +2,8 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -14,6 +12,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusWellMonitorService;
@@ -33,7 +32,6 @@
 public class BusWellMonitorController extends ExportController {
 
     private final IBusWellMonitorService wellMonitorService;
-    private final AbstractPermissionContext iCommonPermissionService;
     private final IBaseExportService iBaseExportService;
 
     @ApiOperation("查询分页接口，列表用")
@@ -47,10 +45,8 @@
     @ApiOperation("查询接口，地图用")
     @PostMapping("/list")
     @ResponseBody
-    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
-        //TOdO:需要优化，看实际用到字段返回
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+    public ReturnDTO<WellMapDTO> list(@RequestBody BusLedgerDTO request) {
+        return ReturnUtil.success(wellMonitorService.list(request));
     }
 
     @ApiOperation("查看闸井监控数据")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2c80c6f..0fe29b6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,8 +26,8 @@
                              Page<BusLedger> page,
                              @Param("request") BusLedgerDTO request);
 
-    List<BusLedger> list(@Param("deptIds") String deptIds,
-                         @Param("request") BusLedgerDTO request);
+    List<WellMapDTO> list(@Param("deptIds") String deptIds,
+                          @Param("request") BusLedgerDTO request);
 
     @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
@@ -53,5 +49,15 @@
     @Select("SELECT at.ID,at.ALARM_TYPE FROM `alarm_type` at ")
     List<Map<String,Object>>  alarmType();
 
+    List<Map<String, Object>> monitorData(@Param("tableName") String tableName,
+                                          @Param("tableColumns") String tableColumns,
+                                          @Param("devcode") String devcode,
+                                          @Param("uptime") String uptime,
+                                          @Param("logtime") String logtime,
+                                          @Param("wellCode") String wellCode,
+                                          @Param("orderColumn") String orderColumn,
+                                          @Param("request") DeviceMonitorRequestDTO request,
+                                          @Param("wellNumber") String wellNumber);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 436db91..3011a5c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -68,11 +68,11 @@
             </if>
 
             <if test="request.onState != null and request.onState !='' ">
-                and rd.PROCESS_STATUS =#{request.onState}
+                and blp.ON_STATE =#{request.onState}
             </if>
 
             <if test="request.monitorState != null and request.monitorState !='' ">
-                and blp.ON_STATE =#{request.monitorState}
+                and blp.MONITOR_STATE =#{request.monitorState}
             </if>
         </where>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index baff88f..8d9c731 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.device.entity.BusLedger">
         <id column="ID" property="id" />
         <result column="LEDGER_CODE" property="ledgerCode" />
-        <result column="LEDGERL_NAME" property="ledgerlName" />
+        <result column="LEDGER_NAME" property="ledgerName" />
         <result column="TAG_NUMBER" property="tagNumber" />
         <result column="COORDINATE_X" property="coordinateX" />
         <result column="COORDINATE_Y" property="coordinateY" />
@@ -34,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, LEDGER_CODE, LEDGERL_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
+        ID, LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, COORDINATE_X, COORDINATE_Y, LNG_BAIDU, LAT_BAIDU, LNG_GAODE, LAT_GAODE, POSITION, DEPTID, RESPONSIBLE_DEPT, MANAGE_TYPE, ON_STATE, LOCATION_STATE, WELL_TYPE, TS, VALID, BFZT, `TYPE`, TARGET_ID, MARKER, SFQ, PROPERTY_OWNER, MONITOR_STATE
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -105,9 +105,9 @@
         ORDER BY bl.TS DESC
     </select>
 
-    <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
+    <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        bl.*
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
@@ -165,6 +165,36 @@
             ORDER BY ${orderColumn} DESC
     </select>
 
+    <select id="monitorData" resultType="java.util.Map">
+        select
+        ${tableColumns}
+        FROM
+        ${tableName}
+        <where>
+            <if test="wellNumber != null and wellNumber !='' ">
+                and   ${wellCode} =#{wellNumber}
+            </if>
+
+            <if test="uptime != null and uptime !='' ">
+                <if test="request.upBegTime != null and request.upBegTime !='' ">
+                    and ${uptime} <![CDATA[  >=  ]]> #{request.upBegTime}
+                </if>
+                <if test="request.upEndTime != null and request.upEndTime !='' ">
+                    and ${uptime} <![CDATA[  <=  ]]> #{request.upEndTime}
+                </if>
+            </if>
+            <if test="logtime != null and logtime !='' ">
+                <if test="request.logBegTime != null and request.logBegTime !='' ">
+                    and ${logtime} <![CDATA[  >=  ]]> #{request.logBegTime}
+                </if>
+                <if test="request.logEndTime != null and request.logEndTime !='' ">
+                    and ${logtime} <![CDATA[  <=  ]]> #{request.logEndTime}
+                </if>
+            </if>
+        </where>
+        ORDER BY ${orderColumn} DESC
+    </select>
+
 
     <select id="repairLog" resultType="com.casic.missiles.modular.device.entity.BusDeviceLog">
         SELECT bl.*,
@@ -186,7 +216,7 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
+        SELECT ar.ID,ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
         FROM `alarm_records` ar
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
new file mode 100644
index 0000000..1e700b3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataGasExcelDTO.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataGasExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String strength;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    @ExcelProperty("信号强度")
+    private String pci;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+
+    public DataGasExcelDTO(String devcode, String strength, String cell, String rsrp, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.strength = strength;
+        this.cell = cell;
+        this.pci = rsrp;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
new file mode 100644
index 0000000..976eb37
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataPipeOtherExcelDTO.java
@@ -0,0 +1,113 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外协管盯
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-29
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataPipeOtherExcelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("左侧指示带长度")
+    private String leftLength;
+
+    @ExcelProperty("右侧指视带长度")
+    private String rightLength;
+
+    @ExcelProperty("地层温度")
+    private String temperature;
+
+    @ExcelProperty("地层湿度")
+    private String humidity;
+
+    @ExcelProperty("电池电压")
+    private String vbat;
+
+    @ExcelProperty("桩倾斜报警")
+    private String pipeInclineAlarm;
+
+    @ExcelProperty("采集时间")
+    private String uptime;
+
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    @ExcelProperty("桩拆卸报警")
+    private String pipeBreakAlarm;
+
+    @ExcelProperty(" 燃气泄漏报警")
+    private String gasAlarm;
+
+    @ExcelProperty("左断线报警")
+    private String leftOffLineAlarm;
+
+    @ExcelProperty("左振动报警")
+    private String leftVibrateAlarm;
+
+    @ExcelProperty("右振动报警")
+    private String rightVibrateAlarm;
+
+    @ExcelProperty("右断线报警")
+    private String rightOffLineAlarm;
+
+    @ExcelProperty("有报警图像输出")
+    private String pictureAlarm;
+
+    @ExcelProperty("左侧甲烷值")
+    private String leftGas;
+
+    @ExcelProperty("右侧甲烷值")
+    private String rightGas;
+
+    public DataPipeOtherExcelDTO(String devcode, String leftLength, String rightLength,
+                                 String temperature, String humidity, String vbat,
+                                 String pipeInclineAlarm, String uptime, String logtime,
+                                 String pipeBreakAlarm, String gasAlarm, String leftOffLineAlarm,
+                                 String leftVibrateAlarm, String rightVibrateAlarm, String rightOffLineAlarm,
+                                 String pictureAlarm, String leftGas, String rightGas) {
+        this.devcode = devcode;
+        this.leftLength = leftLength;
+        this.rightLength = rightLength;
+        this.temperature = temperature;
+        this.humidity = humidity;
+        this.vbat = vbat;
+        this.pipeInclineAlarm = pipeInclineAlarm;
+        this.uptime = uptime;
+        this.logtime = logtime;
+        this.pipeBreakAlarm = pipeBreakAlarm;
+        this.gasAlarm = gasAlarm;
+        this.leftOffLineAlarm = leftOffLineAlarm;
+        this.leftVibrateAlarm = leftVibrateAlarm;
+        this.rightVibrateAlarm = rightVibrateAlarm;
+        this.rightOffLineAlarm = rightOffLineAlarm;
+        this.pictureAlarm = pictureAlarm;
+        this.leftGas = leftGas;
+        this.rightGas = rightGas;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
new file mode 100644
index 0000000..0d06dae
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DataTubeExcelDTO.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataTubeExcelDTO {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("燃气浓度（%LEL)")
+    private String gasval;
+
+    @ExcelProperty("电池电压(V)")
+    private String vbat;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("上传时间")
+    private String logtime;
+
+    public DataTubeExcelDTO(String devcode, String gasval, String cell, String vbat, String uptime, String logtime) {
+        this.devcode = devcode;
+        this.gasval = gasval;
+        this.vbat = vbat;
+        this.uptime = uptime;
+        this.logtime = logtime;
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index e0e3020..8f3b283 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -9,10 +9,22 @@
     @ApiModelProperty("闸井id")
     private Long wellId;
 
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("采集开始时间")
+    private String upBegTime;
+
+    @ApiModelProperty("采集结束时间")
+    private String upEndTime;
+
+    @ApiModelProperty("上报开始时间")
+    private String logBegTime;
+
+    @ApiModelProperty("上报结束时间")
+    private String logEndTime;
+
+    @ApiModelProperty("开始时间,全生命周期查询用")
     private String begTime;
 
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("结束时间,全生命周期查询用")
     private String endTime;
 
     @ApiModelProperty("设备编号")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index f295c15..5feca2c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -10,7 +10,7 @@
 @Data
 @ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
-    @ExcelProperty(value = "设备编号", order = 1)
+    @ExcelProperty(value = "报警时间", order = 1)
     @ApiModelProperty("报警时间")
     private Date alarmTime;
     private Long alarmTypeId;
@@ -32,5 +32,7 @@
     @ExcelProperty(value = "处置时长", order = 7)
     @ApiModelProperty("处置时长")
     private String processDuration;
+    @ApiModelProperty("报警记录id")
+    private Long id;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
new file mode 100644
index 0000000..6570bc4
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.device.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class WellMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String tagNumber;
+
+    @ApiModelProperty("编号，闸井/场站用")
+    private String ledgerCode;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+
+    @ApiModelProperty("监控状态（0：未监控，1：正常，2：异常，3：离线）")
+    private String monitorState;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("台账id")
+    private Long id;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
index b1f1d03..5d1f30b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusGrid.java
@@ -64,9 +64,11 @@
     @TableField("TS")
     private Date ts;
 
-
     @ApiModelProperty("位置状态，见字典")
     @TableField(exist = false)
     private String locationStateName;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index cb9bc85..34a5aaa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.entity.OffLineAnalysis;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,8 @@
 
     BusDevice detail(Long id);
 
+    void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response);
+
     List<Map<String,Object>> monitorData(MonitorDataRequestDTO requestDTO);
 
     List<Map<String,Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
index 7595023..284bb01 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.device.dto.BusLedgerDTO;
 import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
 import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.WellMapDTO;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 
@@ -24,7 +25,7 @@
 
     Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request);
 
-    List<BusLedger> list(BusLedgerDTO request, DataScope dataScope);
+    List<WellMapDTO> list(BusLedgerDTO request);
 
     Map<String,List<Map<String, Object>>> watchDataByWell(DeviceMonitorRequestDTO requestDTO);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 2757a1f..13a8e74 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,20 +10,23 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.application.service.AbstractDictService;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DeviceDataEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.device.dao.BusDeviceMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.*;
 import com.casic.missiles.modular.device.service.*;
 import com.casic.missiles.server.CommonServer;
+import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,6 +55,7 @@
     private final IBaseDeviceTypeService deviceTypeService;
     private final AbstractPermissionContext permissionContext;
     private final CommonServer commonServer;
+    private final IBaseExportService iBaseExportService;
 
     @Transactional
     @Override
@@ -82,7 +85,7 @@
         busDeviceList.forEach(busDevice -> {
             busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject()));
             busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid()));
-            busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线");
+            busDevice.setOnlineState("0".equals(busDevice.getOnlineState()) ? "离线" : "在线");
             if (ObjectUtil.isNotEmpty(busDevice.getDeptid()))
                 busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid()));
         });
@@ -96,10 +99,11 @@
 
     @Override
     public List<Map<String, Object>> monitorData(MonitorDataRequestDTO request) {
+
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.baseMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
@@ -111,6 +115,59 @@
         return resultMap;
     }
 
+    //todO:增加设备后需更新
+    @Override
+    public void exportExcel(MonitorDataRequestDTO requestDTO, HttpServletResponse response) {
+
+        try {
+            switch (requestDTO.getTypeName()) {
+                case "燃气智能监测终端":
+                    List<DataGasExcelDTO> gasDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectList = this.monitorData(requestDTO);
+                    objectList.forEach(object -> {
+                        gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"),
+                                CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"),
+                                CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime")));
+                    });
+                    iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "管网哨兵":
+                    List<DataTubeExcelDTO> tubeDtoList = new ArrayList<>();
+                    List<Map<String, Object>> objectTubeList = this.monitorData(requestDTO);
+                    objectTubeList.forEach(object -> {
+                        tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"),
+                                CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"),
+                                CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME")));
+                    });
+                    iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                case "智能警示桩":
+                    List<DataPipeOtherExcelDTO> dtoPipeOtherList = new ArrayList<>();
+                    List<Map<String, Object>> pipeOtherObjectList = this.monitorData(requestDTO);
+                    pipeOtherObjectList.forEach(object -> {
+                        dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"),
+                                CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"),
+                                CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"),
+                                "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"),
+                                CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否",
+                                "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否",
+                                CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS")));
+                    });
+                    iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName());
+                    break;
+                default:
+                    break;
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @Override
     public List<Map<String, Object>> alarmRecords(AlarmRecordsRequestDTO requestDTO) {
         List<Map<String, Object>> mapList = this.baseMapper.alarmRecords(requestDTO);
@@ -156,13 +213,15 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
-            resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
-                    "cell,uptime",
-                    queryColumns[0],
-                    queryColumns[1],
-                    deviceDataEnum.getOrderColumn(),
-                    request);
+            if (deviceDataEnum.getTableColumns().contains("cell")) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap = this.baseMapper.cellAnalysis(deviceDataEnum.getTableName(),
+                        "cell,uptime",
+                        queryColumns[0],
+                        queryColumns[1],
+                        deviceDataEnum.getOrderColumn(),
+                        request);
+            }
         }
         return resultMap;
     }
@@ -245,7 +304,7 @@
                 });
                 //若安装位号不为空，检查是否存在
                 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) {
-                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(),deviceImportDTO.getDeptid());
+                    List<Long> ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid());
                     if (null == ledgerIds || ledgerIds.size() < 1) {
                         list.add("第" + index[0] + "行，安装位号不存在！");
                         return;
@@ -265,7 +324,7 @@
             List<BusDeviceLedger> busDeviceLedgers = new ArrayList<>();
 
             busDeviceList.forEach(device -> {
-                for(Long ledgerId:device.getLedgerIds()){
+                for (Long ledgerId : device.getLedgerIds()) {
                     busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject()));
                 }
             });
@@ -279,7 +338,6 @@
     }
 
 
-
     @Override
     public List<OffLineAnalysis> offLineAnalysis(CommonRequestDTO requestDTO) {
         QueryWrapper<OffLineAnalysis> queryWrapper = new QueryWrapper<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index 8663651..0287f0c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -101,7 +101,7 @@
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if (null != deviceDataEnum) {
-            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 3);
+            String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
             resultMap = this.busDeviceMapper.monitorData(deviceDataEnum.getTableName(),
                     deviceDataEnum.getTableColumns(),
                     queryColumns[0],
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index bf968ef..604cac0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -6,10 +6,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.DeviceDataEnum;
 import com.casic.missiles.modular.device.dao.BusWellMonitorMapper;
-import com.casic.missiles.modular.device.dto.BusLedgerDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorDTO;
-import com.casic.missiles.modular.device.dto.DeviceMonitorRequestDTO;
-import com.casic.missiles.modular.device.dto.LifeCycleRecordDTO;
+import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusDeviceLog;
 import com.casic.missiles.modular.device.entity.BusLedger;
 import com.casic.missiles.modular.device.service.IBusLedgerService;
@@ -58,9 +55,7 @@
 
 
     @Override
-    public List<BusLedger> list(BusLedgerDTO request, DataScope dataScope) {
-        // 地图不分页接口不再查字典值了
-        // 直接返回
+    public List<WellMapDTO> list(BusLedgerDTO request) {
         return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request);
     }
 
@@ -72,9 +67,22 @@
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         for (String deviceType : deviceTypeList) {
             DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(deviceType);
-            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
-                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
-                    busLedger.getLedgerCode()));
+//            resultMap.put(deviceType, this.baseMapper.getWatchData(deviceDataEnum.getTableName(),
+//                    deviceDataEnum.getTableColumns(), deviceDataEnum.getOrderColumn(), request,
+//                    busLedger.getLedgerCode()));
+
+            if (null != deviceDataEnum) {
+                String[] queryColumns = deviceDataEnum.getQueryColumns().split(",", 4);
+                resultMap.put(deviceType, this.baseMapper.monitorData(deviceDataEnum.getTableName(),
+                        deviceDataEnum.getTableColumns(),
+                        queryColumns[0],
+                        queryColumns[1],
+                        queryColumns[2],
+                        queryColumns[3],
+                        deviceDataEnum.getOrderColumn(),
+                        request,
+                        busLedger.getLedgerCode()));
+            }
         }
         return resultMap;
     }
@@ -91,13 +99,13 @@
     public List<LifeCycleRecordDTO> lifecycleRecord(DeviceMonitorRequestDTO request) {
         BusLedger busLedger = iBusLedgerService.getById(request.getWellId());
         String wellCode = null != busLedger ? busLedger.getLedgerCode() : "";
-        List<Map<String,Object>>  alarmTypeMaps =  this.baseMapper.alarmType();
-        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode,request);
-        for(LifeCycleRecordDTO cycleRecordDTO:lifeCycleRecordDTOList){
+        List<Map<String, Object>> alarmTypeMaps = this.baseMapper.alarmType();
+        List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode, request);
+        for (LifeCycleRecordDTO cycleRecordDTO : lifeCycleRecordDTOList) {
             cycleRecordDTO.setProcessDuration(TimeConverter(cycleRecordDTO.getProcessDuration()));
-            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
-            alarmTypeMaps.forEach(map->{
-                if(map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId()+"")){
+            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm()) ? "是" : "否");
+            alarmTypeMaps.forEach(map -> {
+                if (map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId() + "")) {
                     cycleRecordDTO.setAlarmTypeName(map.get("ALARM_TYPE").toString());
                 }
             });
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
index 59df040..ff47413 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DeviceDataEnum.java
@@ -4,10 +4,10 @@
 
 public enum DeviceDataEnum {
 
-    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
-    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
-    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
-    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
+    DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime,well_code", "id,well_code,devcode,cell,strength,descn,uptime,logtime,pci,rsrp,snr", "logtime"),
+    DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime,well_code", "DEVCODE,GASVAL, VBAT,SIN,RSRP,SINR,UPTIME,LOGTIME", "logtime"),
+    DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime,well_number", "DEVCODE,TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,GAS_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LEFT_LENGTH,RIGHT_LENGTH,LOGTIME,UPTIME ", "logtime"),
+    DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime,LEDGER_CODE", "ID,LEDGER_NUMBER,DEVICE_CODE,CONCENTRATION,LOGTIME,DIRCETION,PITCH", "LOGTIME");
 
     public static DeviceDataEnum typeOf(String type) {
         DeviceDataEnum deviceDataEnum = null;
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java
new file mode 100644
index 0000000..eace234
--- /dev/null
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DeviceTypeExportEnum.java
@@ -0,0 +1,82 @@
+package com.casic.missiles.enums;
+
+
+public enum DeviceTypeExportEnum {
+    Well("井盖状态监测仪", 1,"data_wellcover"),
+    Liquid("液位监测仪", 2,"data_liquid"),
+    TubeOther("管网哨兵", 3,"data_tube_other"),
+    Methane("燃气智能监测终端", 9,"data_gas"),
+    MonitorPipeOther("智能警示桩", 5,"data_monitor_pipe_other"),
+    Dig("开挖监测仪", 6,"data_dig"),
+    WellLocator("井盖定位监测仪", 7,"data_wellcover_loca"),
+    Noise("噪声记录仪", 8,"data_noise"),
+    TempPressure("温度压力监测仪", 4,"data_temp_press"),
+    FireHydrant("消防栓防盗水监测仪", 11,"data_hydrant"),
+    Tube("管盯", 12,"data_tube"),
+    LG("井盖液位一体机", 13,"data_wellplus"),
+    H2s("硫化氢检测终端", 14,"data_h2s"),
+    PRESS("压力监测终端", 15,"data_press"),
+    KAD("点型可燃气体探测器", 16,"data_kad"),
+    PANTILT("激光甲烷云台", 17,"data_pantilt"),
+    PRESSURE("压力监测终端", 18,"data_pressure"),
+    GasDector("点型可燃气体探测器", 19,"data_gas_dector");
+
+    // 成员变量
+    private String name;
+    private int index;
+    private String tableName;
+
+
+    // 构造方法
+    private DeviceTypeExportEnum(String name, int index, String tableName) {
+        this.name = name;
+        this.index = index;
+        this.tableName = tableName;
+
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public static DeviceTypeExportEnum getByIndex(String index) {
+        try {
+            for (DeviceTypeExportEnum deviceTypeEnum : values()) {
+                if (deviceTypeEnum.index == Integer.parseInt(index)) {
+                    return deviceTypeEnum;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+
+    //覆盖方法
+    @Override
+    public String toString() {
+        return this.name;
+    }
+}
\ No newline at end of file
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
index fe5bb18..33d3de1 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -11,6 +11,7 @@
     ALARM_DEVICE_EXPORT("alarmHistoryRecordData", "alarmHistoryRecordData", "设备正在报警记录"),
     ALARM_DEVICE_HISTORY_EXPORT("alarmHistoryRecordData", "alarmHistoryRecordData", "设备历史报警记录"),
     DEVICE_EXPORT("deviceInfo", "deviceInfo", "设备信息"),
+    DEVICE_DATA_EXPORT("deviceData", "deviceData", "设备上传数据信息"),
     DEVICE_OFF_EXPORT("deviceOffInfo", "deviceOffInfo", "设备离线信息"),
     LIFE_CYCLE_RECORD_EXPORT("lifeCycleRecord", "lifeCycleRecord", "全生命周期记录"),
     REPAIR_LOG_EXPORT("repairLog", "repairLog", "厂商运维记录"),
diff --git a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
index 9c5cc24..57f41c3 100644
--- a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
+++ b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
@@ -1,6 +1,9 @@
 package com.casic.missiles.util;
 
+import cn.hutool.core.util.ObjectUtil;
+
 import java.text.SimpleDateFormat;
+import java.util.Map;
 
 public class CommonUtil {
     public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -9,13 +12,20 @@
         return str.matches("-?\\d+(\\.\\d+)?");
     }
 
-    public  static  String DateFormat(String dataString) {
+    public static String DateFormat(String dataString) {
 
         String strymd = dataString.substring(0, 8);
         String str1 = strymd.substring(0, 4) + "-" + strymd.substring(4, 6) + "-" + strymd.substring(6, 8) + " ";
         String strhms = dataString.substring(8);
-        String str2 =strhms.substring(0,2)+":"+strhms.substring(2,4)+":"+strhms.substring(4,6);
-        dataString =str1+str2;
+        String str2 = strhms.substring(0, 2) + ":" + strhms.substring(2, 4) + ":" + strhms.substring(4, 6);
+        dataString = str1 + str2;
         return dataString;
     }
+
+
+    public static String getString(Map<String, Object> objMap, String name) {
+
+        return ObjectUtil.isNotNull(objMap.get(name)) ? objMap.get(name).toString() : "";
+
+    }
 }
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 5f126c7..752afe1 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: @activatedProperties@
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB