diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 020351e..dfebbef 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -31,7 +31,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 020351e..dfebbef 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -31,7 +31,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 6fe4560..5a4dab7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 020351e..dfebbef 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -31,7 +31,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 6fe4560..5a4dab7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index fd9eb6b..001eacc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -28,7 +28,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 020351e..dfebbef 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -31,7 +31,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 6fe4560..5a4dab7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index fd9eb6b..001eacc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -28,7 +28,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index f00cf7b..3d604f5 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 020351e..dfebbef 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -31,7 +31,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 6fe4560..5a4dab7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index fd9eb6b..001eacc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -28,7 +28,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index f00cf7b..3d604f5 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 630fd12..e659d85 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 020351e..dfebbef 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -31,7 +31,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 6fe4560..5a4dab7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index fd9eb6b..001eacc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -28,7 +28,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index f00cf7b..3d604f5 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 630fd12..e659d85 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
index d5537eb..ae06ee2 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
@@ -6,12 +6,14 @@
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.config.DeviceApiProperties;
 import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto;
 import com.casic.missiles.modular.system.handler.DefaultHttpHeaderHandler;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.casic.missiles.modular.system.utils.HttpUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -204,4 +206,26 @@
         return result;
     }
 
+    public static List<Map<String,String>> convertObjectListToMap(List<Object> list){
+        List<Map<String,String>> reulstList = new ArrayList<Map<String,String>>();
+        try {
+            for (Object object : list) {
+                Map<String, String> map = new HashMap<String, String>();
+                for (Field field : object.getClass().getDeclaredFields()) {
+                    field.setAccessible(true);
+                    String name = field.getName();
+                    if(field.get(object) == null){continue;}
+                    else{
+                        map.put(name,field.get(object).toString());
+                    }
+                }
+                reulstList.add(map);
+            }
+        }
+        catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return reulstList;
+    }
+
 }

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 020351e..dfebbef 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -31,7 +31,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 6fe4560..5a4dab7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index fd9eb6b..001eacc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -28,7 +28,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index f00cf7b..3d604f5 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 630fd12..e659d85 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
index d5537eb..ae06ee2 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
@@ -6,12 +6,14 @@
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.config.DeviceApiProperties;
 import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto;
 import com.casic.missiles.modular.system.handler.DefaultHttpHeaderHandler;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.casic.missiles.modular.system.utils.HttpUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -204,4 +206,26 @@
         return result;
     }
 
+    public static List<Map<String,String>> convertObjectListToMap(List<Object> list){
+        List<Map<String,String>> reulstList = new ArrayList<Map<String,String>>();
+        try {
+            for (Object object : list) {
+                Map<String, String> map = new HashMap<String, String>();
+                for (Field field : object.getClass().getDeclaredFields()) {
+                    field.setAccessible(true);
+                    String name = field.getName();
+                    if(field.get(object) == null){continue;}
+                    else{
+                        map.put(name,field.get(object).toString());
+                    }
+                }
+                reulstList.add(map);
+            }
+        }
+        catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return reulstList;
+    }
+
 }
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index eae6c54..db01ce7 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -45,7 +45,7 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            password = "111111";
+            password = "1q2W3E4R";
         }
         Subject currentUser = ShiroKit.getSubject();
 

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 020351e..dfebbef 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -31,7 +31,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 6fe4560..5a4dab7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index fd9eb6b..001eacc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -28,7 +28,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index f00cf7b..3d604f5 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 630fd12..e659d85 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
index d5537eb..ae06ee2 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
@@ -6,12 +6,14 @@
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.config.DeviceApiProperties;
 import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto;
 import com.casic.missiles.modular.system.handler.DefaultHttpHeaderHandler;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.casic.missiles.modular.system.utils.HttpUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -204,4 +206,26 @@
         return result;
     }
 
+    public static List<Map<String,String>> convertObjectListToMap(List<Object> list){
+        List<Map<String,String>> reulstList = new ArrayList<Map<String,String>>();
+        try {
+            for (Object object : list) {
+                Map<String, String> map = new HashMap<String, String>();
+                for (Field field : object.getClass().getDeclaredFields()) {
+                    field.setAccessible(true);
+                    String name = field.getName();
+                    if(field.get(object) == null){continue;}
+                    else{
+                        map.put(name,field.get(object).toString());
+                    }
+                }
+                reulstList.add(map);
+            }
+        }
+        catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return reulstList;
+    }
+
 }
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index eae6c54..db01ce7 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -45,7 +45,7 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            password = "111111";
+            password = "1q2W3E4R";
         }
         Subject currentUser = ShiroKit.getSubject();
 
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 74aa4f2..22e1554 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell_gz?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:

diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml
index 9faa8c2..af416cb 100644
--- a/casic-alarm/pom.xml
+++ b/casic-alarm/pom.xml
@@ -99,6 +99,12 @@
             <version>${extension.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <resources>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index d0d09c4..154c7fe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -185,10 +185,8 @@
      */
     @RequestMapping(value = "/level/detail/{id}")
     @ResponseBody
-    public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) {
-        // 待定
-        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
-        AlarmLevel alarmLevel = alarmLevelService.selectByID(id, dataScope);
+    public Object selectAlarmLevel(@PathVariable(name = "id") Long id) {
+        AlarmLevel alarmLevel = alarmLevelService.selectByID(id);
         return ResponseData.success(alarmLevel);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 5119f2c..330be63 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -24,7 +24,7 @@
 
     AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
 
-    AlarmLevel selectByID(Long id, DataScope dataScope);
+    AlarmLevel selectByID(Long id);
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 94188bf..e24fccd 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -47,8 +47,8 @@
 
 
     @Override
-    public AlarmLevel selectByID(Long Id, DataScope dataScope) {
-        return this.baseMapper.selectByID(Id, dataScope);
+    public AlarmLevel selectByID(Long Id) {
+        return this.baseMapper.selectByID(Id);
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index 9828e15..dfc4bee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -20,7 +20,7 @@
     Map<String,Object> selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name);
     List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
     AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope);
+    AlarmLevel selectByID(@Param("id")Long Id);
     int deleteByCondition(@Param("deviceType")Long deviceType,
                           @Param("name")String name,
                           @Param("tenantId")Long tenantId);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
new file mode 100644
index 0000000..c4c55a7
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -0,0 +1,130 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class DeviceDataListController {
+    @Resource
+    private AbstractPermissionContext permissionService;
+    @Resource
+    private DeviceDataListService deviceDataListService;
+
+    //    @Permission
+    @GetMapping(value = "/welldata/list")
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCover> list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    //    @Permission
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataDig> mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/liquiddata/list")
+//    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataLiquid> list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(list);
+    }
+
+
+    @GetMapping(value = "/gasdata/list")
+    //@Permission
+    public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGas> deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(deviceDataExcelDtoList);
+    }
+
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataNoise> mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHarmfulGas> mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataTempHum> mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataWellCoverLoca> mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceDataExcelDto> mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DateTube> mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b3c1db9..f11ceb6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -39,7 +39,7 @@
     private AbstractPermissionContext permissionService;
 
 
-    @GetMapping(value = "/welldata/list")
+    @GetMapping(value = "/welldata/list-page")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
@@ -88,7 +88,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquiddata/list")
+    @GetMapping(value = "/liquiddata/list-page")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -136,7 +136,7 @@
         super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
-    @GetMapping(value = "/gasdata/list")
+    @GetMapping(value = "/gasdata/list-page")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -149,7 +149,7 @@
         return ResponseData.success(super.packForBT(page));
     }
 
-    @GetMapping(value = "/tubedata/list")
+    @GetMapping(value = "/tubedata/list-page")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
@@ -224,7 +224,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/harmfuldata/list")
+    @GetMapping(value = "/harmfuldata/list-page")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -267,7 +267,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/tempdata/list")
+    @GetMapping(value = "/tempdata/list-page")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -286,7 +286,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/temppressdata/list")
+    @GetMapping(value = "/temppressdata/list-page")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -358,7 +358,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/digdata/list")
+    @GetMapping(value = "/digdata/list-page")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -402,7 +402,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/welllocadata/list")
+    @GetMapping(value = "/welllocadata/list-page")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -446,7 +446,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/noisedata/list")
+    @GetMapping(value = "/noisedata/list-page")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -511,7 +511,7 @@
      * @param endTime
      * @return
      */
-    @GetMapping(value = "/liquidGasData/list")
+    @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -565,7 +565,7 @@
     /**
      * 数据列表查询
      */
-    @GetMapping(value = "/data/list")
+    @GetMapping(value = "/data/list-page")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isEmpty(watchType)) {
             return ResponseData.success("缺少监测类型参数，请重传");
@@ -578,7 +578,7 @@
     /**
      * 消防栓列表
      */
-    @GetMapping(value = "/hydrant/list")
+    @GetMapping(value = "/hydrant/list-page")
     public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index eabb8f9..931432e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -62,6 +62,7 @@
      * @return
      */
     List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 根据检索条件查询液位检测数据
      *
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index 020351e..dfebbef 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -31,7 +31,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 6fe4560..5a4dab7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index fd9eb6b..001eacc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -28,7 +28,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index f00cf7b..3d604f5 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index 630fd12..e659d85 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -27,7 +27,6 @@
     private String deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门编号")
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
index d5537eb..ae06ee2 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/util/Utility.java
@@ -6,12 +6,14 @@
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.config.DeviceApiProperties;
 import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto;
 import com.casic.missiles.modular.system.handler.DefaultHttpHeaderHandler;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.casic.missiles.modular.system.utils.HttpUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -204,4 +206,26 @@
         return result;
     }
 
+    public static List<Map<String,String>> convertObjectListToMap(List<Object> list){
+        List<Map<String,String>> reulstList = new ArrayList<Map<String,String>>();
+        try {
+            for (Object object : list) {
+                Map<String, String> map = new HashMap<String, String>();
+                for (Field field : object.getClass().getDeclaredFields()) {
+                    field.setAccessible(true);
+                    String name = field.getName();
+                    if(field.get(object) == null){continue;}
+                    else{
+                        map.put(name,field.get(object).toString());
+                    }
+                }
+                reulstList.add(map);
+            }
+        }
+        catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return reulstList;
+    }
+
 }
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index eae6c54..db01ce7 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -45,7 +45,7 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            password = "111111";
+            password = "1q2W3E4R";
         }
         Subject currentUser = ShiroKit.getSubject();
 
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 74aa4f2..22e1554 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell_gz?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index ce704d7..880d26f 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: postgre
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB