diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 21ffcec..f57bb8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -98,9 +98,8 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
-            List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
+        List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (ToolUtil.isNotEmpty(list)) {
             list.forEach(deviceCodeSelectDto -> {
                 deviceCodeSelectDto.setDeptName(permissionService.getDeptName(deviceCodeSelectDto.getDeptId()));
@@ -109,7 +108,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -131,8 +129,9 @@
     public Object model(String deviceType) {
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
-        if (ToolUtil.isNotEmpty(deviceType))
+        if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+        }
 
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
@@ -293,5 +292,15 @@
         return ResponseData.success();
     }
 
-
+    @ApiOperation("设备历史数据")
+    @RequestMapping(value = "/sevenDayData")
+    @ResponseBody
+    public Object sevenDayData(String devCode, String beginTime, String endTime) {
+        if (ToolUtil.isEmpty(devCode)) {
+            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
+        }
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page));
+        return new SuccessResponseData(super.packForBT(page));
+    }
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 21ffcec..f57bb8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -98,9 +98,8 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
-            List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
+        List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (ToolUtil.isNotEmpty(list)) {
             list.forEach(deviceCodeSelectDto -> {
                 deviceCodeSelectDto.setDeptName(permissionService.getDeptName(deviceCodeSelectDto.getDeptId()));
@@ -109,7 +108,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -131,8 +129,9 @@
     public Object model(String deviceType) {
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
-        if (ToolUtil.isNotEmpty(deviceType))
+        if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+        }
 
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
@@ -293,5 +292,15 @@
         return ResponseData.success();
     }
 
-
+    @ApiOperation("设备历史数据")
+    @RequestMapping(value = "/sevenDayData")
+    @ResponseBody
+    public Object sevenDayData(String devCode, String beginTime, String endTime) {
+        if (ToolUtil.isEmpty(devCode)) {
+            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
+        }
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page));
+        return new SuccessResponseData(super.packForBT(page));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 6773e07..74a144d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -6,11 +6,8 @@
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dto.DeviceDto;
-import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
 import com.casic.missiles.modular.system.service.IDeviceService;
-import com.sun.javafx.binding.StringFormatter;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 21ffcec..f57bb8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -98,9 +98,8 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
-            List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
+        List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (ToolUtil.isNotEmpty(list)) {
             list.forEach(deviceCodeSelectDto -> {
                 deviceCodeSelectDto.setDeptName(permissionService.getDeptName(deviceCodeSelectDto.getDeptId()));
@@ -109,7 +108,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -131,8 +129,9 @@
     public Object model(String deviceType) {
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
-        if (ToolUtil.isNotEmpty(deviceType))
+        if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+        }
 
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
@@ -293,5 +292,15 @@
         return ResponseData.success();
     }
 
-
+    @ApiOperation("设备历史数据")
+    @RequestMapping(value = "/sevenDayData")
+    @ResponseBody
+    public Object sevenDayData(String devCode, String beginTime, String endTime) {
+        if (ToolUtil.isEmpty(devCode)) {
+            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
+        }
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page));
+        return new SuccessResponseData(super.packForBT(page));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 6773e07..74a144d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -6,11 +6,8 @@
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dto.DeviceDto;
-import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
 import com.casic.missiles.modular.system.service.IDeviceService;
-import com.sun.javafx.binding.StringFormatter;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e0818ff..b2c7f29 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,11 +20,12 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
@@ -33,40 +34,45 @@
 
     List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    Map<String, Object> selectWaterMeterDay(@Param("devcode")String devcode, @Param("date")String date);
-    Map<String, Object> selectWaterMeterMonth(@Param("devcode")String devcode, @Param("month")String month);
-    Map<String, Object> selectWaterMeterYear(@Param("devcode")String devcode, @Param("year")String year);
-    Map<String, Object> selectLatestWaterMeter(@Param("devcode")String devcode);
+    Map<String, Object> selectWaterMeterDay(@Param("devcode") String devcode, @Param("date") String date);
+
+    Map<String, Object> selectWaterMeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    Map<String, Object> selectWaterMeterYear(@Param("devcode") String devcode, @Param("year") String year);
+
+    Map<String, Object> selectLatestWaterMeter(@Param("devcode") String devcode);
+
+    List<Map<String, Object>> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page<Map<String, Object>> page);
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 21ffcec..f57bb8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -98,9 +98,8 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
-            List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
+        List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (ToolUtil.isNotEmpty(list)) {
             list.forEach(deviceCodeSelectDto -> {
                 deviceCodeSelectDto.setDeptName(permissionService.getDeptName(deviceCodeSelectDto.getDeptId()));
@@ -109,7 +108,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -131,8 +129,9 @@
     public Object model(String deviceType) {
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
-        if (ToolUtil.isNotEmpty(deviceType))
+        if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+        }
 
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
@@ -293,5 +292,15 @@
         return ResponseData.success();
     }
 
-
+    @ApiOperation("设备历史数据")
+    @RequestMapping(value = "/sevenDayData")
+    @ResponseBody
+    public Object sevenDayData(String devCode, String beginTime, String endTime) {
+        if (ToolUtil.isEmpty(devCode)) {
+            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
+        }
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page));
+        return new SuccessResponseData(super.packForBT(page));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 6773e07..74a144d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -6,11 +6,8 @@
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dto.DeviceDto;
-import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
 import com.casic.missiles.modular.system.service.IDeviceService;
-import com.sun.javafx.binding.StringFormatter;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e0818ff..b2c7f29 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,11 +20,12 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
@@ -33,40 +34,45 @@
 
     List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    Map<String, Object> selectWaterMeterDay(@Param("devcode")String devcode, @Param("date")String date);
-    Map<String, Object> selectWaterMeterMonth(@Param("devcode")String devcode, @Param("month")String month);
-    Map<String, Object> selectWaterMeterYear(@Param("devcode")String devcode, @Param("year")String year);
-    Map<String, Object> selectLatestWaterMeter(@Param("devcode")String devcode);
+    Map<String, Object> selectWaterMeterDay(@Param("devcode") String devcode, @Param("date") String date);
+
+    Map<String, Object> selectWaterMeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    Map<String, Object> selectWaterMeterYear(@Param("devcode") String devcode, @Param("year") String year);
+
+    Map<String, Object> selectLatestWaterMeter(@Param("devcode") String devcode);
+
+    List<Map<String, Object>> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page<Map<String, Object>> page);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 122b143..e12776b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -20,21 +20,30 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+        (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+        (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
+        ID
+        AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="getArea" resultType="String"
@@ -108,16 +117,20 @@
         ORDER BY INSTALLDATE DESC
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
-        DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
-        to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
-        to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
             parameterType="com.baomidou.mybatisplus.plugins.Page">
@@ -200,21 +213,21 @@
 
     <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
         FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -239,7 +252,6 @@
     </select>
 
 
-
     <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dg.DEVCODE AS devcode ,
@@ -281,27 +293,26 @@
     </select>
 
 
-
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -327,22 +338,22 @@
 
     <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -367,7 +378,6 @@
     </select>
 
 
-
     <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dth.DEVCODE AS devcode,
@@ -410,25 +420,24 @@
     </select>
 
 
-
     <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -454,22 +463,22 @@
 
     <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -495,22 +504,22 @@
 
     <select id="selectNoiseDataScopePage" resultType="map">
         SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -578,10 +587,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -589,28 +598,42 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||
+        #{keywords}
+        ||
+        '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT('%',#{keywords},'%')
+        CONCAT
+        ('%',
+        #{keywords},
+        '%'
+        )
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
-        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{beginTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
     <sql id="endtime_sql">
-        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{endTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
 
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -653,7 +676,7 @@
         ORDER BY glview.UPTIME DESC
     </select>
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -921,23 +944,50 @@
     </select>
 
     <select id="selectWaterMeterDay" resultType="map">
-        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE from data_watermeter_day as dwd join device_view as dv on dv.DEVCODE = dwd.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwd.DATE = #{date}
+        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE
+        from data_watermeter_day as dwd
+                 join device_view as dv on dv.DEVCODE = dwd.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwd.DATE = #{date}
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
-        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH = #{month}
+        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH = #{month}
     </select>
 
     <select id="selectWaterMeterYear" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectLatestWaterMeter" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
+    <select id="selectDeviceData" resultType="map">
+        SELECT dwd.FLOW_ACC_DATE AS 'value',dwd.DATE AS 'time'
+        FROM data_watermeter_day AS dwd
+        WHERE dwd.DEVCODE = #{devCode}
+        <if test="beginTime != null and beginTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ >= ]]> #{beginTime}
+        </if>
+        <if test="endTime!= null and endTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
+        </if>
+    </select>
 </mapper>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 21ffcec..f57bb8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -98,9 +98,8 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
-            List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
+        List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (ToolUtil.isNotEmpty(list)) {
             list.forEach(deviceCodeSelectDto -> {
                 deviceCodeSelectDto.setDeptName(permissionService.getDeptName(deviceCodeSelectDto.getDeptId()));
@@ -109,7 +108,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -131,8 +129,9 @@
     public Object model(String deviceType) {
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
-        if (ToolUtil.isNotEmpty(deviceType))
+        if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+        }
 
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
@@ -293,5 +292,15 @@
         return ResponseData.success();
     }
 
-
+    @ApiOperation("设备历史数据")
+    @RequestMapping(value = "/sevenDayData")
+    @ResponseBody
+    public Object sevenDayData(String devCode, String beginTime, String endTime) {
+        if (ToolUtil.isEmpty(devCode)) {
+            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
+        }
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page));
+        return new SuccessResponseData(super.packForBT(page));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 6773e07..74a144d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -6,11 +6,8 @@
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dto.DeviceDto;
-import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
 import com.casic.missiles.modular.system.service.IDeviceService;
-import com.sun.javafx.binding.StringFormatter;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e0818ff..b2c7f29 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,11 +20,12 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
@@ -33,40 +34,45 @@
 
     List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    Map<String, Object> selectWaterMeterDay(@Param("devcode")String devcode, @Param("date")String date);
-    Map<String, Object> selectWaterMeterMonth(@Param("devcode")String devcode, @Param("month")String month);
-    Map<String, Object> selectWaterMeterYear(@Param("devcode")String devcode, @Param("year")String year);
-    Map<String, Object> selectLatestWaterMeter(@Param("devcode")String devcode);
+    Map<String, Object> selectWaterMeterDay(@Param("devcode") String devcode, @Param("date") String date);
+
+    Map<String, Object> selectWaterMeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    Map<String, Object> selectWaterMeterYear(@Param("devcode") String devcode, @Param("year") String year);
+
+    Map<String, Object> selectLatestWaterMeter(@Param("devcode") String devcode);
+
+    List<Map<String, Object>> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page<Map<String, Object>> page);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 122b143..e12776b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -20,21 +20,30 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+        (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+        (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
+        ID
+        AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="getArea" resultType="String"
@@ -108,16 +117,20 @@
         ORDER BY INSTALLDATE DESC
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
-        DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
-        to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
-        to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
             parameterType="com.baomidou.mybatisplus.plugins.Page">
@@ -200,21 +213,21 @@
 
     <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
         FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -239,7 +252,6 @@
     </select>
 
 
-
     <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dg.DEVCODE AS devcode ,
@@ -281,27 +293,26 @@
     </select>
 
 
-
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -327,22 +338,22 @@
 
     <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -367,7 +378,6 @@
     </select>
 
 
-
     <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dth.DEVCODE AS devcode,
@@ -410,25 +420,24 @@
     </select>
 
 
-
     <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -454,22 +463,22 @@
 
     <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -495,22 +504,22 @@
 
     <select id="selectNoiseDataScopePage" resultType="map">
         SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -578,10 +587,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -589,28 +598,42 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||
+        #{keywords}
+        ||
+        '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT('%',#{keywords},'%')
+        CONCAT
+        ('%',
+        #{keywords},
+        '%'
+        )
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
-        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{beginTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
     <sql id="endtime_sql">
-        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{endTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
 
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -653,7 +676,7 @@
         ORDER BY glview.UPTIME DESC
     </select>
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -921,23 +944,50 @@
     </select>
 
     <select id="selectWaterMeterDay" resultType="map">
-        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE from data_watermeter_day as dwd join device_view as dv on dv.DEVCODE = dwd.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwd.DATE = #{date}
+        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE
+        from data_watermeter_day as dwd
+                 join device_view as dv on dv.DEVCODE = dwd.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwd.DATE = #{date}
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
-        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH = #{month}
+        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH = #{month}
     </select>
 
     <select id="selectWaterMeterYear" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectLatestWaterMeter" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
+    <select id="selectDeviceData" resultType="map">
+        SELECT dwd.FLOW_ACC_DATE AS 'value',dwd.DATE AS 'time'
+        FROM data_watermeter_day AS dwd
+        WHERE dwd.DEVCODE = #{devCode}
+        <if test="beginTime != null and beginTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ >= ]]> #{beginTime}
+        </if>
+        <if test="endTime!= null and endTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index fc4e911..134f880 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -30,7 +30,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -76,42 +76,43 @@
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 管盯数据查询
      */
-    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询
      */
-    List<Map<String,Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温湿度数据查询
      */
-    List<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温度压力数据查询
      */
-    List<Map<String,Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
 
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String,Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 根据权属单位统计设备数及告警次数
@@ -128,8 +129,9 @@
 
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */
@@ -139,15 +141,30 @@
 
     String getAreaFullNameById(String area);
 
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
+    List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
-    Map<String,Object> selectWaterMeterDay(String devcode, String date);
-    Map<String,Object> selectWaterMeterMonth(String devcode, String month);
-    Map<String,Object> selectWaterMeterTotal(String devcode, String year);
-    Map<String,Object> selectLatestWaterMeter(String devcode);
+    Map<String, Object> selectWaterMeterDay(String devcode, String date);
+
+    Map<String, Object> selectWaterMeterMonth(String devcode, String month);
+
+    Map<String, Object> selectWaterMeterTotal(String devcode, String year);
+
+    Map<String, Object> selectLatestWaterMeter(String devcode);
+
+    /**
+     * 根据条件分页查询设备历史数据
+     *
+     * @param devCode   设备类型
+     * @param beginTime 设备安装开始时间
+     * @param endTime   设备安装结束时间
+     * @param page      分页
+     * @return {@link Map<String,Object>}
+     */
+    List<Map<String, Object>> selectDeviceData(String devCode, String beginTime, String endTime, Page<Map<String, Object>> page);
+
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 21ffcec..f57bb8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -98,9 +98,8 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
-            List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
+        List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (ToolUtil.isNotEmpty(list)) {
             list.forEach(deviceCodeSelectDto -> {
                 deviceCodeSelectDto.setDeptName(permissionService.getDeptName(deviceCodeSelectDto.getDeptId()));
@@ -109,7 +108,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -131,8 +129,9 @@
     public Object model(String deviceType) {
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
-        if (ToolUtil.isNotEmpty(deviceType))
+        if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+        }
 
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
@@ -293,5 +292,15 @@
         return ResponseData.success();
     }
 
-
+    @ApiOperation("设备历史数据")
+    @RequestMapping(value = "/sevenDayData")
+    @ResponseBody
+    public Object sevenDayData(String devCode, String beginTime, String endTime) {
+        if (ToolUtil.isEmpty(devCode)) {
+            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
+        }
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page));
+        return new SuccessResponseData(super.packForBT(page));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 6773e07..74a144d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -6,11 +6,8 @@
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dto.DeviceDto;
-import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
 import com.casic.missiles.modular.system.service.IDeviceService;
-import com.sun.javafx.binding.StringFormatter;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e0818ff..b2c7f29 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,11 +20,12 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
@@ -33,40 +34,45 @@
 
     List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    Map<String, Object> selectWaterMeterDay(@Param("devcode")String devcode, @Param("date")String date);
-    Map<String, Object> selectWaterMeterMonth(@Param("devcode")String devcode, @Param("month")String month);
-    Map<String, Object> selectWaterMeterYear(@Param("devcode")String devcode, @Param("year")String year);
-    Map<String, Object> selectLatestWaterMeter(@Param("devcode")String devcode);
+    Map<String, Object> selectWaterMeterDay(@Param("devcode") String devcode, @Param("date") String date);
+
+    Map<String, Object> selectWaterMeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    Map<String, Object> selectWaterMeterYear(@Param("devcode") String devcode, @Param("year") String year);
+
+    Map<String, Object> selectLatestWaterMeter(@Param("devcode") String devcode);
+
+    List<Map<String, Object>> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page<Map<String, Object>> page);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 122b143..e12776b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -20,21 +20,30 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+        (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+        (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
+        ID
+        AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="getArea" resultType="String"
@@ -108,16 +117,20 @@
         ORDER BY INSTALLDATE DESC
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
-        DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
-        to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
-        to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
             parameterType="com.baomidou.mybatisplus.plugins.Page">
@@ -200,21 +213,21 @@
 
     <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
         FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -239,7 +252,6 @@
     </select>
 
 
-
     <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dg.DEVCODE AS devcode ,
@@ -281,27 +293,26 @@
     </select>
 
 
-
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -327,22 +338,22 @@
 
     <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -367,7 +378,6 @@
     </select>
 
 
-
     <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dth.DEVCODE AS devcode,
@@ -410,25 +420,24 @@
     </select>
 
 
-
     <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -454,22 +463,22 @@
 
     <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -495,22 +504,22 @@
 
     <select id="selectNoiseDataScopePage" resultType="map">
         SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -578,10 +587,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -589,28 +598,42 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||
+        #{keywords}
+        ||
+        '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT('%',#{keywords},'%')
+        CONCAT
+        ('%',
+        #{keywords},
+        '%'
+        )
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
-        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{beginTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
     <sql id="endtime_sql">
-        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{endTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
 
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -653,7 +676,7 @@
         ORDER BY glview.UPTIME DESC
     </select>
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -921,23 +944,50 @@
     </select>
 
     <select id="selectWaterMeterDay" resultType="map">
-        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE from data_watermeter_day as dwd join device_view as dv on dv.DEVCODE = dwd.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwd.DATE = #{date}
+        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE
+        from data_watermeter_day as dwd
+                 join device_view as dv on dv.DEVCODE = dwd.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwd.DATE = #{date}
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
-        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH = #{month}
+        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH = #{month}
     </select>
 
     <select id="selectWaterMeterYear" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectLatestWaterMeter" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
+    <select id="selectDeviceData" resultType="map">
+        SELECT dwd.FLOW_ACC_DATE AS 'value',dwd.DATE AS 'time'
+        FROM data_watermeter_day AS dwd
+        WHERE dwd.DEVCODE = #{devCode}
+        <if test="beginTime != null and beginTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ >= ]]> #{beginTime}
+        </if>
+        <if test="endTime!= null and endTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index fc4e911..134f880 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -30,7 +30,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -76,42 +76,43 @@
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 管盯数据查询
      */
-    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询
      */
-    List<Map<String,Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温湿度数据查询
      */
-    List<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温度压力数据查询
      */
-    List<Map<String,Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
 
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String,Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 根据权属单位统计设备数及告警次数
@@ -128,8 +129,9 @@
 
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */
@@ -139,15 +141,30 @@
 
     String getAreaFullNameById(String area);
 
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
+    List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
-    Map<String,Object> selectWaterMeterDay(String devcode, String date);
-    Map<String,Object> selectWaterMeterMonth(String devcode, String month);
-    Map<String,Object> selectWaterMeterTotal(String devcode, String year);
-    Map<String,Object> selectLatestWaterMeter(String devcode);
+    Map<String, Object> selectWaterMeterDay(String devcode, String date);
+
+    Map<String, Object> selectWaterMeterMonth(String devcode, String month);
+
+    Map<String, Object> selectWaterMeterTotal(String devcode, String year);
+
+    Map<String, Object> selectLatestWaterMeter(String devcode);
+
+    /**
+     * 根据条件分页查询设备历史数据
+     *
+     * @param devCode   设备类型
+     * @param beginTime 设备安装开始时间
+     * @param endTime   设备安装结束时间
+     * @param page      分页
+     * @return {@link Map<String,Object>}
+     */
+    List<Map<String, Object>> selectDeviceData(String devCode, String beginTime, String endTime, Page<Map<String, Object>> page);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index fa39434..01bcbe3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -16,7 +16,6 @@
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -37,29 +36,32 @@
 @Service
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    @Autowired
-    private IDeviceTypeService deviceTypeService;
+    private final IDeviceTypeService deviceTypeService;
+    private final IDeviceModelsService deviceModelsService;
+    private final IDeviceConcentratorService deviceConcentratorService;
+    private final IDeviceWellService deviceWellService;
+    private final ICommonPermissionService permissionService;
+    private final Validator validator;
 
-    @Autowired
-    private IDeviceModelsService deviceModelsService;
-
-    @Autowired
-    private IDeviceConcentratorService deviceConcentratorService;
-
-    @Autowired
-    private IDeviceWellService deviceWellService;
-
-    @Autowired
-    private ICommonPermissionService permissionService;
-
-    @Autowired
-    private Validator validator;
+    public DeviceServiceImpl(IDeviceTypeService deviceTypeService,
+                             IDeviceModelsService deviceModelsService,
+                             IDeviceConcentratorService deviceConcentratorService,
+                             IDeviceWellService deviceWellService,
+                             ICommonPermissionService permissionService,
+                             Validator validator) {
+        this.deviceTypeService = deviceTypeService;
+        this.deviceModelsService = deviceModelsService;
+        this.deviceConcentratorService = deviceConcentratorService;
+        this.deviceWellService = deviceWellService;
+        this.permissionService = permissionService;
+        this.validator = validator;
+    }
 
     /**
      * 判断设备是否关联集中器
      *
      * @param entity 设备类型
-     * @return
+     * @return Boolean
      */
     private Boolean isAddConcentrator(Device entity) {
         DeviceModels deviceModels = deviceModelsService.selectById(entity.getModelId());
@@ -83,7 +85,7 @@
             throw gunsException;
         }
 
-        boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
+        boolean isAddConcentrator = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && isAddConcentrator(entity);
         //根据集中器编号查询集中器信息
         DeviceConcentratorDto concentratorDto = null;
         if (isAddConcentrator) {
@@ -136,8 +138,7 @@
             throw gunsException;
         }
         //判断设备是否不需要关联集中器
-        boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
-
+        boolean isAddConcentrator = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && isAddConcentrator(entity);
         if (isAddConcentrator) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("集中器编号不存在");
@@ -159,12 +160,11 @@
         } else {
             deviceConcentratorService.deleteByDeviceId(entity.getId());
         }
-
         return super.updateById(entity);
     }
 
     @Override
-    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) {
+    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId) {
         return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId);
     }
 
@@ -189,7 +189,6 @@
     @Transactional
     @Override
     public List<String> addDeviceBatch(List<Device> results) {
-
         BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
         Map<String, Boolean> isAddConcentrator = new HashMap<>();
         List<String> list = new ArrayList<>();
@@ -201,11 +200,7 @@
                 validator.validate(device, beanPropertyBindingResult);
                 if (beanPropertyBindingResult.hasErrors()) {
                     List<FieldError> errors = beanPropertyBindingResult.getFieldErrors();
-                    errors.forEach(error -> {
-                                list.add("第" + index[0] + "行 ，".concat(error.getDefaultMessage()));
-                                return;
-                            }
-                    );
+                    errors.forEach(error -> list.add("第" + index[0] + "行 ，".concat(error.getDefaultMessage())));
                     return;
                 }
 
@@ -216,7 +211,6 @@
                     return;
                 }
 
-
                 //设备型号校验
                 DeviceModels deviceModels = deviceModelsService.selectDeviceModelsBymodelName(device.getModelName());
                 if (ToolUtil.isEmpty(deviceModels)) {
@@ -228,7 +222,6 @@
                     return;
                 }
 
-
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     list.add("第" + index[0] + "行,编号不存在");
@@ -238,7 +231,7 @@
                 //如果非NB则判断集中器 即设备类型包含1
                 List<String> communis = Arrays.asList(deviceModels.getCommunication().split(","));
                 //优先判断设备类型配置
-                boolean isAdd = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : communis.contains(DeviceConst.YES);
+                boolean isAdd = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && communis.contains(DeviceConst.YES);
                 if (isAdd) {
                     DeviceConcentratorDto concentratorDto = this.selectDeviceConcentorByCode(device.getConcenCode());
                     isAddConcentrator.put(device.getDevcode(), true);
@@ -280,26 +273,26 @@
                 deviceWells.add(createDeviceWell(device.getId(), device.getWellId()));
 
                 //判断是否关联集中器
-                if (isAddConcentrator.get(device.getDevcode()))
+                if (isAddConcentrator.get(device.getDevcode())) {
                     deviceConcentrators.add(createConcentrator(device.getId(), device.getConcenId()));
+                }
             });
 
             //设备闸井关联表 设备集中器关联表
-            if (ToolUtil.isNotEmpty(deviceConcentrators))
+            if (ToolUtil.isNotEmpty(deviceConcentrators)) {
                 this.deviceConcentratorService.insertBatch(deviceConcentrators);
-            if (ToolUtil.isNotEmpty(deviceWells))
+            }
+            if (ToolUtil.isNotEmpty(deviceWells)) {
                 this.deviceWellService.insertBatch(deviceWells);
-
+            }
         } else {
             list.add("导入数据不能为空");
         }
-
         return list;
     }
 
     @Override
     public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
@@ -309,36 +302,37 @@
     }
 
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-    @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
@@ -346,36 +340,36 @@
 
     @Override
     public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
     public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
     public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
@@ -410,15 +404,14 @@
         SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid);
     }
 
+    @Override
     public String getAreaFullNameById(String area) {
         String fullName = this.baseMapper.getArea(area);
         String pid = this.baseMapper.getAreaPId(area);
-        if (pid.equals("0")) {
-            return fullName;
-        } else {
+        if (!pid.equals("0")) {
             fullName = getAreaFullNameById(pid) + "/" + fullName;
-            return fullName;
         }
+        return fullName;
     }
 
     /**
@@ -426,7 +419,7 @@
      *
      * @param deviceId
      * @param concenId
-     * @return
+     * @return {@link DeviceConcentrator}
      */
     private DeviceConcentrator createConcentrator(Long deviceId, Long concenId) {
         return new DeviceConcentrator(deviceId, concenId, 0, 1, new Date());
@@ -437,7 +430,7 @@
      *
      * @param deviceId
      * @param wellId
-     * @return
+     * @return {@link DeviceWell}
      */
     private DeviceWell createDeviceWell(Long deviceId, Long wellId) {
         return new DeviceWell(deviceId, wellId, new Date(), "1");
@@ -452,17 +445,17 @@
             deptIds.add(Long.valueOf(deptid));
         }
         List<Map<String, Object>> mapList = new ArrayList<>();
-        if("liquid".equals(sensorType)){
+        if ("liquid".equals(sensorType)) {
             mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        if("gas".equals(sensorType)){
+        if ("gas".equals(sensorType)) {
             mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         for (Map<String, Object> map : mapList) {
             map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
             setCompany(map);
             if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                float liquiddata = Float.parseFloat(String.valueOf(map.get("data")));
                 if (liquiddata <= 0) {
                     map.put("data", "正常水位");
                 }
@@ -516,29 +509,26 @@
 
     @Override
     public Map<String, Object> selectWaterMeterDay(String devcode, String date) {
-        Map<String, Object> map = this.baseMapper.selectWaterMeterDay(devcode, date);
-
-        return map;
+        return this.baseMapper.selectWaterMeterDay(devcode, date);
     }
 
     @Override
-    public Map<String,Object> selectWaterMeterMonth(String devcode, String month) {
-        Map<String, Object> map = this.baseMapper.selectWaterMeterMonth(devcode, month);
-
-        return map;
+    public Map<String, Object> selectWaterMeterMonth(String devcode, String month) {
+        return this.baseMapper.selectWaterMeterMonth(devcode, month);
     }
 
     @Override
-    public Map<String,Object> selectWaterMeterTotal(String devcode, String year){
-        Map<String, Object> map = this.baseMapper.selectWaterMeterYear(devcode, year);
-
-        return map;
+    public Map<String, Object> selectWaterMeterTotal(String devcode, String year) {
+        return this.baseMapper.selectWaterMeterYear(devcode, year);
     }
 
     @Override
-    public Map<String,Object> selectLatestWaterMeter(String devcode){
-        Map<String, Object> map = this.baseMapper.selectLatestWaterMeter(devcode);
+    public Map<String, Object> selectLatestWaterMeter(String devcode) {
+        return this.baseMapper.selectLatestWaterMeter(devcode);
+    }
 
-        return map;
+    @Override
+    public List<Map<String, Object>> selectDeviceData(String devCode, String beginTime, String endTime, Page<Map<String, Object>> page) {
+        return this.baseMapper.selectDeviceData(devCode, beginTime, endTime, page);
     }
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 21ffcec..f57bb8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -98,9 +98,8 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
-            List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
+        List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (ToolUtil.isNotEmpty(list)) {
             list.forEach(deviceCodeSelectDto -> {
                 deviceCodeSelectDto.setDeptName(permissionService.getDeptName(deviceCodeSelectDto.getDeptId()));
@@ -109,7 +108,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -131,8 +129,9 @@
     public Object model(String deviceType) {
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
-        if (ToolUtil.isNotEmpty(deviceType))
+        if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+        }
 
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
@@ -293,5 +292,15 @@
         return ResponseData.success();
     }
 
-
+    @ApiOperation("设备历史数据")
+    @RequestMapping(value = "/sevenDayData")
+    @ResponseBody
+    public Object sevenDayData(String devCode, String beginTime, String endTime) {
+        if (ToolUtil.isEmpty(devCode)) {
+            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
+        }
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page));
+        return new SuccessResponseData(super.packForBT(page));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 6773e07..74a144d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -6,11 +6,8 @@
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dto.DeviceDto;
-import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
 import com.casic.missiles.modular.system.service.IDeviceService;
-import com.sun.javafx.binding.StringFormatter;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e0818ff..b2c7f29 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,11 +20,12 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
@@ -33,40 +34,45 @@
 
     List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    Map<String, Object> selectWaterMeterDay(@Param("devcode")String devcode, @Param("date")String date);
-    Map<String, Object> selectWaterMeterMonth(@Param("devcode")String devcode, @Param("month")String month);
-    Map<String, Object> selectWaterMeterYear(@Param("devcode")String devcode, @Param("year")String year);
-    Map<String, Object> selectLatestWaterMeter(@Param("devcode")String devcode);
+    Map<String, Object> selectWaterMeterDay(@Param("devcode") String devcode, @Param("date") String date);
+
+    Map<String, Object> selectWaterMeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    Map<String, Object> selectWaterMeterYear(@Param("devcode") String devcode, @Param("year") String year);
+
+    Map<String, Object> selectLatestWaterMeter(@Param("devcode") String devcode);
+
+    List<Map<String, Object>> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page<Map<String, Object>> page);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 122b143..e12776b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -20,21 +20,30 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+        (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+        (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
+        ID
+        AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="getArea" resultType="String"
@@ -108,16 +117,20 @@
         ORDER BY INSTALLDATE DESC
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
-        DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
-        to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
-        to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
             parameterType="com.baomidou.mybatisplus.plugins.Page">
@@ -200,21 +213,21 @@
 
     <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
         FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -239,7 +252,6 @@
     </select>
 
 
-
     <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dg.DEVCODE AS devcode ,
@@ -281,27 +293,26 @@
     </select>
 
 
-
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -327,22 +338,22 @@
 
     <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -367,7 +378,6 @@
     </select>
 
 
-
     <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dth.DEVCODE AS devcode,
@@ -410,25 +420,24 @@
     </select>
 
 
-
     <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -454,22 +463,22 @@
 
     <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -495,22 +504,22 @@
 
     <select id="selectNoiseDataScopePage" resultType="map">
         SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -578,10 +587,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -589,28 +598,42 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||
+        #{keywords}
+        ||
+        '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT('%',#{keywords},'%')
+        CONCAT
+        ('%',
+        #{keywords},
+        '%'
+        )
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
-        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{beginTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
     <sql id="endtime_sql">
-        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{endTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
 
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -653,7 +676,7 @@
         ORDER BY glview.UPTIME DESC
     </select>
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -921,23 +944,50 @@
     </select>
 
     <select id="selectWaterMeterDay" resultType="map">
-        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE from data_watermeter_day as dwd join device_view as dv on dv.DEVCODE = dwd.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwd.DATE = #{date}
+        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE
+        from data_watermeter_day as dwd
+                 join device_view as dv on dv.DEVCODE = dwd.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwd.DATE = #{date}
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
-        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH = #{month}
+        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH = #{month}
     </select>
 
     <select id="selectWaterMeterYear" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectLatestWaterMeter" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
+    <select id="selectDeviceData" resultType="map">
+        SELECT dwd.FLOW_ACC_DATE AS 'value',dwd.DATE AS 'time'
+        FROM data_watermeter_day AS dwd
+        WHERE dwd.DEVCODE = #{devCode}
+        <if test="beginTime != null and beginTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ >= ]]> #{beginTime}
+        </if>
+        <if test="endTime!= null and endTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index fc4e911..134f880 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -30,7 +30,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -76,42 +76,43 @@
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 管盯数据查询
      */
-    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询
      */
-    List<Map<String,Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温湿度数据查询
      */
-    List<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温度压力数据查询
      */
-    List<Map<String,Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
 
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String,Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 根据权属单位统计设备数及告警次数
@@ -128,8 +129,9 @@
 
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */
@@ -139,15 +141,30 @@
 
     String getAreaFullNameById(String area);
 
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
+    List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
-    Map<String,Object> selectWaterMeterDay(String devcode, String date);
-    Map<String,Object> selectWaterMeterMonth(String devcode, String month);
-    Map<String,Object> selectWaterMeterTotal(String devcode, String year);
-    Map<String,Object> selectLatestWaterMeter(String devcode);
+    Map<String, Object> selectWaterMeterDay(String devcode, String date);
+
+    Map<String, Object> selectWaterMeterMonth(String devcode, String month);
+
+    Map<String, Object> selectWaterMeterTotal(String devcode, String year);
+
+    Map<String, Object> selectLatestWaterMeter(String devcode);
+
+    /**
+     * 根据条件分页查询设备历史数据
+     *
+     * @param devCode   设备类型
+     * @param beginTime 设备安装开始时间
+     * @param endTime   设备安装结束时间
+     * @param page      分页
+     * @return {@link Map<String,Object>}
+     */
+    List<Map<String, Object>> selectDeviceData(String devCode, String beginTime, String endTime, Page<Map<String, Object>> page);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index fa39434..01bcbe3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -16,7 +16,6 @@
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -37,29 +36,32 @@
 @Service
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    @Autowired
-    private IDeviceTypeService deviceTypeService;
+    private final IDeviceTypeService deviceTypeService;
+    private final IDeviceModelsService deviceModelsService;
+    private final IDeviceConcentratorService deviceConcentratorService;
+    private final IDeviceWellService deviceWellService;
+    private final ICommonPermissionService permissionService;
+    private final Validator validator;
 
-    @Autowired
-    private IDeviceModelsService deviceModelsService;
-
-    @Autowired
-    private IDeviceConcentratorService deviceConcentratorService;
-
-    @Autowired
-    private IDeviceWellService deviceWellService;
-
-    @Autowired
-    private ICommonPermissionService permissionService;
-
-    @Autowired
-    private Validator validator;
+    public DeviceServiceImpl(IDeviceTypeService deviceTypeService,
+                             IDeviceModelsService deviceModelsService,
+                             IDeviceConcentratorService deviceConcentratorService,
+                             IDeviceWellService deviceWellService,
+                             ICommonPermissionService permissionService,
+                             Validator validator) {
+        this.deviceTypeService = deviceTypeService;
+        this.deviceModelsService = deviceModelsService;
+        this.deviceConcentratorService = deviceConcentratorService;
+        this.deviceWellService = deviceWellService;
+        this.permissionService = permissionService;
+        this.validator = validator;
+    }
 
     /**
      * 判断设备是否关联集中器
      *
      * @param entity 设备类型
-     * @return
+     * @return Boolean
      */
     private Boolean isAddConcentrator(Device entity) {
         DeviceModels deviceModels = deviceModelsService.selectById(entity.getModelId());
@@ -83,7 +85,7 @@
             throw gunsException;
         }
 
-        boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
+        boolean isAddConcentrator = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && isAddConcentrator(entity);
         //根据集中器编号查询集中器信息
         DeviceConcentratorDto concentratorDto = null;
         if (isAddConcentrator) {
@@ -136,8 +138,7 @@
             throw gunsException;
         }
         //判断设备是否不需要关联集中器
-        boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
-
+        boolean isAddConcentrator = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && isAddConcentrator(entity);
         if (isAddConcentrator) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("集中器编号不存在");
@@ -159,12 +160,11 @@
         } else {
             deviceConcentratorService.deleteByDeviceId(entity.getId());
         }
-
         return super.updateById(entity);
     }
 
     @Override
-    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) {
+    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId) {
         return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId);
     }
 
@@ -189,7 +189,6 @@
     @Transactional
     @Override
     public List<String> addDeviceBatch(List<Device> results) {
-
         BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
         Map<String, Boolean> isAddConcentrator = new HashMap<>();
         List<String> list = new ArrayList<>();
@@ -201,11 +200,7 @@
                 validator.validate(device, beanPropertyBindingResult);
                 if (beanPropertyBindingResult.hasErrors()) {
                     List<FieldError> errors = beanPropertyBindingResult.getFieldErrors();
-                    errors.forEach(error -> {
-                                list.add("第" + index[0] + "行 ，".concat(error.getDefaultMessage()));
-                                return;
-                            }
-                    );
+                    errors.forEach(error -> list.add("第" + index[0] + "行 ，".concat(error.getDefaultMessage())));
                     return;
                 }
 
@@ -216,7 +211,6 @@
                     return;
                 }
 
-
                 //设备型号校验
                 DeviceModels deviceModels = deviceModelsService.selectDeviceModelsBymodelName(device.getModelName());
                 if (ToolUtil.isEmpty(deviceModels)) {
@@ -228,7 +222,6 @@
                     return;
                 }
 
-
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     list.add("第" + index[0] + "行,编号不存在");
@@ -238,7 +231,7 @@
                 //如果非NB则判断集中器 即设备类型包含1
                 List<String> communis = Arrays.asList(deviceModels.getCommunication().split(","));
                 //优先判断设备类型配置
-                boolean isAdd = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : communis.contains(DeviceConst.YES);
+                boolean isAdd = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && communis.contains(DeviceConst.YES);
                 if (isAdd) {
                     DeviceConcentratorDto concentratorDto = this.selectDeviceConcentorByCode(device.getConcenCode());
                     isAddConcentrator.put(device.getDevcode(), true);
@@ -280,26 +273,26 @@
                 deviceWells.add(createDeviceWell(device.getId(), device.getWellId()));
 
                 //判断是否关联集中器
-                if (isAddConcentrator.get(device.getDevcode()))
+                if (isAddConcentrator.get(device.getDevcode())) {
                     deviceConcentrators.add(createConcentrator(device.getId(), device.getConcenId()));
+                }
             });
 
             //设备闸井关联表 设备集中器关联表
-            if (ToolUtil.isNotEmpty(deviceConcentrators))
+            if (ToolUtil.isNotEmpty(deviceConcentrators)) {
                 this.deviceConcentratorService.insertBatch(deviceConcentrators);
-            if (ToolUtil.isNotEmpty(deviceWells))
+            }
+            if (ToolUtil.isNotEmpty(deviceWells)) {
                 this.deviceWellService.insertBatch(deviceWells);
-
+            }
         } else {
             list.add("导入数据不能为空");
         }
-
         return list;
     }
 
     @Override
     public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
@@ -309,36 +302,37 @@
     }
 
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-    @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
@@ -346,36 +340,36 @@
 
     @Override
     public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
     public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
     public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
@@ -410,15 +404,14 @@
         SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid);
     }
 
+    @Override
     public String getAreaFullNameById(String area) {
         String fullName = this.baseMapper.getArea(area);
         String pid = this.baseMapper.getAreaPId(area);
-        if (pid.equals("0")) {
-            return fullName;
-        } else {
+        if (!pid.equals("0")) {
             fullName = getAreaFullNameById(pid) + "/" + fullName;
-            return fullName;
         }
+        return fullName;
     }
 
     /**
@@ -426,7 +419,7 @@
      *
      * @param deviceId
      * @param concenId
-     * @return
+     * @return {@link DeviceConcentrator}
      */
     private DeviceConcentrator createConcentrator(Long deviceId, Long concenId) {
         return new DeviceConcentrator(deviceId, concenId, 0, 1, new Date());
@@ -437,7 +430,7 @@
      *
      * @param deviceId
      * @param wellId
-     * @return
+     * @return {@link DeviceWell}
      */
     private DeviceWell createDeviceWell(Long deviceId, Long wellId) {
         return new DeviceWell(deviceId, wellId, new Date(), "1");
@@ -452,17 +445,17 @@
             deptIds.add(Long.valueOf(deptid));
         }
         List<Map<String, Object>> mapList = new ArrayList<>();
-        if("liquid".equals(sensorType)){
+        if ("liquid".equals(sensorType)) {
             mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        if("gas".equals(sensorType)){
+        if ("gas".equals(sensorType)) {
             mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         for (Map<String, Object> map : mapList) {
             map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
             setCompany(map);
             if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                float liquiddata = Float.parseFloat(String.valueOf(map.get("data")));
                 if (liquiddata <= 0) {
                     map.put("data", "正常水位");
                 }
@@ -516,29 +509,26 @@
 
     @Override
     public Map<String, Object> selectWaterMeterDay(String devcode, String date) {
-        Map<String, Object> map = this.baseMapper.selectWaterMeterDay(devcode, date);
-
-        return map;
+        return this.baseMapper.selectWaterMeterDay(devcode, date);
     }
 
     @Override
-    public Map<String,Object> selectWaterMeterMonth(String devcode, String month) {
-        Map<String, Object> map = this.baseMapper.selectWaterMeterMonth(devcode, month);
-
-        return map;
+    public Map<String, Object> selectWaterMeterMonth(String devcode, String month) {
+        return this.baseMapper.selectWaterMeterMonth(devcode, month);
     }
 
     @Override
-    public Map<String,Object> selectWaterMeterTotal(String devcode, String year){
-        Map<String, Object> map = this.baseMapper.selectWaterMeterYear(devcode, year);
-
-        return map;
+    public Map<String, Object> selectWaterMeterTotal(String devcode, String year) {
+        return this.baseMapper.selectWaterMeterYear(devcode, year);
     }
 
     @Override
-    public Map<String,Object> selectLatestWaterMeter(String devcode){
-        Map<String, Object> map = this.baseMapper.selectLatestWaterMeter(devcode);
+    public Map<String, Object> selectLatestWaterMeter(String devcode) {
+        return this.baseMapper.selectLatestWaterMeter(devcode);
+    }
 
-        return map;
+    @Override
+    public List<Map<String, Object>> selectDeviceData(String devCode, String beginTime, String endTime, Page<Map<String, Object>> page) {
+        return this.baseMapper.selectDeviceData(devCode, beginTime, endTime, page);
     }
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
index 33dca81..8996b83 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
@@ -1,10 +1,7 @@
 package com.casic.missiles.modular.system.enmus;
 
 
-import com.casic.missiles.core.enums.ExportExcelEnum;
 import com.casic.missiles.core.enums.ExportExcelHeaderEnum;
-import com.casic.missiles.core.util.SpringContextHolder;
-import com.casic.missiles.modular.config.SluicewellServerProperties;
 import org.hswebframework.expands.office.excel.config.Header;
 
 import java.util.ArrayList;

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 21ffcec..f57bb8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -98,9 +98,8 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
-            List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
+        List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (ToolUtil.isNotEmpty(list)) {
             list.forEach(deviceCodeSelectDto -> {
                 deviceCodeSelectDto.setDeptName(permissionService.getDeptName(deviceCodeSelectDto.getDeptId()));
@@ -109,7 +108,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -131,8 +129,9 @@
     public Object model(String deviceType) {
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
-        if (ToolUtil.isNotEmpty(deviceType))
+        if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+        }
 
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
@@ -293,5 +292,15 @@
         return ResponseData.success();
     }
 
-
+    @ApiOperation("设备历史数据")
+    @RequestMapping(value = "/sevenDayData")
+    @ResponseBody
+    public Object sevenDayData(String devCode, String beginTime, String endTime) {
+        if (ToolUtil.isEmpty(devCode)) {
+            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
+        }
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page));
+        return new SuccessResponseData(super.packForBT(page));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 6773e07..74a144d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -6,11 +6,8 @@
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dto.DeviceDto;
-import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
 import com.casic.missiles.modular.system.service.IDeviceService;
-import com.sun.javafx.binding.StringFormatter;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e0818ff..b2c7f29 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,11 +20,12 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
@@ -33,40 +34,45 @@
 
     List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    Map<String, Object> selectWaterMeterDay(@Param("devcode")String devcode, @Param("date")String date);
-    Map<String, Object> selectWaterMeterMonth(@Param("devcode")String devcode, @Param("month")String month);
-    Map<String, Object> selectWaterMeterYear(@Param("devcode")String devcode, @Param("year")String year);
-    Map<String, Object> selectLatestWaterMeter(@Param("devcode")String devcode);
+    Map<String, Object> selectWaterMeterDay(@Param("devcode") String devcode, @Param("date") String date);
+
+    Map<String, Object> selectWaterMeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    Map<String, Object> selectWaterMeterYear(@Param("devcode") String devcode, @Param("year") String year);
+
+    Map<String, Object> selectLatestWaterMeter(@Param("devcode") String devcode);
+
+    List<Map<String, Object>> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page<Map<String, Object>> page);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 122b143..e12776b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -20,21 +20,30 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+        (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+        (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
+        ID
+        AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="getArea" resultType="String"
@@ -108,16 +117,20 @@
         ORDER BY INSTALLDATE DESC
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
-        DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
-        to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
-        to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
             parameterType="com.baomidou.mybatisplus.plugins.Page">
@@ -200,21 +213,21 @@
 
     <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
         FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -239,7 +252,6 @@
     </select>
 
 
-
     <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dg.DEVCODE AS devcode ,
@@ -281,27 +293,26 @@
     </select>
 
 
-
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -327,22 +338,22 @@
 
     <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -367,7 +378,6 @@
     </select>
 
 
-
     <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dth.DEVCODE AS devcode,
@@ -410,25 +420,24 @@
     </select>
 
 
-
     <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -454,22 +463,22 @@
 
     <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -495,22 +504,22 @@
 
     <select id="selectNoiseDataScopePage" resultType="map">
         SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -578,10 +587,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -589,28 +598,42 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||
+        #{keywords}
+        ||
+        '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT('%',#{keywords},'%')
+        CONCAT
+        ('%',
+        #{keywords},
+        '%'
+        )
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
-        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{beginTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
     <sql id="endtime_sql">
-        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{endTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
 
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -653,7 +676,7 @@
         ORDER BY glview.UPTIME DESC
     </select>
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -921,23 +944,50 @@
     </select>
 
     <select id="selectWaterMeterDay" resultType="map">
-        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE from data_watermeter_day as dwd join device_view as dv on dv.DEVCODE = dwd.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwd.DATE = #{date}
+        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE
+        from data_watermeter_day as dwd
+                 join device_view as dv on dv.DEVCODE = dwd.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwd.DATE = #{date}
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
-        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH = #{month}
+        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH = #{month}
     </select>
 
     <select id="selectWaterMeterYear" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectLatestWaterMeter" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
+    <select id="selectDeviceData" resultType="map">
+        SELECT dwd.FLOW_ACC_DATE AS 'value',dwd.DATE AS 'time'
+        FROM data_watermeter_day AS dwd
+        WHERE dwd.DEVCODE = #{devCode}
+        <if test="beginTime != null and beginTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ >= ]]> #{beginTime}
+        </if>
+        <if test="endTime!= null and endTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index fc4e911..134f880 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -30,7 +30,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -76,42 +76,43 @@
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 管盯数据查询
      */
-    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询
      */
-    List<Map<String,Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温湿度数据查询
      */
-    List<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温度压力数据查询
      */
-    List<Map<String,Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
 
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String,Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 根据权属单位统计设备数及告警次数
@@ -128,8 +129,9 @@
 
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */
@@ -139,15 +141,30 @@
 
     String getAreaFullNameById(String area);
 
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
+    List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
-    Map<String,Object> selectWaterMeterDay(String devcode, String date);
-    Map<String,Object> selectWaterMeterMonth(String devcode, String month);
-    Map<String,Object> selectWaterMeterTotal(String devcode, String year);
-    Map<String,Object> selectLatestWaterMeter(String devcode);
+    Map<String, Object> selectWaterMeterDay(String devcode, String date);
+
+    Map<String, Object> selectWaterMeterMonth(String devcode, String month);
+
+    Map<String, Object> selectWaterMeterTotal(String devcode, String year);
+
+    Map<String, Object> selectLatestWaterMeter(String devcode);
+
+    /**
+     * 根据条件分页查询设备历史数据
+     *
+     * @param devCode   设备类型
+     * @param beginTime 设备安装开始时间
+     * @param endTime   设备安装结束时间
+     * @param page      分页
+     * @return {@link Map<String,Object>}
+     */
+    List<Map<String, Object>> selectDeviceData(String devCode, String beginTime, String endTime, Page<Map<String, Object>> page);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index fa39434..01bcbe3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -16,7 +16,6 @@
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -37,29 +36,32 @@
 @Service
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    @Autowired
-    private IDeviceTypeService deviceTypeService;
+    private final IDeviceTypeService deviceTypeService;
+    private final IDeviceModelsService deviceModelsService;
+    private final IDeviceConcentratorService deviceConcentratorService;
+    private final IDeviceWellService deviceWellService;
+    private final ICommonPermissionService permissionService;
+    private final Validator validator;
 
-    @Autowired
-    private IDeviceModelsService deviceModelsService;
-
-    @Autowired
-    private IDeviceConcentratorService deviceConcentratorService;
-
-    @Autowired
-    private IDeviceWellService deviceWellService;
-
-    @Autowired
-    private ICommonPermissionService permissionService;
-
-    @Autowired
-    private Validator validator;
+    public DeviceServiceImpl(IDeviceTypeService deviceTypeService,
+                             IDeviceModelsService deviceModelsService,
+                             IDeviceConcentratorService deviceConcentratorService,
+                             IDeviceWellService deviceWellService,
+                             ICommonPermissionService permissionService,
+                             Validator validator) {
+        this.deviceTypeService = deviceTypeService;
+        this.deviceModelsService = deviceModelsService;
+        this.deviceConcentratorService = deviceConcentratorService;
+        this.deviceWellService = deviceWellService;
+        this.permissionService = permissionService;
+        this.validator = validator;
+    }
 
     /**
      * 判断设备是否关联集中器
      *
      * @param entity 设备类型
-     * @return
+     * @return Boolean
      */
     private Boolean isAddConcentrator(Device entity) {
         DeviceModels deviceModels = deviceModelsService.selectById(entity.getModelId());
@@ -83,7 +85,7 @@
             throw gunsException;
         }
 
-        boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
+        boolean isAddConcentrator = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && isAddConcentrator(entity);
         //根据集中器编号查询集中器信息
         DeviceConcentratorDto concentratorDto = null;
         if (isAddConcentrator) {
@@ -136,8 +138,7 @@
             throw gunsException;
         }
         //判断设备是否不需要关联集中器
-        boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
-
+        boolean isAddConcentrator = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && isAddConcentrator(entity);
         if (isAddConcentrator) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("集中器编号不存在");
@@ -159,12 +160,11 @@
         } else {
             deviceConcentratorService.deleteByDeviceId(entity.getId());
         }
-
         return super.updateById(entity);
     }
 
     @Override
-    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) {
+    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId) {
         return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId);
     }
 
@@ -189,7 +189,6 @@
     @Transactional
     @Override
     public List<String> addDeviceBatch(List<Device> results) {
-
         BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
         Map<String, Boolean> isAddConcentrator = new HashMap<>();
         List<String> list = new ArrayList<>();
@@ -201,11 +200,7 @@
                 validator.validate(device, beanPropertyBindingResult);
                 if (beanPropertyBindingResult.hasErrors()) {
                     List<FieldError> errors = beanPropertyBindingResult.getFieldErrors();
-                    errors.forEach(error -> {
-                                list.add("第" + index[0] + "行 ，".concat(error.getDefaultMessage()));
-                                return;
-                            }
-                    );
+                    errors.forEach(error -> list.add("第" + index[0] + "行 ，".concat(error.getDefaultMessage())));
                     return;
                 }
 
@@ -216,7 +211,6 @@
                     return;
                 }
 
-
                 //设备型号校验
                 DeviceModels deviceModels = deviceModelsService.selectDeviceModelsBymodelName(device.getModelName());
                 if (ToolUtil.isEmpty(deviceModels)) {
@@ -228,7 +222,6 @@
                     return;
                 }
 
-
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     list.add("第" + index[0] + "行,编号不存在");
@@ -238,7 +231,7 @@
                 //如果非NB则判断集中器 即设备类型包含1
                 List<String> communis = Arrays.asList(deviceModels.getCommunication().split(","));
                 //优先判断设备类型配置
-                boolean isAdd = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : communis.contains(DeviceConst.YES);
+                boolean isAdd = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && communis.contains(DeviceConst.YES);
                 if (isAdd) {
                     DeviceConcentratorDto concentratorDto = this.selectDeviceConcentorByCode(device.getConcenCode());
                     isAddConcentrator.put(device.getDevcode(), true);
@@ -280,26 +273,26 @@
                 deviceWells.add(createDeviceWell(device.getId(), device.getWellId()));
 
                 //判断是否关联集中器
-                if (isAddConcentrator.get(device.getDevcode()))
+                if (isAddConcentrator.get(device.getDevcode())) {
                     deviceConcentrators.add(createConcentrator(device.getId(), device.getConcenId()));
+                }
             });
 
             //设备闸井关联表 设备集中器关联表
-            if (ToolUtil.isNotEmpty(deviceConcentrators))
+            if (ToolUtil.isNotEmpty(deviceConcentrators)) {
                 this.deviceConcentratorService.insertBatch(deviceConcentrators);
-            if (ToolUtil.isNotEmpty(deviceWells))
+            }
+            if (ToolUtil.isNotEmpty(deviceWells)) {
                 this.deviceWellService.insertBatch(deviceWells);
-
+            }
         } else {
             list.add("导入数据不能为空");
         }
-
         return list;
     }
 
     @Override
     public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
@@ -309,36 +302,37 @@
     }
 
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-    @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
@@ -346,36 +340,36 @@
 
     @Override
     public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
     public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
     public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
@@ -410,15 +404,14 @@
         SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid);
     }
 
+    @Override
     public String getAreaFullNameById(String area) {
         String fullName = this.baseMapper.getArea(area);
         String pid = this.baseMapper.getAreaPId(area);
-        if (pid.equals("0")) {
-            return fullName;
-        } else {
+        if (!pid.equals("0")) {
             fullName = getAreaFullNameById(pid) + "/" + fullName;
-            return fullName;
         }
+        return fullName;
     }
 
     /**
@@ -426,7 +419,7 @@
      *
      * @param deviceId
      * @param concenId
-     * @return
+     * @return {@link DeviceConcentrator}
      */
     private DeviceConcentrator createConcentrator(Long deviceId, Long concenId) {
         return new DeviceConcentrator(deviceId, concenId, 0, 1, new Date());
@@ -437,7 +430,7 @@
      *
      * @param deviceId
      * @param wellId
-     * @return
+     * @return {@link DeviceWell}
      */
     private DeviceWell createDeviceWell(Long deviceId, Long wellId) {
         return new DeviceWell(deviceId, wellId, new Date(), "1");
@@ -452,17 +445,17 @@
             deptIds.add(Long.valueOf(deptid));
         }
         List<Map<String, Object>> mapList = new ArrayList<>();
-        if("liquid".equals(sensorType)){
+        if ("liquid".equals(sensorType)) {
             mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        if("gas".equals(sensorType)){
+        if ("gas".equals(sensorType)) {
             mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         for (Map<String, Object> map : mapList) {
             map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
             setCompany(map);
             if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                float liquiddata = Float.parseFloat(String.valueOf(map.get("data")));
                 if (liquiddata <= 0) {
                     map.put("data", "正常水位");
                 }
@@ -516,29 +509,26 @@
 
     @Override
     public Map<String, Object> selectWaterMeterDay(String devcode, String date) {
-        Map<String, Object> map = this.baseMapper.selectWaterMeterDay(devcode, date);
-
-        return map;
+        return this.baseMapper.selectWaterMeterDay(devcode, date);
     }
 
     @Override
-    public Map<String,Object> selectWaterMeterMonth(String devcode, String month) {
-        Map<String, Object> map = this.baseMapper.selectWaterMeterMonth(devcode, month);
-
-        return map;
+    public Map<String, Object> selectWaterMeterMonth(String devcode, String month) {
+        return this.baseMapper.selectWaterMeterMonth(devcode, month);
     }
 
     @Override
-    public Map<String,Object> selectWaterMeterTotal(String devcode, String year){
-        Map<String, Object> map = this.baseMapper.selectWaterMeterYear(devcode, year);
-
-        return map;
+    public Map<String, Object> selectWaterMeterTotal(String devcode, String year) {
+        return this.baseMapper.selectWaterMeterYear(devcode, year);
     }
 
     @Override
-    public Map<String,Object> selectLatestWaterMeter(String devcode){
-        Map<String, Object> map = this.baseMapper.selectLatestWaterMeter(devcode);
+    public Map<String, Object> selectLatestWaterMeter(String devcode) {
+        return this.baseMapper.selectLatestWaterMeter(devcode);
+    }
 
-        return map;
+    @Override
+    public List<Map<String, Object>> selectDeviceData(String devCode, String beginTime, String endTime, Page<Map<String, Object>> page) {
+        return this.baseMapper.selectDeviceData(devCode, beginTime, endTime, page);
     }
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
index 33dca81..8996b83 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
@@ -1,10 +1,7 @@
 package com.casic.missiles.modular.system.enmus;
 
 
-import com.casic.missiles.core.enums.ExportExcelEnum;
 import com.casic.missiles.core.enums.ExportExcelHeaderEnum;
-import com.casic.missiles.core.util.SpringContextHolder;
-import com.casic.missiles.modular.config.SluicewellServerProperties;
 import org.hswebframework.expands.office.excel.config.Header;
 
 import java.util.ArrayList;
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index f249d8b..ba94905 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -1,22 +1,21 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.util.SpringContextHolder;
-import com.casic.missiles.modular.config.SluicewellProperties;
-import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
-import com.casic.missiles.modular.system.enmus.TemphumBusiness;
-import com.casic.missiles.modular.system.dto.*;
-import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.util.SpringContextHolder;
 import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.config.SluicewellProperties;
+import com.casic.missiles.modular.system.constant.BusWellConst;
 import com.casic.missiles.modular.system.dao.BusWellInfoMapper;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
+import com.casic.missiles.modular.system.enmus.TemphumBusiness;
+import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.util.Utility;
-import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +29,10 @@
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -60,6 +62,7 @@
     }
 
     @Transactional
+    @Override
     public List<BusWellInfo> selectDataScopePage(DataScope dataScope, Page<BusWellInfo> page, String keywords, String wellType, String deptid, String bfzt, String areaId) {
         List<BusWellInfo> list = this.baseMapper.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId);
         list.forEach(well -> {
@@ -69,7 +72,7 @@
         return list;
     }
 
-
+    @Override
     public List<WatchDataDto> getWatchDatas(Long id) {
 
         List<DeviceInWellInfo> deviceInWellInfos = this.baseMapper.getDeviceInWellInfo(id);
@@ -404,7 +407,7 @@
         return deviceDataDtoList;
     }
 
-
+    @Override
     public BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp) {
         return this.baseMapper.bfztCountData(deptIds, isApp);
     }
@@ -419,10 +422,12 @@
         return this.baseMapper.getBatchExportData(dataScope, page, deviceType, deptid, keywords);
     }
 
+    @Override
     public Integer getDeviceCountData(Long id) {
         return this.baseMapper.deviceCountData(id);
     }
 
+    @Override
     public String getDeptNameData(String deptid) {
         return this.baseMapper.deptNameData(deptid);
     }
@@ -438,6 +443,7 @@
         }
     }
 
+    @Override
     public List<Long> deleteBatchByIds(List<Long> ids) {
 
         List<Long> lists = new ArrayList<>();
@@ -570,11 +576,13 @@
         return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
     }
 
+    @Override
     public String getAreaPid(String id) {
         return this.baseMapper.getAreaPId(id);
     }
 
     @Transactional
+    @Override
     public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List<Long> deptIds) {
 
         this.baseMapper.updateBatchBfcf(keywords, wellType, deptid, bfzt, deptIds);

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 21ffcec..f57bb8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -98,9 +98,8 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
-            List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
+        List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (ToolUtil.isNotEmpty(list)) {
             list.forEach(deviceCodeSelectDto -> {
                 deviceCodeSelectDto.setDeptName(permissionService.getDeptName(deviceCodeSelectDto.getDeptId()));
@@ -109,7 +108,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -131,8 +129,9 @@
     public Object model(String deviceType) {
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
-        if (ToolUtil.isNotEmpty(deviceType))
+        if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+        }
 
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
@@ -293,5 +292,15 @@
         return ResponseData.success();
     }
 
-
+    @ApiOperation("设备历史数据")
+    @RequestMapping(value = "/sevenDayData")
+    @ResponseBody
+    public Object sevenDayData(String devCode, String beginTime, String endTime) {
+        if (ToolUtil.isEmpty(devCode)) {
+            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
+        }
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page));
+        return new SuccessResponseData(super.packForBT(page));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 6773e07..74a144d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -6,11 +6,8 @@
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dto.DeviceDto;
-import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
 import com.casic.missiles.modular.system.service.IDeviceService;
-import com.sun.javafx.binding.StringFormatter;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e0818ff..b2c7f29 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,11 +20,12 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
@@ -33,40 +34,45 @@
 
     List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    Map<String, Object> selectWaterMeterDay(@Param("devcode")String devcode, @Param("date")String date);
-    Map<String, Object> selectWaterMeterMonth(@Param("devcode")String devcode, @Param("month")String month);
-    Map<String, Object> selectWaterMeterYear(@Param("devcode")String devcode, @Param("year")String year);
-    Map<String, Object> selectLatestWaterMeter(@Param("devcode")String devcode);
+    Map<String, Object> selectWaterMeterDay(@Param("devcode") String devcode, @Param("date") String date);
+
+    Map<String, Object> selectWaterMeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    Map<String, Object> selectWaterMeterYear(@Param("devcode") String devcode, @Param("year") String year);
+
+    Map<String, Object> selectLatestWaterMeter(@Param("devcode") String devcode);
+
+    List<Map<String, Object>> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page<Map<String, Object>> page);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 122b143..e12776b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -20,21 +20,30 @@
         as INSTALLDATE
     </sql>
     <sql id="installdate_toChar" databaseId="mysql">
-        DATE_FORMAT(INSTALLDATE,'%Y-%m-%d')
+        DATE_FORMAT
+        (INSTALLDATE,'%Y-%m-%d')
     </sql>
     <sql id="installdate_toChar" databaseId="oracle">
-        to_char(INSTALLDATE,'yyyy-MM-dd')
+        to_char
+        (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
+        ID
+        AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version
     </sql>
     <select id="selectWellIdByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
-        SELECT id as wellId,WELL_CODE as WELLCODE,DEPTID FROM bus_well_info WHERE VALID = '1' AND WELL_CODE = #{wellCode}
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
-        SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode}
+        SELECT id, CONCENCODE
+        FROM bus_concentrator
+        WHERE VALID = '1'
+          AND CONCENCODE = #{concenCode}
     </select>
 
     <select id="getArea" resultType="String"
@@ -108,16 +117,20 @@
         ORDER BY INSTALLDATE DESC
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
-        DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
-        to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="mysql">
-        DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
+        DATE_FORMAT
+        (UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
-        to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
+        to_char
+        (UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
             parameterType="com.baomidou.mybatisplus.plugins.Page">
@@ -200,21 +213,21 @@
 
     <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
         FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -239,7 +252,6 @@
     </select>
 
 
-
     <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dg.DEVCODE AS devcode ,
@@ -281,27 +293,26 @@
     </select>
 
 
-
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -327,22 +338,22 @@
 
     <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -367,7 +378,6 @@
     </select>
 
 
-
     <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
         dth.DEVCODE AS devcode,
@@ -410,25 +420,24 @@
     </select>
 
 
-
     <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -454,22 +463,22 @@
 
     <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -495,22 +504,22 @@
 
     <select id="selectNoiseDataScopePage" resultType="map">
         SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="deptid != null and deptid !=''">
@@ -578,10 +587,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -589,28 +598,42 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        '%' ||
+        #{keywords}
+        ||
+        '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT('%',#{keywords},'%')
+        CONCAT
+        ('%',
+        #{keywords},
+        '%'
+        )
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
-        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{beginTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
     <sql id="endtime_sql">
-        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+        TO_DATE
+        (
+        #{endTime},
+        'yyyy-mm-dd hh24:mi:ss'
+        )
     </sql>
 
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
     <sql id="begintime_sql" databaseId="mysql">
-       #{beginTime}
+        #{beginTime}
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -653,7 +676,7 @@
         ORDER BY glview.UPTIME DESC
     </select>
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="map">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -921,23 +944,50 @@
     </select>
 
     <select id="selectWaterMeterDay" resultType="map">
-        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE from data_watermeter_day as dwd join device_view as dv on dv.DEVCODE = dwd.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwd.DATE = #{date}
+        SELECT dwd.DEVCODE, dwD.DATE, dwd.FLOW_ACC_DATE
+        from data_watermeter_day as dwd
+                 join device_view as dv on dv.DEVCODE = dwd.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwd.DATE = #{date}
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
-        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH = #{month}
+        SELECT dwm.DEVCODE, dwm.MONTH, dwm.FLOW_ACC_MONTH
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH = #{month}
     </select>
 
     <select id="selectWaterMeterYear" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectLatestWaterMeter" resultType="map">
-        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL from data_watermeter_month as dwm join device_view as dv on dv.DEVCODE = dwm.DEVCODE
-        WHERE dv.VALID  = '1' AND dv.DEVCODE = #{devcode} AND dwm.MONTH LIKE CONCAT(#{year}, '%')
+        SELECT dwm.DEVCODE, sum(dwm.FLOW_ACC_MONTH) as FLOW_ACC_TOTAL
+        from data_watermeter_month as dwm
+                 join device_view as dv on dv.DEVCODE = dwm.DEVCODE
+        WHERE dv.VALID = '1'
+          AND dv.DEVCODE = #{devcode}
+          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
+    <select id="selectDeviceData" resultType="map">
+        SELECT dwd.FLOW_ACC_DATE AS 'value',dwd.DATE AS 'time'
+        FROM data_watermeter_day AS dwd
+        WHERE dwd.DEVCODE = #{devCode}
+        <if test="beginTime != null and beginTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ >= ]]> #{beginTime}
+        </if>
+        <if test="endTime!= null and endTime !=''">
+            AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index fc4e911..134f880 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -30,7 +30,7 @@
      * @param endTime    设备安装结束时间
      * @return 设备列表
      */
-    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId);
+    List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId);
 
     /**
      * 根据闸井编号查询闸井ID
@@ -76,42 +76,43 @@
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+
     /**
      * 管盯数据查询
      */
-    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询
      */
-    List<Map<String,Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温湿度数据查询
      */
-    List<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 温度压力数据查询
      */
-    List<Map<String,Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
 
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String,Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 根据权属单位统计设备数及告警次数
@@ -128,8 +129,9 @@
 
     /**
      * 根据设备配置状态获取设备选择列表
-     * @param dataScope 数据权限
-     * @param deviceType 设备类型
+     *
+     * @param dataScope    数据权限
+     * @param deviceType   设备类型
      * @param configStatus 配置状态
      * @return
      */
@@ -139,15 +141,30 @@
 
     String getAreaFullNameById(String area);
 
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
+    List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     /**
      * 燃气数据查询
      */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
-    Map<String,Object> selectWaterMeterDay(String devcode, String date);
-    Map<String,Object> selectWaterMeterMonth(String devcode, String month);
-    Map<String,Object> selectWaterMeterTotal(String devcode, String year);
-    Map<String,Object> selectLatestWaterMeter(String devcode);
+    Map<String, Object> selectWaterMeterDay(String devcode, String date);
+
+    Map<String, Object> selectWaterMeterMonth(String devcode, String month);
+
+    Map<String, Object> selectWaterMeterTotal(String devcode, String year);
+
+    Map<String, Object> selectLatestWaterMeter(String devcode);
+
+    /**
+     * 根据条件分页查询设备历史数据
+     *
+     * @param devCode   设备类型
+     * @param beginTime 设备安装开始时间
+     * @param endTime   设备安装结束时间
+     * @param page      分页
+     * @return {@link Map<String,Object>}
+     */
+    List<Map<String, Object>> selectDeviceData(String devCode, String beginTime, String endTime, Page<Map<String, Object>> page);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index fa39434..01bcbe3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -16,7 +16,6 @@
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -37,29 +36,32 @@
 @Service
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
-    @Autowired
-    private IDeviceTypeService deviceTypeService;
+    private final IDeviceTypeService deviceTypeService;
+    private final IDeviceModelsService deviceModelsService;
+    private final IDeviceConcentratorService deviceConcentratorService;
+    private final IDeviceWellService deviceWellService;
+    private final ICommonPermissionService permissionService;
+    private final Validator validator;
 
-    @Autowired
-    private IDeviceModelsService deviceModelsService;
-
-    @Autowired
-    private IDeviceConcentratorService deviceConcentratorService;
-
-    @Autowired
-    private IDeviceWellService deviceWellService;
-
-    @Autowired
-    private ICommonPermissionService permissionService;
-
-    @Autowired
-    private Validator validator;
+    public DeviceServiceImpl(IDeviceTypeService deviceTypeService,
+                             IDeviceModelsService deviceModelsService,
+                             IDeviceConcentratorService deviceConcentratorService,
+                             IDeviceWellService deviceWellService,
+                             ICommonPermissionService permissionService,
+                             Validator validator) {
+        this.deviceTypeService = deviceTypeService;
+        this.deviceModelsService = deviceModelsService;
+        this.deviceConcentratorService = deviceConcentratorService;
+        this.deviceWellService = deviceWellService;
+        this.permissionService = permissionService;
+        this.validator = validator;
+    }
 
     /**
      * 判断设备是否关联集中器
      *
      * @param entity 设备类型
-     * @return
+     * @return Boolean
      */
     private Boolean isAddConcentrator(Device entity) {
         DeviceModels deviceModels = deviceModelsService.selectById(entity.getModelId());
@@ -83,7 +85,7 @@
             throw gunsException;
         }
 
-        boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
+        boolean isAddConcentrator = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && isAddConcentrator(entity);
         //根据集中器编号查询集中器信息
         DeviceConcentratorDto concentratorDto = null;
         if (isAddConcentrator) {
@@ -136,8 +138,7 @@
             throw gunsException;
         }
         //判断设备是否不需要关联集中器
-        boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
-
+        boolean isAddConcentrator = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && isAddConcentrator(entity);
         if (isAddConcentrator) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("集中器编号不存在");
@@ -159,12 +160,11 @@
         } else {
             deviceConcentratorService.deleteByDeviceId(entity.getId());
         }
-
         return super.updateById(entity);
     }
 
     @Override
-    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) {
+    public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId) {
         return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId);
     }
 
@@ -189,7 +189,6 @@
     @Transactional
     @Override
     public List<String> addDeviceBatch(List<Device> results) {
-
         BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
         Map<String, Boolean> isAddConcentrator = new HashMap<>();
         List<String> list = new ArrayList<>();
@@ -201,11 +200,7 @@
                 validator.validate(device, beanPropertyBindingResult);
                 if (beanPropertyBindingResult.hasErrors()) {
                     List<FieldError> errors = beanPropertyBindingResult.getFieldErrors();
-                    errors.forEach(error -> {
-                                list.add("第" + index[0] + "行 ，".concat(error.getDefaultMessage()));
-                                return;
-                            }
-                    );
+                    errors.forEach(error -> list.add("第" + index[0] + "行 ，".concat(error.getDefaultMessage())));
                     return;
                 }
 
@@ -216,7 +211,6 @@
                     return;
                 }
 
-
                 //设备型号校验
                 DeviceModels deviceModels = deviceModelsService.selectDeviceModelsBymodelName(device.getModelName());
                 if (ToolUtil.isEmpty(deviceModels)) {
@@ -228,7 +222,6 @@
                     return;
                 }
 
-
                 DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     list.add("第" + index[0] + "行,编号不存在");
@@ -238,7 +231,7 @@
                 //如果非NB则判断集中器 即设备类型包含1
                 List<String> communis = Arrays.asList(deviceModels.getCommunication().split(","));
                 //优先判断设备类型配置
-                boolean isAdd = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : communis.contains(DeviceConst.YES);
+                boolean isAdd = !DeviceConst.YES.equals(deviceType.getIsNoConcent()) && communis.contains(DeviceConst.YES);
                 if (isAdd) {
                     DeviceConcentratorDto concentratorDto = this.selectDeviceConcentorByCode(device.getConcenCode());
                     isAddConcentrator.put(device.getDevcode(), true);
@@ -280,26 +273,26 @@
                 deviceWells.add(createDeviceWell(device.getId(), device.getWellId()));
 
                 //判断是否关联集中器
-                if (isAddConcentrator.get(device.getDevcode()))
+                if (isAddConcentrator.get(device.getDevcode())) {
                     deviceConcentrators.add(createConcentrator(device.getId(), device.getConcenId()));
+                }
             });
 
             //设备闸井关联表 设备集中器关联表
-            if (ToolUtil.isNotEmpty(deviceConcentrators))
+            if (ToolUtil.isNotEmpty(deviceConcentrators)) {
                 this.deviceConcentratorService.insertBatch(deviceConcentrators);
-            if (ToolUtil.isNotEmpty(deviceWells))
+            }
+            if (ToolUtil.isNotEmpty(deviceWells)) {
                 this.deviceWellService.insertBatch(deviceWells);
-
+            }
         } else {
             list.add("导入数据不能为空");
         }
-
         return list;
     }
 
     @Override
     public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
@@ -309,36 +302,37 @@
     }
 
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-    @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
@@ -346,36 +340,36 @@
 
     @Override
     public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
     public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
 
     @Override
     public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         for (Map<String, Object> map : mapList) {
-            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+            map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
         }
         return mapList;
     }
@@ -410,15 +404,14 @@
         SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid);
     }
 
+    @Override
     public String getAreaFullNameById(String area) {
         String fullName = this.baseMapper.getArea(area);
         String pid = this.baseMapper.getAreaPId(area);
-        if (pid.equals("0")) {
-            return fullName;
-        } else {
+        if (!pid.equals("0")) {
             fullName = getAreaFullNameById(pid) + "/" + fullName;
-            return fullName;
         }
+        return fullName;
     }
 
     /**
@@ -426,7 +419,7 @@
      *
      * @param deviceId
      * @param concenId
-     * @return
+     * @return {@link DeviceConcentrator}
      */
     private DeviceConcentrator createConcentrator(Long deviceId, Long concenId) {
         return new DeviceConcentrator(deviceId, concenId, 0, 1, new Date());
@@ -437,7 +430,7 @@
      *
      * @param deviceId
      * @param wellId
-     * @return
+     * @return {@link DeviceWell}
      */
     private DeviceWell createDeviceWell(Long deviceId, Long wellId) {
         return new DeviceWell(deviceId, wellId, new Date(), "1");
@@ -452,17 +445,17 @@
             deptIds.add(Long.valueOf(deptid));
         }
         List<Map<String, Object>> mapList = new ArrayList<>();
-        if("liquid".equals(sensorType)){
+        if ("liquid".equals(sensorType)) {
             mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        if("gas".equals(sensorType)){
+        if ("gas".equals(sensorType)) {
             mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         for (Map<String, Object> map : mapList) {
             map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
             setCompany(map);
             if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                float liquiddata = Float.parseFloat(String.valueOf(map.get("data")));
                 if (liquiddata <= 0) {
                     map.put("data", "正常水位");
                 }
@@ -516,29 +509,26 @@
 
     @Override
     public Map<String, Object> selectWaterMeterDay(String devcode, String date) {
-        Map<String, Object> map = this.baseMapper.selectWaterMeterDay(devcode, date);
-
-        return map;
+        return this.baseMapper.selectWaterMeterDay(devcode, date);
     }
 
     @Override
-    public Map<String,Object> selectWaterMeterMonth(String devcode, String month) {
-        Map<String, Object> map = this.baseMapper.selectWaterMeterMonth(devcode, month);
-
-        return map;
+    public Map<String, Object> selectWaterMeterMonth(String devcode, String month) {
+        return this.baseMapper.selectWaterMeterMonth(devcode, month);
     }
 
     @Override
-    public Map<String,Object> selectWaterMeterTotal(String devcode, String year){
-        Map<String, Object> map = this.baseMapper.selectWaterMeterYear(devcode, year);
-
-        return map;
+    public Map<String, Object> selectWaterMeterTotal(String devcode, String year) {
+        return this.baseMapper.selectWaterMeterYear(devcode, year);
     }
 
     @Override
-    public Map<String,Object> selectLatestWaterMeter(String devcode){
-        Map<String, Object> map = this.baseMapper.selectLatestWaterMeter(devcode);
+    public Map<String, Object> selectLatestWaterMeter(String devcode) {
+        return this.baseMapper.selectLatestWaterMeter(devcode);
+    }
 
-        return map;
+    @Override
+    public List<Map<String, Object>> selectDeviceData(String devCode, String beginTime, String endTime, Page<Map<String, Object>> page) {
+        return this.baseMapper.selectDeviceData(devCode, beginTime, endTime, page);
     }
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
index 33dca81..8996b83 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
@@ -1,10 +1,7 @@
 package com.casic.missiles.modular.system.enmus;
 
 
-import com.casic.missiles.core.enums.ExportExcelEnum;
 import com.casic.missiles.core.enums.ExportExcelHeaderEnum;
-import com.casic.missiles.core.util.SpringContextHolder;
-import com.casic.missiles.modular.config.SluicewellServerProperties;
 import org.hswebframework.expands.office.excel.config.Header;
 
 import java.util.ArrayList;
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index f249d8b..ba94905 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -1,22 +1,21 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.util.SpringContextHolder;
-import com.casic.missiles.modular.config.SluicewellProperties;
-import com.casic.missiles.modular.system.constant.BusWellConst;
-import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
-import com.casic.missiles.modular.system.enmus.TemphumBusiness;
-import com.casic.missiles.modular.system.dto.*;
-import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.util.SpringContextHolder;
 import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.config.SluicewellProperties;
+import com.casic.missiles.modular.system.constant.BusWellConst;
 import com.casic.missiles.modular.system.dao.BusWellInfoMapper;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
+import com.casic.missiles.modular.system.enmus.TemphumBusiness;
+import com.casic.missiles.modular.system.model.BusWellInfo;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.util.Utility;
-import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +29,10 @@
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -60,6 +62,7 @@
     }
 
     @Transactional
+    @Override
     public List<BusWellInfo> selectDataScopePage(DataScope dataScope, Page<BusWellInfo> page, String keywords, String wellType, String deptid, String bfzt, String areaId) {
         List<BusWellInfo> list = this.baseMapper.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId);
         list.forEach(well -> {
@@ -69,7 +72,7 @@
         return list;
     }
 
-
+    @Override
     public List<WatchDataDto> getWatchDatas(Long id) {
 
         List<DeviceInWellInfo> deviceInWellInfos = this.baseMapper.getDeviceInWellInfo(id);
@@ -404,7 +407,7 @@
         return deviceDataDtoList;
     }
 
-
+    @Override
     public BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp) {
         return this.baseMapper.bfztCountData(deptIds, isApp);
     }
@@ -419,10 +422,12 @@
         return this.baseMapper.getBatchExportData(dataScope, page, deviceType, deptid, keywords);
     }
 
+    @Override
     public Integer getDeviceCountData(Long id) {
         return this.baseMapper.deviceCountData(id);
     }
 
+    @Override
     public String getDeptNameData(String deptid) {
         return this.baseMapper.deptNameData(deptid);
     }
@@ -438,6 +443,7 @@
         }
     }
 
+    @Override
     public List<Long> deleteBatchByIds(List<Long> ids) {
 
         List<Long> lists = new ArrayList<>();
@@ -570,11 +576,13 @@
         return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
     }
 
+    @Override
     public String getAreaPid(String id) {
         return this.baseMapper.getAreaPId(id);
     }
 
     @Transactional
+    @Override
     public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List<Long> deptIds) {
 
         this.baseMapper.updateBatchBfcf(keywords, wellType, deptid, bfzt, deptIds);
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index bf2329f..ee3df5c 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: @activatedProperties@
+    active: dev
   http:
     multipart:
       max-file-size: 50MB